From 7649656e646e9433cfdb497b4e23bab36e2d7b33 Mon Sep 17 00:00:00 2001 From: cyril-colin Date: Mon, 14 Oct 2019 09:16:06 +0200 Subject: [PATCH] =?UTF-8?q?doesn=E2=80=99t=20compile=20lol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MANIFEST.MF | 2 +- Makefile | 4 ++-- src/gui/ElevatorApplication.java | 2 +- src/gui/FloorPanels.java | 15 ++++++++++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/MANIFEST.MF b/MANIFEST.MF index 8de9d24..d217821 100644 --- a/MANIFEST.MF +++ b/MANIFEST.MF @@ -1 +1 @@ -Main-Class: ElevatorApplication +Main-Class: gui.ElevatorApplication diff --git a/Makefile b/Makefile index ba2ff42..3901323 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ build: javac -Xlint $(shell find src -type f -name '*.java') -d build assemble: - cd build/; jar cvmf ../MANIFEST.MF ../Elevator.jar *.class + cd build/; jar cvmf ../MANIFEST.MF ../Elevator.jar $(shell cd build/; find -type f -name '*.class') clean: - -rm build/*.class + -rm -r build/* diff --git a/src/gui/ElevatorApplication.java b/src/gui/ElevatorApplication.java index 1ce9bf4..3ed0711 100644 --- a/src/gui/ElevatorApplication.java +++ b/src/gui/ElevatorApplication.java @@ -39,7 +39,7 @@ public class ElevatorApplication implements ActionListener { canvas.setAlignmentY(Component.TOP_ALIGNMENT); pane.add(canvas); - FloorPanels fp = new FloorPanels(5); + FloorPanels fp = new FloorPanels(5, simulation); fp.setAlignmentY(Component.TOP_ALIGNMENT); pane.add(fp); diff --git a/src/gui/FloorPanels.java b/src/gui/FloorPanels.java index 3c54ef6..fb0c0be 100644 --- a/src/gui/FloorPanels.java +++ b/src/gui/FloorPanels.java @@ -1,15 +1,18 @@ package gui; + import javax.swing.*; import java.awt.*; import java.awt.event.*; +import commandSystem.ElevatorListener; + @SuppressWarnings("serial") class FloorPanels extends JPanel { private int nbFloors; private JPanel[] floors; - public FloorPanels(int nbFloors) { + public FloorPanels(int nbFloors, ElevatorListener l) { this.nbFloors = nbFloors; floors = new JPanel[nbFloors]; this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); @@ -18,8 +21,14 @@ class FloorPanels extends JPanel { floors[i] = new JPanel(); floors[i].setLayout(new BoxLayout(floors[i], BoxLayout.LINE_AXIS)); floors[i].add(new JLabel("" + (i + 1))); - floors[i].add(new JButton("↑")); - floors[i].add(new JButton("↓")); + if (i < nbFloors - 1) { + JButton upButton = new JButton("↑"); + floors[i].add(upButton); + } + if (i > 1) { + JButton downButton = new JButton("↓"); + floors[i].add(downButton); + } this.add(floors[i]); } }