Merge branch 'changement-archi' of https://github.com/Ciliste/JeuAssemblage into changement-archi (87287b61) · Commits · Pierre Le Meur / Génie Logiciel LE MEUR-AIREY

jeuAssemblage/output.png

+5 B (672 B)

Loading image diff...

+33 −5

Changes for jeuAssemblage/src/model/PlayBoard.java: 33 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo
		piecesMap.put(pieceId, piece);

		this.fireAllEvents();
		firePieceAdded(this, pieceId);

		return true;
		}
		@@ -182,6 +183,8 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo

		this.fireAllEvents();

		firePieceRemoved(this, pieceId);

		return true;
		}

		@@ -544,16 +547,41 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo
		return colorList;
		}

		private final Set<IPlayBoardListener> listeners = new HashSet<>();

		@Override
		public void addPlayBoardListener(IPlayBoardListener listener) {
		// TODO Auto-generated method stub
		throw new UnsupportedOperationException("Unimplemented method 'addPlayBoardListener'");
		}

		this.listeners.add(listener);
		}

		@Override
		public void removePlayBoardListener(IPlayBoardListener listener) {
		// TODO Auto-generated method stub
		throw new UnsupportedOperationException("Unimplemented method 'removePlayBoardListener'");

		this.listeners.remove(listener);
		}

		private void firePieceAdded(Object source, int pieceId) {

		for (IPlayBoardListener listener : this.listeners) {

		listener.pieceAdded(source, pieceId);
		}
		}

		private void firePieceRemoved(Object source, int pieceId) {

		for (IPlayBoardListener listener : this.listeners) {

		listener.pieceRemoved(source, pieceId);
		}
		}

		private void firePieceMoved(Object source, int pieceId) {

		for (IPlayBoardListener listener : this.listeners) {

		listener.pieceMoved(source, pieceId);
		}
		}
		}

+2 −2

Changes for jeuAssemblage/src/view/component/GamePanel.java: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -68,9 +68,9 @@ public class GamePanel extends JPanel {

		this.finish.setBounds(
		this.grid.getWidth(),
		0,
		this.timerPanel.getHeight(),
		getWidthTimesPourcent (this, .2f),
		getHeightTimesPourcent(this, 1f)
		getHeightTimesPourcent(this, .6f)
		);
		}

+1 −2

Changes for jeuAssemblage/src/view/component/board/Finish.java: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public class Finish extends JPanel {
		this.mainFrame = mainFrame;
		this.playBoard = playBoard;

		/*
		this.playBoard.addPlayBoardListener(new IPlayBoardListener() {

		@Override
		@@ -53,7 +52,7 @@ public class Finish extends JPanel {

		update();
		}
		}); */
		});

		this.setLayout(null);

−2.94 KiB (1.01 KiB)

Loading image diff...