update java's game

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/data/Stub.java

@@ -1,15 +1,14 @@
 package data;
 
 import models.Jeu;
-import models.Pion;
+import models.Joueur;
 import models.Plateau;
 
 public class Stub {
     public Jeu loadPions() {
-        Plateau myPlateau = new Plateau(5);
+        Jeu game = new Jeu(5, 6);
-        Jeu game = new Jeu(myPlateau);
+        game.getMyAdminPlayer().ajouterJoueur(new Joueur("rouge"));
-        game.addPion(new Pion("rouge"));
+        game.getMyAdminPlayer().ajouterJoueur(new Joueur("bleu"));
-        game.addPion(new Pion("bleu"));
         return game;
     }
 }

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/launcher/ConsoleGame.java

@@ -2,23 +2,23 @@ package launcher;
 
 import data.Stub;
 import models.Jeu;
-import models.Pion;
+import models.Joueur;
 
 public class ConsoleGame {
 
     public static void main(String[] args) {
         final Jeu game = new Stub().loadPions();
         System.out.println(game.getPlateau().toString());
-        Pion currentPion = game.getCurrentPion();
+        Joueur currentPlayer = game.getMyAdminPlayer().getCurrentJoueur();
-        System.out.println(currentPion.toString());
+        System.out.println(currentPlayer.toString());
-        System.out.println("Changement de Pion");
+        System.out.println("Changement de Joueur");
-        currentPion = game.changePion();
+        currentPlayer = game.getMyAdminPlayer().nextPlayer();
-        System.out.println(currentPion.toString());
+        System.out.println(currentPlayer.toString());
-        game.avancerPion();
+        game.getMyAdminPlayer().getCurrentJoueur().setMyCase(game.getPlateau().getCaseList().get(0));
-        System.out.println(currentPion.toString());
+        System.out.println(currentPlayer.toString());
         System.out.println(game.getPlateau().toString());
-        game.avancerPion();
+        game.getMyAdminPlayer().getCurrentJoueur().setMyCase(game.getPlateau().getCaseList().get(0));
-        System.out.println(currentPion.toString());
+        System.out.println(currentPlayer.toString());
         System.out.println(game.getPlateau().toString());
     }
 }

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/Case.java

@@ -2,20 +2,16 @@ package models;
 
 public class Case {
     private int idCase;
-    private boolean presence;
+    private Joueur myJoueur = null;
-    public Case(int i){
+    public Case(int idCase) {
-        idCase = i;
+        this.idCase = idCase;
-        presence = false;
-    }
-    public boolean getPresence() {
-        return this.presence;
-    }
-    public void setPresence(boolean presence) {
-        this.presence = presence;
     }
 
     @Override
     public String toString() {
-        return this.idCase + " " + this.presence + "\n";
+        if(myJoueur){
+            return this.idCase + " " + this.myJoueur.toString() + "\n";
+        }
+        return this.idCase + " " + "\n";
     }
 }

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/De.java

@@ -0,0 +1,19 @@
+package models;
+
+import java.util.Random;
+
+public abstract class De {
+    private int valeur;
+    private int nbFaces;
+    Random RANDOM = new Random();
+    public De(int nbFaces) {
+        this.nbFaces = nbFaces;
+    }
+
+    public int getValeur() {
+        return valeur;
+    }
+    public void setValeur(int valeur) {
+        this.valeur = RANDOM.nextInt(nbFaces) + 1;
+    }
+}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/DeSimple.java

@@ -0,0 +1,16 @@
+package models;
+
+public class DeSimple extends De {
+    public DeSimple(int nbFaces){
+        super(nbFaces);
+    }
+    @Override
+    public int getValeur() {
+        return super.getValeur();
+    }
+
+    @Override
+    public void setValeur(int valeur) {
+        super.setValeur(valeur);
+    }
+}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/DeplaceurJoueur.java

@@ -0,0 +1,17 @@
+//package models;
+//
+//public class DeplaceurJoueur {
+//    private boolean verifPresenceJoueur(Joueur currentJoueur, int valeurDe) {
+//        if((currentJoueur.getCurrentIdCase() + valeurDe )!= 0) {
+//            myPlateau.getCaseList().get(currentJoueur.getCurrentIdCase() - 1).setPresence(false);
+//        }
+//        return false;
+//    }
+//    private void alternerJoueurs(Joueur joueur1, Joueur joueur) {
+//
+//    }
+//    public void avancerJoueur(Joueur currentJoueur, Plateau myPlateau) {
+//        currentJoueur.setCurrentIdCase();
+//        myPlateau.getCaseList().get(currentJoueur.getCurrentIdCase()-1).setPresence(true);
+//    }
+//}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/GestionnaireJoueur.java

@@ -0,0 +1,25 @@
+package models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GestionnaireJoueur {
+    private int currentIdJoueur = 0;
+    private List<Joueur> lesJoueurs = new ArrayList<>();
+
+    public List<Joueur> getLesJoueurs() {
+        return this.lesJoueurs;
+    }
+    public Joueur getCurrentJoueur() {
+        return this.lesJoueurs.get(currentIdJoueur);
+    }
+    public void ajouterJoueur(Joueur joueur) {
+        lesJoueurs.add(joueur);
+    }
+    public Joueur nextPlayer() {
+        return lesJoueurs.get(++currentIdJoueur % lesJoueurs.size());
+    }
+//    public void next() {
+//        this.currentIdJoueur++;
+//    }
+}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/Jeu.java

@@ -5,32 +5,38 @@ import java.util.List;
 
 public class Jeu {
     private Plateau myPlateau;
-    private List<Pion> pionsList = new ArrayList<>();
+    private De myDe;
-    private int currentPionId = 0;
+    private GestionnaireJoueur myAdminPlayer = new GestionnaireJoueur();
-    public Jeu(Plateau myPlateau) {
+//    private DeplaceurJoueur myMovePlayer = new DeplaceurJoueur();
-        this.myPlateau = myPlateau;
+    public Jeu(int nbCases, int nbFaces) {
+        myPlateau = new Plateau(nbCases);
+        myDe = new DeSimple(nbFaces);
     }
     public Plateau getPlateau() {
         return this.myPlateau;
     }
-    public List<Pion> getPionsList() {
+
-        return this.pionsList;
+    public GestionnaireJoueur getMyAdminPlayer() {
-    }
+        return myAdminPlayer;
-    public Pion getCurrentPion() {
+    }
-        return pionsList.get(currentPionId);
+    //    public List<Joueur> getPionsList() {
-    }
+//        return this.pionsList;
-    public Pion changePion() {
+//    }
-        return pionsList.get(++currentPionId % pionsList.size());
+//    public Joueur getCurrentPion() {
-    }
+//        return pionsList.get(currentPionId);
-    public void avancerPion() {
+//    }
-        Pion currentPion = pionsList.get(currentPionId);
+//    public Joueur changePion() {
-        if(currentPion.getCurrentIdCase() != 0) {
+//        return pionsList.get(++currentPionId % pionsList.size());
-            this.myPlateau.getCaseList().get(currentPion.getCurrentIdCase() - 1).setPresence(false);
+//    }
-        }
+//    public void avancerPion() {
-        currentPion.setCurrentIdCase();
+//        Joueur currentPion = pionsList.get(currentPionId);
-        this.myPlateau.getCaseList().get(currentPion.getCurrentIdCase()-1).setPresence(true);
+//        if(currentPion.getCurrentIdCase() != 0) {
-    }
+//            this.myPlateau.getCaseList().get(currentPion.getCurrentIdCase() - 1).setPresence(false);
-    public void addPion(Pion pion) {
+//        }
-        pionsList.add(pion);
+//        currentPion.setCurrentIdCase();
-    }
+//        this.myPlateau.getCaseList().get(currentPion.getCurrentIdCase()-1).setPresence(true);
+//    }
+//    public void addPion(Joueur pion) {
+//        pionsList.add(pion);
+//    }
 }

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/Joueur.java

@@ -0,0 +1,22 @@
+package models;
+
+public class Joueur {
+    private String color;
+    private Case myCase = null;
+    public Joueur(String myColor) {
+        this.color = myColor;
+    }
+    public String getColor() {
+        return color;
+    }
+    public Case getMyCase() {
+        return this.myCase;
+    }
+    public void setMyCase(Case myCase) {
+        this.myCase = myCase;
+    }
+    @Override
+    public String toString() {
+        return "Je suis le Joueur de couleur " + this.color + " et je suis sur la case " + this.myCase.getClass();
+    }
+}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/Pion.java

@@ -1,22 +0,0 @@
-package models;
-
-public class Pion {
-    private String color;
-    private int idCase = 0;
-    public Pion(String myColor) {
-        this.color = myColor;
-    }
-    public String getColor() {
-        return color;
-    }
-    public int getCurrentIdCase() {
-        return this.idCase;
-    }
-    public void setCurrentIdCase() {
-        this.idCase++;
-    }
-    @Override
-    public String toString() {
-        return "Je suis le Pion de couleur " + this.color + " et je suis sur la case " + this.idCase;
-    }
-}

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/models/Plateau.java

@@ -13,12 +13,6 @@ public class Plateau {
     public List<Case> getCaseList() {
         return this.CaseList;
     }
-    public boolean addCaseList(Case myCase) {
-        return this.CaseList.add(myCase);
-    }
-    public boolean removeCaseList(Case myCase) {
-        return this.CaseList.remove(myCase);
-    }
 
     @Override
     public String toString() {

2A/Java/tp/JavaFX/tpJeuDeL_oie/Oie/src/view/Fenetre.java

@@ -5,19 +5,17 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.layout.BorderPane;
 import models.Jeu;
-import models.Pion;
+import models.Joueur;
-
-import java.awt.*;
 
 public class Fenetre {
-    @FXML
+//    @FXML
-    private BorderPane myBorderPane = new BorderPane();
+//    private BorderPane myBorderPane = new BorderPane();
-    private final Jeu game = new Stub().loadPions();
+//    private final Jeu game = new Stub().loadPions();
-    Pion currentPion = game.getCurrentPion();
+//    Joueur currentPion = game.getCurrentPion();
-
+//
-    public void initialize() {
+//    public void initialize() {
-        for(int i = 0; i < game.getPlateau().getCaseList().size(); i++) {
+//        for(int i = 0; i < game.getPlateau().getCaseList().size(); i++) {
-            myBorderPane.setCenter(new Button().setText("hello"));
+//            myBorderPane.setCenter(new Button().setText("hello"));
-        }
+//        }
-    }
+//    }
 }