From 4e188d0258f981fdbdb6f7482f0d07e070fecc5e Mon Sep 17 00:00:00 2001 From: Nabzzz Date: Sun, 3 Jan 2021 12:27:07 +0100 Subject: [PATCH] Bouton pour choix de type de connexion --- .../build/classes/java/main/.gitignore | 1 - .../compileJava/source-classes-mapping.txt | 24 +++++----- .../java/chatapp/View/ConnexionScreen.java | 47 +++++++++++-------- .../resources/fenetres/ConnexionScreen.fxml | 24 +++++++--- 4 files changed, 57 insertions(+), 39 deletions(-) delete mode 100644 Implementation/chatapp/build/classes/java/main/.gitignore diff --git a/Implementation/chatapp/build/classes/java/main/.gitignore b/Implementation/chatapp/build/classes/java/main/.gitignore deleted file mode 100644 index cbc3faa..0000000 --- a/Implementation/chatapp/build/classes/java/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/chatapp/ diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt index 07f38e8..40fdc3c 100644 --- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt +++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt @@ -1,12 +1,12 @@ chatapp/Launcher.java chatapp.Launcher -chatapp/View/ConnexionScreen.java - chatapp.View.ConnexionScreen +chatapp/View/Clavardage.java + chatapp.View.Clavardage + chatapp.View.Clavardage$1 chatapp/View/DemarrerSession.java chatapp.View.DemarrerSession -chatapp/View/FenetreSession.java - chatapp.View.FenetreSession - chatapp.View.FenetreSession$1 +chatapp/Protocol/RunnerEcouteUDP.java + chatapp.Protocol.RunnerEcouteUDP chatapp/Model/Utilisateur.java chatapp.Model.Utilisateur chatapp/View/View_Utilisateurs.java @@ -28,12 +28,12 @@ chatapp/Controller/ChatApp.java chatapp.Controller.ChatApp chatapp/Main.java chatapp.Main -chatapp/View/Clavardage.java - chatapp.View.Clavardage - chatapp.View.Clavardage$1 -chatapp/Protocol/SessionClavardage.java - chatapp.Protocol.SessionClavardage chatapp/Model/DataBase.java chatapp.Model.DataBase -chatapp/Protocol/RunnerEcouteUDP.java - chatapp.Protocol.RunnerEcouteUDP +chatapp/Protocol/SessionClavardage.java + chatapp.Protocol.SessionClavardage +chatapp/View/FenetreSession.java + chatapp.View.FenetreSession + chatapp.View.FenetreSession$1 +chatapp/View/ConnexionScreen.java + chatapp.View.ConnexionScreen diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java index 6ae272f..9997cc5 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java @@ -13,6 +13,7 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Alert; import javafx.scene.control.Button; +import javafx.scene.control.RadioButton; import javafx.scene.control.TextField; import javafx.stage.Stage; @@ -21,6 +22,8 @@ public class ConnexionScreen { public Button connexionButton; public TextField pseudonyme; + public RadioButton remoteButton; + public RadioButton localButton; @FXML // ResourceBundle that was given to the FXMLLoader private ResourceBundle resources; @@ -41,30 +44,34 @@ public class ConnexionScreen { */ public void connexion(ActionEvent actionEvent) { Boolean connexion = false; - try { - connexion = ChatApp.getInstance().connexion(pseudonyme.getText()); - } catch (IOException e) { - e.printStackTrace(); - } - if(!connexion){ - Alert alert = new Alert(Alert.AlertType.INFORMATION); - alert.setTitle("Connexion"); - // Header Text: null - alert.setHeaderText(null); - alert.setContentText("Echec de Connexion: le pseudo "+pseudonyme.getText()+" est deja pris"); - alert.showAndWait(); - } - else{ - Stage stage = (Stage) connexionButton.getScene().getWindow(); - Parent root = null; + if(this.localButton.isSelected()) { try { - root = FXMLLoader.load(getClass().getResource("/fenetres/View_Menu.fxml")); + connexion = ChatApp.getInstance().connexion(pseudonyme.getText()); } catch (IOException e) { e.printStackTrace(); } - Scene scene = new Scene(root); - stage.setScene(scene); - stage.show(); + if (!connexion) { + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle("Connexion"); + // Header Text: null + alert.setHeaderText(null); + alert.setContentText("Echec de Connexion: le pseudo " + pseudonyme.getText() + " est deja pris"); + alert.showAndWait(); + } else { + Stage stage = (Stage) connexionButton.getScene().getWindow(); + Parent root = null; + try { + root = FXMLLoader.load(getClass().getResource("/fenetres/View_Menu.fxml")); + } catch (IOException e) { + e.printStackTrace(); + } + Scene scene = new Scene(root); + stage.setScene(scene); + stage.show(); + } + } + else{ + // PARTIE CONNEXION DISTANTE } } } diff --git a/Implementation/chatapp/src/main/resources/fenetres/ConnexionScreen.fxml b/Implementation/chatapp/src/main/resources/fenetres/ConnexionScreen.fxml index c09f679..2443a4a 100644 --- a/Implementation/chatapp/src/main/resources/fenetres/ConnexionScreen.fxml +++ b/Implementation/chatapp/src/main/resources/fenetres/ConnexionScreen.fxml @@ -1,7 +1,9 @@ + + @@ -24,24 +26,34 @@ - + - + + - - + + + + + - - + + + + + +