Merge remote-tracking branch 'origin/master'

# Conflicts:
#	out/production/battleship-student-project-2021/Application.class

src/Application.java

+import PremiereFenetre.PremiereFenetre;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import info1.network.*;
 import info1.ships.BadCoordException;
@@ -20,14 +21,16 @@ public class Application {
 
 
     public static void main(String[] args) throws InterruptedException {
-
+        /*
         FenetreConnexion fc = new FenetreConnexion("Connexion au serveur et aux parties");
 
         fc.setPreferredSize(new Dimension(1000, 700));
         //fc.setResizable(false);
         fc.pack();
         fc.setVisible(true);
+        */
 
+        PremiereFenetre pf = new PremiereFenetre();
         Network.setProxy("srv-proxy-etu-2.iut-nantes.univ-nantes.prive",3128);
         Network.enableProxy(true);
 
@@ -70,7 +73,7 @@ public class Application {
         -100 si la partie est perdue par le joueur courant ;
         -9999 sinon
         */
-
+        /*
         boolean partie_bool = true;
         int info;
         while(partie_bool){
@@ -86,7 +89,7 @@ public class Application {
                     System.out.println("10 c'est au joueur courant de jouer");
                     //TODO CORD_LISTENER avec un listener
                     //TODO comprendre où récupérer player2
-                    //Network.playOneTurn("http://172.26.82.18//api/v0", GAME, joueur2, CORD_LISTENER);
+                    //Network.playOneTurn("http://172.26.82.18//api/v0", GAME, jaquie, CORD_LISTENER);
                 break;
                 case -10:
                     System.out.println("-10 ce n'est pas au joueur courant de jouer");
@@ -109,7 +112,7 @@ public class Application {
             }
             Thread.sleep(500);
         }
-
+        */
 
 
 

src/PremiereFenetre/PremiereFenetre.java

+package PremiereFenetre;
+
+import vue.FenetreConnexion;
+
+import java.awt.*;
+
+public class PremiereFenetre {
+    static FenetreConnexion fc = new FenetreConnexion("Connexion au serveur et aux parties");
+
+    public PremiereFenetre(){
+        fc.setPreferredSize(new Dimension(700, 700));
+        //fc.setResizable(false);
+        fc.pack();
+        fc.setVisible(true);
+
+    }
+    public static void close(){
+        fc.dispose();
+    }
+}

src/modele/info1/ships/NavyFleet.java

@@ -84,24 +84,20 @@ public class NavyFleet implements INavyFleet {
     @Override
     public boolean isBelgianConfiguration() {
         // TO DO verifier 1 cuirassé, 2 croiseurs, 3 torpilleurs, 4 sous-marins
-        if(getShips(ShipCategory.BATTLESHIP).size() == 1
-        && getShips(ShipCategory.CRUISER).size() == 2
-        && getShips(ShipCategory.DESTROYER).size() == 3
-        && getShips(ShipCategory.SUBMARINE).size() == 4)
-            return true;
-        return false;
+        return getShips(ShipCategory.BATTLESHIP).size() == 1
+                && getShips(ShipCategory.CRUISER).size() == 2
+                && getShips(ShipCategory.DESTROYER).size() == 3
+                && getShips(ShipCategory.SUBMARINE).size() == 4;
     }
 
     @Override
     public boolean isFrenchConfiguration() {
         // TO DO verifier: 1 porte-avion, 1 cuirassé, 2 croiseurs, 2 torpilleurs, 1 sous-marin
-        if(getShips(ShipCategory.AIRCRAFT_CARRIER).size() == 1
-        && getShips(ShipCategory.BATTLESHIP).size() == 1
-        && getShips(ShipCategory.CRUISER).size() == 2
-        && getShips(ShipCategory.DESTROYER).size() == 2
-        && getShips(ShipCategory.SUBMARINE).size() == 1)
-            return true;
-        return false;
+        return getShips(ShipCategory.AIRCRAFT_CARRIER).size() == 1
+                && getShips(ShipCategory.BATTLESHIP).size() == 1
+                && getShips(ShipCategory.CRUISER).size() == 2
+                && getShips(ShipCategory.DESTROYER).size() == 2
+                && getShips(ShipCategory.SUBMARINE).size() == 1;
     }
 
 

src/vue/FenetreConnexion.java

 package vue;
 
+import PremiereFenetre.PremiereFenetre;
 import info1.network.Player;
 
-import javax.swing.*;
-import java.awt.*;
-
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.function.BiPredicate;
 
+
 public class FenetreConnexion extends JFrame {
     private JTextField pseudo;
     private JButton envoyepseudo;
@@ -110,7 +108,8 @@ public class FenetreConnexion extends JFrame {
         /*rejoindre.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                FenetreJeux fJeux = new FenetreJeux();
+                PremiereFenetre.close();
+                FenetreJeux fJeux = new FenetreJeux("yolo");
                 fJeux.setPreferredSize(new Dimension(700, 700));
                 fJeux.pack();
                 fJeux.setVisible(true);
@@ -124,29 +123,22 @@ public class FenetreConnexion extends JFrame {
 
 
     }
-}
 
-/*
     // Les getters
-    public boolean getStatutActualiser(){ return boutonActualiser.isEnabled(); }
-
-    public String getLogin(){ return textLogin.getText(); }
+    public String getPseudo(){ return pseudo.getText(); }
 
-    public Integer getGameID(){ return gameId; }
+    // public Integer getGameID(){ return gameId; }
 
-    public Boolean getCreerpartie() { return creerPartie; }
+    public Boolean getCreerpartie() { return true; }
 
     // Les setters
-    public void setGameID(Integer i){ gameId = i; }
+    // public void setGameID(Integer i){ gameId = i; }
 
-    public void setCreerpartie(Boolean bool) { creerPartie = bool; }
+    // public void setCreerpartie(Boolean bool) { creerPartie = bool; }
 
     // Autres fonctions
-    public void visibleCreer(){ boutonCreer.setEnabled(true); }
-
-    public void visibleRejoidre(){ boutonRejoindre.setEnabled(true); }
+    public void visibleCreer(){ creerPartie.setEnabled(true); }
 
-    public void visibleActualiser(){ boutonActualiser.setEnabled(true); }
+    public void visibleRejoidre(){ rejoindre.setEnabled(true); }
 
-
-}*/
+}

src/vue/FenetreJeux.java

@@ -2,12 +2,88 @@ package vue;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class FenetreJeux extends JFrame {
-    public FenetreJeux() {
-        super();
+    private JTextField pseudo;
+    private JButton envoyepseudo;
+    private JComboBox pInitialise;
+
+    private JButton rejoindre;
+    private JButton creerPartie;
+    private JTextArea zoneMessage;
+    public FenetreJeux(String titre){
+        super(titre);
 
         JPanel principal = new JPanel(new BorderLayout());
         this.setContentPane(principal);
+
+        JPanel north = new JPanel(new FlowLayout());
+        JLabel labelpseudo = new JLabel("Pseudo : ");
+        north.add(labelpseudo);
+        pseudo = new JTextField();
+        pseudo.setPreferredSize(new Dimension(100,30));
+        envoyepseudo = new JButton("Connexion");
+        envoyepseudo.setPreferredSize(new Dimension(100,30));
+        north.add(pseudo);
+        north.add(envoyepseudo);
+        principal.add(north,BorderLayout.NORTH);
+
+        JPanel grille = new JPanel();
+        grille.setLayout(new GridLayout(11,11));
+
+        for (int i=0; i<11;i++){
+            String[] lettres={" ","A","B","C","D","E","F","G","H","I","J"};
+            final JLabel labellettre = new JLabel(lettres[i],SwingConstants.CENTER);
+            labellettre.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+            grille.add(labellettre);
+        }
+
+        int j=0;
+        for (int i =0; i<(11*10); i++){
+            String[] nombres={"1","2","3","4","5","6","7","8","9","10"};
+            final JButton label = new JButton(" ");
+            if(i%11==0) {
+                final JLabel labelchiffres = new JLabel(nombres[j],SwingConstants.CENTER);
+                labelchiffres.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+                grille.add(labelchiffres);
+                j++;
+            }
+            else{
+                label.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+                grille.add(label);
+            }
+        }
+        principal.add(grille,BorderLayout.CENTER);
+
+
+        JPanel bas = new JPanel(new BorderLayout());
+        pInitialise = new JComboBox();
+        bas.add(pInitialise,BorderLayout.NORTH);
+        JPanel boutons = new JPanel(new FlowLayout());
+        rejoindre = new JButton("Rejoindre");
+        creerPartie = new JButton("Créer partie");
+        boutons.add(rejoindre);
+        boutons.add(creerPartie);
+
+        bas.add(boutons,BorderLayout.CENTER);
+
+        zoneMessage = new JTextArea("ZONE MESSAGE");
+        zoneMessage.setPreferredSize(new Dimension(100,100));
+        bas.add(zoneMessage,BorderLayout.SOUTH);
+
+        principal.add(bas,BorderLayout.SOUTH);
+
+        JPanel vide = new JPanel(new FlowLayout());
+        principal.add(vide,BorderLayout.WEST);
+
+        JPanel vide2 = new JPanel(new FlowLayout());
+        principal.add(vide,BorderLayout.EAST);
+
+
+
+
     }
 }
+

test/RunningGameTest.java

@@ -44,7 +44,6 @@ public class RunningGameTest {
         Network.setProxy("srv-proxy-etu-2.iut-nantes.univ-nantes.prive",3128);
         Network.enableProxy(true);
 
-
         Network.suscribeNewPlayer(HTTP_LOCALHOST, joueur1);
         Network.suscribeNewPlayer(HTTP_LOCALHOST, joueur2);