Commit 0b9c4d16 authored by Tristan MAISONNEUVE's avatar Tristan MAISONNEUVE
Browse files

Add connexion et créer partie fenetre connexion

parent fd2d0560
...@@ -105,7 +105,7 @@ public class Application { ...@@ -105,7 +105,7 @@ public class Application {
-9999 sinon -9999 sinon
*/ */
boolean partie_bool = true; /*boolean partie_bool = true;
int info; int info;
while(partie_bool){ while(partie_bool){
info = 0;//Network.getInfo("http://172.26.82.18//api/v0",GAME,jaquie); info = 0;//Network.getInfo("http://172.26.82.18//api/v0",GAME,jaquie);
...@@ -144,7 +144,7 @@ public class Application { ...@@ -144,7 +144,7 @@ public class Application {
break; break;
} }
Thread.sleep(500); Thread.sleep(500);
} }*/
......
...@@ -219,11 +219,6 @@ public class FenetreConnexion extends JFrame { ...@@ -219,11 +219,6 @@ public class FenetreConnexion extends JFrame {
principal.add(est,BorderLayout.EAST); principal.add(est,BorderLayout.EAST);
//PremiereFenetre.close();
FenetreJeux fJeux = new FenetreJeux("yolo");
fJeux.setPreferredSize(new Dimension(700, 700));
fJeux.pack();
fJeux.setVisible(true);
...@@ -232,7 +227,11 @@ public class FenetreConnexion extends JFrame { ...@@ -232,7 +227,11 @@ public class FenetreConnexion extends JFrame {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
jeu = (Game) pInitialise.getSelectedItem(); jeu = (Game) pInitialise.getSelectedItem();
choix = 1; choix = 1;
//TODO ihm changer fenetre PremiereFenetre.close();
FenetreJeux fJeux = new FenetreJeux("Game");
fJeux.setPreferredSize(new Dimension(700, 700));
fJeux.pack();
fJeux.setVisible(true);
} }
}); });
...@@ -240,6 +239,11 @@ public class FenetreConnexion extends JFrame { ...@@ -240,6 +239,11 @@ public class FenetreConnexion extends JFrame {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
choix = 2; choix = 2;
PremiereFenetre.close();
FenetreJeux fJeux = new FenetreJeux("Game");
fJeux.setPreferredSize(new Dimension(700, 700));
fJeux.pack();
fJeux.setVisible(true);
} }
}); });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment