diff --git a/.~lock.Cahier_des_charges.odt# b/.~lock.Cahier_des_charges.odt# new file mode 100644 index 0000000..5733deb --- /dev/null +++ b/.~lock.Cahier_des_charges.odt# @@ -0,0 +1 @@ +,p16003795,L-662722FORM-16.salsa.univ-amu.fr,14.10.2019 13:17,file:///amuhome/p16003795/.config/libreoffice/4; \ No newline at end of file diff --git a/Cahier_des_charges.odt b/Cahier_des_charges.odt new file mode 100644 index 0000000..5aff0af Binary files /dev/null and b/Cahier_des_charges.odt differ diff --git a/src/commandSystem/EventQueue.java b/src/commandSystem/EventQueue.java index e903d45..c26f946 100644 --- a/src/commandSystem/EventQueue.java +++ b/src/commandSystem/EventQueue.java @@ -58,7 +58,6 @@ public class EventQueue { appSort(downQueue, request.getIncomingCallFloor(), true); break; default: - System.out.println("foiop"); break; } break; @@ -112,9 +111,9 @@ public class EventQueue { } /** - * Return the next floor the elevator has to go to + * Returns the next floor the elevator has to go to * - * @return next floor if exists else -1 + * @return next floor if it exists else -1 */ public int getNextInstruction() { //System.out.println("" + upQueue + '\n' + downQueue); diff --git a/src/gui/ElevatorApplication.java b/src/gui/ElevatorApplication.java index 3ed0711..8d5dbed 100644 --- a/src/gui/ElevatorApplication.java +++ b/src/gui/ElevatorApplication.java @@ -1,11 +1,14 @@ package gui; -import javax.swing.*; import java.awt.*; import java.awt.event.*; -import Requests.CallFromElevatorRequest; -import Requests.CallFromFloorRequest; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; +import javax.swing.Timer; + import simulation.Elevator; import simulation.Simulation; diff --git a/src/gui/ElevatorPanel.java b/src/gui/ElevatorPanel.java index 8c9fd8a..b9f1fb4 100644 --- a/src/gui/ElevatorPanel.java +++ b/src/gui/ElevatorPanel.java @@ -1,6 +1,5 @@ package gui; import javax.swing.*; -import java.awt.*; import java.awt.event.*;