Merge branch 'master' of https://git.lamaisondescouillons.fr/ccolin/projet-gl

src/gui/ElevatorApplication.java

@@ -48,7 +48,7 @@ public class ElevatorApplication implements ActionListener {
 
 		pane.add(Box.createRigidArea(new Dimension(20, 0)));
 
-		ElevatorPanel elevatorPanel = new ElevatorPanel(5);
+		ElevatorPanel elevatorPanel = new ElevatorPanel(5, simulation);
 		elevatorPanel.setAlignmentY(Component.TOP_ALIGNMENT);
 		pane.add(elevatorPanel);
 

src/gui/ElevatorPanel.java

@@ -1,20 +1,29 @@
 package gui;
+
 import javax.swing.*;
 import java.awt.event.*;
 
+import commandSystem.ElevatorListener;
+
 
 @SuppressWarnings("serial")
 class ElevatorPanel extends JPanel {
 	private JButton emergencyStop = new JButton("Emergency stop.");
 	private JButton[] buttons;
 
-	public ElevatorPanel(int nbFloors) {
+	public ElevatorPanel(int nbFloors, ElevatorListener l) {
 		this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 		this.add(new JLabel("Elevator panel."));
 
 		buttons = new JButton[nbFloors];
 		for (int i = nbFloors-1; i >= 0; i--) {
+			final int j = i;
 			buttons[i] = new JButton("" + i);
+			buttons[i].addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						l.elevatorCall(j);
+					}
+				});
 			this.add(buttons[i]);
 		}
 		add(emergencyStop);

src/gui/FloorPanels.java

@@ -5,6 +5,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 import commandSystem.ElevatorListener;
+import commandSystem.Direction;
 
 
 @SuppressWarnings("serial")
@@ -22,11 +23,23 @@ class FloorPanels extends JPanel {
 			floors[i].setLayout(new BoxLayout(floors[i], BoxLayout.LINE_AXIS));
 			floors[i].add(new JLabel("" + i));
 			if (i < nbFloors - 1) {
+				final int j = i;
 				JButton upButton = new JButton("↑");
+				upButton.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							l.floorCall(j, Direction.UP);
+						}
+					});
 				floors[i].add(upButton);
 			}
 			if (i > 0) {
+				final int j = i;
 				JButton downButton = new JButton("↓");
+				downButton.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							l.floorCall(j, Direction.DOWN);
+						}
+					});
 				floors[i].add(downButton);
 			}
 			this.add(floors[i]);

src/simulation/Simulation.java

@@ -20,9 +20,11 @@ public class Simulation implements ElevatorListener {
 	}
 
 	public void elevatorCall(int floor) {
+		System.out.println("elevator call " + floor);
 	}
 
 	public void floorCall(int floor, Direction direction) {
+		System.out.println("floor call " + floor + " " + direction);
 	}
 
 	public void floorChange(Direction d) {