diff --git a/diag_classes.uml b/diag_classes.uml index 46481ad..82a354b 100644 --- a/diag_classes.uml +++ b/diag_classes.uml @@ -54,7 +54,7 @@ CodeGeneration - + ArgoUML (using Netbeans XMI Writer version 1.0) 0.34(6) revised on $Date: 2010-01-11 22:20:14 +0100 (Mon, 11 Jan 2010) $ @@ -63,12 +63,1838 @@ + isAbstract = 'false'> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + InstructionQueue + + + + + + <<interface>> + + + + + + + + computeEvent(event : Event) : void + getNextInstruction() : int + + + + + + + + BasicInstructionQueue + + + + + + + + + + + + + currentFloor : Integer + currentDirection : Direction + + + + + + + + appSort() : void + removeInstruction() : void + clearQueues() : void + + + + + sourcePortFig="Fig1.0" + destPortFig="Fig0" + sourceFigNode="Fig1" + destFigNode="Fig0" + + + + + + + + + + + + + Event + + + + + + <<interface>> + + + + + + + + getType() + getRequestedDirection() + getIncomingCallFloor() + getRequestedFloor() + getCurrentFloor() + getCurrentDirection() + + + + + + + + CallFromElevatorEvent + + + + + + + + + + + + + requestedFloor : Integer + + + + + + + + + + + + + + + CancelEmergencyStopEvent + + + + + + + + + + + + + + + + + + + + + + + + + + + CallFromFloorEvent + + + + + + + + + + + + + incomingCallFloor : Integer + requestedDirection : Direction + + + + + + + + + + + + + + + EmergencyStopEvent + + + + + + + + + + + + + + + + + + + + + + + + + + + ReachedFloorEvent + + + + + + + + + + + + + currentFloor : Integer + currentDirection : Direction + + + + + + + + + + + + sourcePortFig="Fig8.0" + destPortFig="Fig3" + sourceFigNode="Fig8" + destFigNode="Fig3" + + + + + + + + + + sourcePortFig="Fig4.0" + destPortFig="Fig3" + sourceFigNode="Fig4" + destFigNode="Fig3" + + + + + + + + + + + sourcePortFig="Fig6.0" + destPortFig="Fig3" + sourceFigNode="Fig6" + destFigNode="Fig3" + + + + + + + + + + + sourcePortFig="Fig7.0" + destPortFig="Fig3" + sourceFigNode="Fig7" + destFigNode="Fig3" + + + + + + + + + + sourcePortFig="Fig5.0" + destPortFig="Fig3" + sourceFigNode="Fig5" + destFigNode="Fig3" + + + + + + + diff --git a/diag_classes.uml~ b/diag_classes.uml~ index e69de29..46481ad 100644 --- a/diag_classes.uml~ +++ b/diag_classes.uml~ @@ -0,0 +1,79 @@ + + + + + + + 0.34 + + + + + + UML 1.4 + false + false + true + false + false + false + false + true + false + true + 1 + true + Dialog + 12 + 0 + Diagramme de classes + + + + + + + + + + + + + UML 1.4 + + + GoodPractices + + + CodeGeneration + + + + + ArgoUML (using Netbeans XMI Writer version 1.0) + 0.34(6) revised on $Date: 2010-01-11 22:20:14 +0100 (Mon, 11 Jan 2010) $ + + + + + + + + + + + + + + + diff --git a/src/Events/CallFromElevatorEvent.java b/src/Events/CallFromElevatorEvent.java index 24835a9..19ea80a 100644 --- a/src/Events/CallFromElevatorEvent.java +++ b/src/Events/CallFromElevatorEvent.java @@ -4,10 +4,10 @@ import commandSystem.Direction; public class CallFromElevatorEvent implements Event { - private final int wantedFloor; + private final int requestedFloor; - public CallFromElevatorEvent(int wantedFloor) { - this.wantedFloor = wantedFloor; + public CallFromElevatorEvent(int requestedFloor) { + this.requestedFloor = requestedFloor; } @Override @@ -17,7 +17,7 @@ public class CallFromElevatorEvent implements Event { @Override public int getRequestedFloor() { - return wantedFloor; + return requestedFloor; } @Override