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

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

Browse Source
This commit is contained in:
MathieuPietri 2019-10-14 13:59:41 +02:00
commit 27c2ffefaa
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,12 +1,14 @@
all: build assemble all: build assemble
rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
.PHONY: build .PHONY: build
build: build:
mkdir -p build mkdir -p build
javac -Xlint $(shell find src -type f -name '*.java') -d build javac -Xlint $(shell find src -type f -name '*.java') -d build
assemble: assemble:
cd build/; jar cvmf ../MANIFEST.MF ../Elevator.jar $(shell cd build/; find -type f -name '*.class') cd build/; jar cvmf ../MANIFEST.MF ../Elevator.jar $(patsubst %,'%',$(shell cd build; find -name '*.class'))
clean: clean:
-rm -r build/* -rm -r build/*

2
src/gui/ElevatorPanel.java
View File

@ -13,7 +13,7 @@ class ElevatorPanel extends JPanel {
this.add(new JLabel("Elevator panel.")); this.add(new JLabel("Elevator panel."));
buttons = new JButton[nbFloors]; buttons = new JButton[nbFloors];
for (int i = 0; i < nbFloors; i++) { for (int i = nbFloors-1; i >= 0; i--) {
buttons[i] = new JButton("" + i); buttons[i] = new JButton("" + i);
this.add(buttons[i]); this.add(buttons[i]);
} }

6
src/gui/FloorPanels.java
View File

@ -17,15 +17,15 @@ class FloorPanels extends JPanel {
floors = new JPanel[nbFloors]; floors = new JPanel[nbFloors];
this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
this.add(new JLabel("Call.")); this.add(new JLabel("Call."));
for (int i = 0; i < nbFloors; i++) { for (int i = nbFloors-1; i >= 0; i--) {
floors[i] = new JPanel(); floors[i] = new JPanel();
floors[i].setLayout(new BoxLayout(floors[i], BoxLayout.LINE_AXIS)); floors[i].setLayout(new BoxLayout(floors[i], BoxLayout.LINE_AXIS));
floors[i].add(new JLabel("" + (i + 1))); floors[i].add(new JLabel("" + i));
if (i < nbFloors - 1) { if (i < nbFloors - 1) {
JButton upButton = new JButton("↑"); JButton upButton = new JButton("↑");
floors[i].add(upButton); floors[i].add(upButton);
} }
if (i > 1) { if (i > 0) {
JButton downButton = new JButton("↓"); JButton downButton = new JButton("↓");
floors[i].add(downButton); floors[i].add(downButton);
} }