[BOT] Remove some bugs and refacto (8377055b) · Commits · Pierre Le Meur / Génie Logiciel LE MEUR-AIREY

jeuAssemblage/src/bot/BotThread.java

+7 −3

Changes for jeuAssemblage/src/bot/BotThread.java: 7 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class BotThread implements Runnable {
		while (!this.stop) {
		boolean stopable = true;

		for (int i = 0; i < this.bots.size(); i++) {
		for (int i = 0; i < this.bots.size() && !Thread.interrupted(); i++) {
		IBot bot = this.bots.get(i);

		if (bot.tick()) {
		@@ -66,16 +66,20 @@ public class BotThread implements Runnable {
		try {
		Thread.sleep(10);
		} catch (Exception e) {
		e.printStackTrace();
		Thread.currentThread().interrupt();
		}
		}

		if (!this.stop) {

		for (IMovesView movesView : this.movesViews) {

		Thread t = new Thread(this.th, movesView);
		t.start();
		}

		System.out.println("fini");
		}

		}

		}

jeuAssemblage/src/bot/view/MovesToIHM.java

+5 −3

Changes for jeuAssemblage/src/bot/view/MovesToIHM.java: 5 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class MovesToIHM implements IMovesView {
		}


		for (int i = 0; i < alMoves.size(); i++) {
		for (int i = 0; i < alMoves.size() && !Thread.currentThread().isInterrupted(); i++) {
		Move m = alMoves.get(i);

		boolean result = this.doMove(m);
		@@ -76,11 +76,13 @@ public class MovesToIHM implements IMovesView {

		actualIte++;

		} while (!alMoves.isEmpty() && actualIte < maxIte);
		} while (!alMoves.isEmpty() && actualIte < maxIte && !Thread.currentThread().isInterrupted());
		}

		private boolean doMove(Move m) {

		System.out.println("shesh");

		Piece p = model.getPieceById(m.pieceId);

		boolean inversible = m.numberOfReverse != p.getNumberOfReverse();
		@@ -118,7 +120,7 @@ public class MovesToIHM implements IMovesView {
		int sleep = (int) ((Math.random() * (DEFAULT_SLEEP / 2)) + DEFAULT_SLEEP);
		Thread.sleep(sleep);
		} catch (InterruptedException e) {
		e.printStackTrace();
		Thread.currentThread().interrupt();
		}

		}

jeuAssemblage/src/model/PlayBoard.java

+1 −44

Changes for jeuAssemblage/src/model/PlayBoard.java: 1 added line, 44 removed lines.
Original line number	Diff line number	Diff line
		@@ -18,15 +18,13 @@ import factory.OFactory;
		import factory.PieceFactory;
		import factory.TFactory;
		import factory.ZFactory;
		import model.listener.IPlayBoardListenable;
		import model.listener.IPlayBoardListener;
		import observer.AbstractListenableHM;
		import observer.interfaces.Listener;
		import piece.Piece;
		import utils.EDifficulty;
		import utils.ETypeListen;

		public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBoardListenable, Comparable<PlayBoard> {
		public class PlayBoard extends AbstractListenableHM implements Listener, Comparable<PlayBoard> {

		private static final int EMPTY = 0;

		@@ -151,7 +149,6 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo
		piecesMap.put(pieceId, piece);

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

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

		this.fireAllEvents();

		firePieceRemoved(this, pieceId);

		return true;
		}

		@@ -597,42 +592,4 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo

		return pieceFactorys;
		}

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

		@Override
		public void addPlayBoardListener(IPlayBoardListener listener) {

		this.listeners.add(listener);
		}

		@Override
		public void removePlayBoardListener(IPlayBoardListener listener) {

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

jeuAssemblage/src/model/listener/IPlayBoardListenable.java

deleted100644 → 0

+0 −10

Changes for jeuAssemblage/src/model/listener/IPlayBoardListenable.java: 0 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		package model.listener;

		import java.util.ArrayList;
		import java.util.List;

		public interface IPlayBoardListenable {

		public abstract void addPlayBoardListener(IPlayBoardListener listener);
		public abstract void removePlayBoardListener(IPlayBoardListener listener);
		}

jeuAssemblage/src/model/listener/IPlayBoardListener.java

deleted100644 → 0

+0 −11

Changes for jeuAssemblage/src/model/listener/IPlayBoardListener.java: 0 added lines, 11 removed lines.
Original line number	Diff line number	Diff line
		package model.listener;

		import piece.Piece;

		public interface IPlayBoardListener {

		public abstract void pieceAdded(Object source, int pieceId);
		public abstract void pieceRemoved(Object source, int pieceId);

		public abstract void pieceMoved(Object source, int pieceId);
		}