From 338e52671e96c585176fb30703edea512c751f0b Mon Sep 17 00:00:00 2001 From: Nabzzz Date: Mon, 28 Dec 2020 00:00:49 +0100 Subject: [PATCH] Nouvelle interface graphique --- Implementation/chatapp/build.gradle | 1 + .../compileJava/source-classes-mapping.txt | 8 ++--- .../chatapp/src/main/java/chatapp/Main.java | 2 ++ .../chatapp/Protocol/SessionClavardage.java | 2 +- .../java/chatapp/View/ChangementPseudo.java | 2 ++ .../main/java/chatapp/View/Clavardage.java | 30 +++++++++---------- .../resources/fenetres/View_Clavardage.fxml | 22 +++++++------- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Implementation/chatapp/build.gradle b/Implementation/chatapp/build.gradle index c76d1ef..040b2e0 100644 --- a/Implementation/chatapp/build.gradle +++ b/Implementation/chatapp/build.gradle @@ -22,6 +22,7 @@ javafx { dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.22' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.22' runtimeOnly "org.openjfx:javafx-graphics:$javafx.version:win" diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt index f3acad7..6bf5cd7 100644 --- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt +++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt @@ -15,8 +15,8 @@ chatapp/View/FenetreSession.java chatapp.View.FenetreSession$1 chatapp/Controller/ChatApp.java chatapp.Controller.ChatApp -chatapp/View/ChangementPseudo.java - chatapp.View.ChangementPseudo +chatapp/View/DemarrerSession.java + chatapp.View.DemarrerSession chatapp/Protocol/RunnerEcouteUDP.java chatapp.Protocol.RunnerEcouteUDP chatapp/Protocol/UDPEchange.java @@ -35,5 +35,5 @@ chatapp/View/View_Utilisateurs.java chatapp.View.View_Utilisateurs chatapp/View/View_Menu.java chatapp.View.View_Menu -chatapp/View/DemarrerSession.java - chatapp.View.DemarrerSession +chatapp/View/ChangementPseudo.java + chatapp.View.ChangementPseudo diff --git a/Implementation/chatapp/src/main/java/chatapp/Main.java b/Implementation/chatapp/src/main/java/chatapp/Main.java index 1570063..40933b0 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Main.java +++ b/Implementation/chatapp/src/main/java/chatapp/Main.java @@ -7,6 +7,8 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; +import java.io.IOException; + public class Main extends Application { ChatApp chatapp; diff --git a/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java b/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java index 37c7fd6..fc655cc 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java +++ b/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java @@ -62,7 +62,7 @@ public class SessionClavardage extends Thread { } this.derniersMsg = new ArrayList(); this.pcs = new PropertyChangeSupport(this); - //db.CreationTableHistorique("Doudou","Marvel"); + db.CreationTableHistorique("Doudou","Marvel"); this.start(); Platform.runLater( () -> new FenetreSession(this) diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java index a2f8d27..41ab660 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java @@ -45,6 +45,7 @@ public class ChangementPseudo { @FXML void retourMenu(ActionEvent event) { + System.out.println("Retour au menu principal"); Stage stage = (Stage) MenuButton.getScene().getWindow(); Parent root = null; try { @@ -83,5 +84,6 @@ public class ChangementPseudo { chatApp = ChatApp.getInstance(); pseudonyme1.setText(chatApp.getMe().getPseudo()); this.validationButton.setDefaultButton(true); + //System.out.println(this.validationButton.isDefaultButton()); } } \ No newline at end of file diff --git a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java index 1992220..9facb7f 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java @@ -22,6 +22,7 @@ import javafx.stage.Stage; public class Clavardage implements Initializable, PropertyChangeListener { + public Button plusButton; @FXML // ResourceBundle that was given to the FXMLLoader private ResourceBundle resources; @@ -41,38 +42,32 @@ public class Clavardage implements Initializable, PropertyChangeListener { private TextArea ChatText; // Value injected by FXMLLoader @FXML // fx:id="MenuButton" - private Button MenuButton; // Value injected by FXMLLoader + private Utilisateur u2; private SessionClavardage session; - public int Clav = 3; + @FXML void envoyerMessage(ActionEvent event) { String msg = AEnvoyer.getText(); AEnvoyer.clear(); - session.envoiMsg(msg); - msg= "Moi: "+msg+"\n"; - ChatText.appendText(msg); + if(!msg.equals("")) { + session.envoiMsg(msg); + msg = "Moi: " + msg + "\n"; + ChatText.appendText(msg); + } } - @FXML - void retourMenu(ActionEvent event) { - - } @FXML // This method is called by the FXMLLoader when initialization is complete void initialize() { } - public void printsalut(){ - System.out.println("wesh"); - } + public void setSession(SessionClavardage session) { - //this.printsalut(); + this.session = session; - System.out.println("1"); + this.session.addPropertyChangeListener(this); - System.out.println("2"); this.u2=session.getU2(); - System.out.println("3"); this.pseudonyme1.setText(u2.getPseudo()); } @@ -107,4 +102,7 @@ public class Clavardage implements Initializable, PropertyChangeListener { EnvoyerButton.setDefaultButton(true); this.ChatText.setEditable(false); } + + public void ajouterMessagesHistorique(ActionEvent actionEvent) { + } } \ No newline at end of file diff --git a/Implementation/chatapp/src/main/resources/fenetres/View_Clavardage.fxml b/Implementation/chatapp/src/main/resources/fenetres/View_Clavardage.fxml index 9e8975e..ebb0e85 100644 --- a/Implementation/chatapp/src/main/resources/fenetres/View_Clavardage.fxml +++ b/Implementation/chatapp/src/main/resources/fenetres/View_Clavardage.fxml @@ -51,25 +51,31 @@