ccolin
/
projet-gl
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ajout cahier des charges et fichier temporaire mdr + removed unused imports

This commit is contained in:
MathieuPietri 2019-10-14 13:18:20 +02:00
parent 7649656e64
commit 483a5a8189
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.~lock.Cahier_des_charges.odt# Normal file
View File

@ -0,0 +1 @@
,p16003795,L-662722FORM-16.salsa.univ-amu.fr,14.10.2019 13:17,file:///amuhome/p16003795/.config/libreoffice/4;

BIN
Cahier_des_charges.odt Normal file
View File

Binary file not shown.

5
src/commandSystem/EventQueue.java
View File

@ -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);

9
src/gui/ElevatorApplication.java
View File

@ -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;

1
src/gui/ElevatorPanel.java
View File

@ -1,6 +1,5 @@
package gui;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;