Commit eb16a89d authored by erreiip's avatar erreiip
Browse files

[VIEW] Change some panels and refacto GamePanel et Finish

parent 266b951c

jeuAssemblage/src/bot/BotThread.java

+12 −1
Changes for jeuAssemblage/src/bot/BotThread.java: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ public class BotThread implements Runnable { 
    private ArrayList<IBot> bots;

    private int sleepTime;



    private boolean stop;



    public BotThread() {



        this(new ArrayList<IBot>());
@@ -25,16 +27,25 @@ public class BotThread implements Runnable { 


        this.bots = bots;

        this.sleepTime = sleepTime;

        this.stop = false;

    }



    public ArrayList<IBot> getBots() {

        return this.bots;

    }



    public void stop() {

        this.stop = true;

    }



    public void start() {

        this.stop = false;

    }



    @Override

    public void run() {



        while (true) {

        while (!this.stop) {



            for (IBot bot : bots) {

                bot.tick();

jeuAssemblage/src/bot/difficulty/Bot.java

+5 −0
Changes for jeuAssemblage/src/bot/difficulty/Bot.java: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ public abstract class Bot implements IBot { 
        this.setStrategy(strategy);

    }



    @Override

    public PlayBoard getModel() {

        return this.model;

    }



    @Override

    public void setStrategy(int strategy) {

        switch (strategy) {

jeuAssemblage/src/bot/interfaces/IBot.java

+3 −0
Changes for jeuAssemblage/src/bot/interfaces/IBot.java: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
package bot.interfaces;



import model.PlayBoard;



public interface IBot extends ITickable {



    public abstract PlayBoard getModel();

    public abstract void setStrategy(int strategy);

}

jeuAssemblage/src/view/component/GamePanel.java

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


	public GamePanel(MainFrame mainFrame, PlayBoard playBoard, PiecesColor piecesColor, Timer timer) {

		

		this(mainFrame, playBoard, piecesColor, timer, new SoloGameFinishScreen(mainFrame, playBoard, piecesColor));

	}



	public GamePanel(MainFrame mainFrame, PlayBoard playBoard, PiecesColor piecesColor, Timer timer,

			JPanel finishScreen) {



		super();



		this.setLayout(null);





		this.grid = new Grid(playBoard, piecesColor);

		this.finish = new Finish(mainFrame, playBoard, piecesColor);

		this.finish = new Finish(mainFrame, playBoard, piecesColor, finishScreen);



		this.timerPanel = new TimerPanel(mainFrame, timer, new Runnable() {

			

			@Override

			public void run() {

				

				mainFrame.setContentPane(new SoloGameFinishScreen(mainFrame, playBoard, piecesColor));

				mainFrame.setContentPane(finishScreen);

			}

		});

jeuAssemblage/src/view/component/board/Finish.java

+6 −1
Changes for jeuAssemblage/src/view/component/board/Finish.java: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ public class Finish extends JPanel { 


    public Finish(MainFrame mainFrame, PlayBoard playBoard, PiecesColor piecesColor) {

        

        this(mainFrame, playBoard, piecesColor, new SoloGameFinishScreen(mainFrame, playBoard, piecesColor));

    }



    public Finish(MainFrame mainFrame, PlayBoard playBoard, PiecesColor piecesColor, JPanel finishScreen) {

        

		super();



		this.mainFrame = mainFrame;
@@ -59,7 +64,7 @@ public class Finish extends JPanel { 


        this.btnFinish.addActionListener(e -> {



            mainFrame.setContentPane(new SoloGameFinishScreen(mainFrame, playBoard, piecesColor));

            mainFrame.setContentPane(finishScreen);

        });



        this.add(this.lblPreciseArea);