diff --git a/Implementation/chatapp/.idea/artifacts/chatapp.xml b/Implementation/chatapp/.idea/artifacts/chatapp.xml index 72f7f8f..847ea0d 100644 --- a/Implementation/chatapp/.idea/artifacts/chatapp.xml +++ b/Implementation/chatapp/.idea/artifacts/chatapp.xml @@ -1,6 +1,10 @@ $PROJECT_DIR$/out/artifacts/chatapp - + + + + + \ No newline at end of file diff --git a/Implementation/chatapp/.idea/artifacts/chatapp_jar.xml b/Implementation/chatapp/.idea/artifacts/chatapp_jar.xml new file mode 100644 index 0000000..bf3fc9f --- /dev/null +++ b/Implementation/chatapp/.idea/artifacts/chatapp_jar.xml @@ -0,0 +1,29 @@ + + + $PROJECT_DIR$/out/artifacts/chatapp_jar + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Implementation/chatapp/.idea/artifacts/chatapp_main_jar.xml b/Implementation/chatapp/.idea/artifacts/chatapp_main_jar.xml new file mode 100644 index 0000000..12b0835 --- /dev/null +++ b/Implementation/chatapp/.idea/artifacts/chatapp_main_jar.xml @@ -0,0 +1,20 @@ + + + $PROJECT_DIR$/out/artifacts/chatapp_main_jar + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Implementation/chatapp/.idea/misc.xml b/Implementation/chatapp/.idea/misc.xml index 9b61101..e196ca7 100644 --- a/Implementation/chatapp/.idea/misc.xml +++ b/Implementation/chatapp/.idea/misc.xml @@ -1,10 +1,13 @@ + + + - + \ No newline at end of file diff --git a/Implementation/chatapp/build.gradle b/Implementation/chatapp/build.gradle index 040b2e0..7459a57 100644 --- a/Implementation/chatapp/build.gradle +++ b/Implementation/chatapp/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' id 'application' + id 'com.github.johnrengelman.shadow' version '6.1.0' id 'org.openjfx.javafxplugin' version '0.0.9' id 'org.beryx.jlink' version '2.15.1' } @@ -41,4 +42,14 @@ jlink { test { useJUnitPlatform() -} \ No newline at end of file +} + +jar { + manifest { + attributes "Main-Class": "chatapp.Launcher" + } + + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } +} diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt index d3e75c2..d26b86b 100644 --- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt +++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt @@ -14,8 +14,8 @@ chatapp/View/FenetreSession.java chatapp.View.FenetreSession 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 @@ -28,13 +28,13 @@ chatapp/View/Clavardage.java chatapp.View.Clavardage$1 chatapp/Protocol/SessionClavardage.java chatapp.Protocol.SessionClavardage -chatapp/View/ConnexionScreen.java - chatapp.View.ConnexionScreen +chatapp/Protocol/HttpEchange.java + chatapp.Protocol.HttpEchange chatapp/View/View_Utilisateurs.java chatapp.View.View_Utilisateurs chatapp/View/View_Menu.java chatapp.View.View_Menu -chatapp/Protocol/HttpEchange.java - chatapp.Protocol.HttpEchange -chatapp/View/DemarrerSession.java - chatapp.View.DemarrerSession +chatapp/View/ChangementPseudo.java + chatapp.View.ChangementPseudo +chatapp/View/ConnexionScreen.java + chatapp.View.ConnexionScreen diff --git a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java index b0c7cf1..54a7d80 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java +++ b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java @@ -1,5 +1,6 @@ package chatapp.Controller; +import chatapp.Model.DataBase; import chatapp.Model.ListUtilisateurs; import chatapp.Model.Utilisateur; import chatapp.Protocol.*; @@ -175,7 +176,7 @@ public class ChatApp implements PropertyChangeListener { //-------Change son propre nom d'utilisateur-------// this.getActifUsers().modifierList(this.getMe().getPseudo(), nouveau); this.getMe().setPseudo(nouveau); - //db.majPseudo(this.me.getId(),nouveau); + // db.majPseudo(this.me.getId(),nouveau); System.out.println("Changement pseudo accepte, nouvelle liste des utilisateurs actifs:"); this.getActifUsers().afficherListeUtilisateurs(); return true; @@ -402,7 +403,7 @@ public class ChatApp implements PropertyChangeListener { *

* @return La base de donnee associée */ - // public DataBase getDb(){return this.db;} + //public DataBase getDb(){return this.db;} /** *

Getter : Externe diff --git a/Implementation/chatapp/src/main/java/chatapp/Protocol/HttpEchange.java b/Implementation/chatapp/src/main/java/chatapp/Protocol/HttpEchange.java index efbeb80..3ac8271 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Protocol/HttpEchange.java +++ b/Implementation/chatapp/src/main/java/chatapp/Protocol/HttpEchange.java @@ -20,7 +20,7 @@ public class HttpEchange { /* URL de notre serveur de presence */ private String url = "http://192.168.1.72:8080/Server_AL_NM/"; // private String url = "https://srv-gei-tomcat.insa-toulouse.fr/Server_AL_NM/"; - + //private String url = "https://srv-gei-tomcat.insa-toulouse.fr/Server_AL_NM/"; /* True si l'utilisateur peut se connecter avec ce nom d'utilisateur , False sinon */ private static boolean connecte = false; diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java index 82e41ff..2abe0a9 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java @@ -43,6 +43,7 @@ public class ChangementPseudo { /* Une instance de chatApp */ private ChatApp chatApp; + private int MaxLength=10; @FXML /** @@ -70,21 +71,29 @@ public class ChangementPseudo { */ void validerPseudo(ActionEvent event) { boolean pseudoOK = false; - try { - pseudoOK = chatApp.modifierPseudo(pseudonyme.getText()); - } catch (IOException e) { - e.printStackTrace(); - } - if(pseudoOK){ - this.retourMenu(null); - } - else{ + if (pseudonyme.getText().length() > MaxLength) { Alert alert = new Alert(Alert.AlertType.INFORMATION); - alert.setTitle("Changement pseudo"); + alert.setTitle("Connexion"); // Header Text: null alert.setHeaderText(null); - alert.setContentText("Echec de Connexion: le pseudo "+pseudonyme.getText()+" est deja pris"); + alert.setContentText("Echec de Connexion: le pseudo entre fait plus de " + MaxLength + " caracteres"); alert.showAndWait(); + } else { + try { + pseudoOK = chatApp.modifierPseudo(pseudonyme.getText()); + } catch (IOException e) { + e.printStackTrace(); + } + if (pseudoOK) { + this.retourMenu(null); + } else { + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle("Changement pseudo"); + // Header Text: null + alert.setHeaderText(null); + alert.setContentText("Echec de Connexion: le pseudo " + pseudonyme.getText() + " est deja pris"); + alert.showAndWait(); + } } } diff --git a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java index 413d4be..375cc4e 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java @@ -146,7 +146,7 @@ public class Clavardage implements Initializable, PropertyChangeListener { public void ajouterMessagesHistorique(ActionEvent actionEvent) { //this.nomTable = this.session.getApp().getDb().getNomTable(u2,this.session.getApp().getMe()); //String historique = this.session.getApp().getDb().recupNMsg(session.getApp().getMe().getId(),this.u2.getId(), this.session.getApp().getDb().tailleBDD(nomTable)); - ChatText.clear(); + //ChatText.clear(); //ChatText.insertText(0,historique); } } \ No newline at end of file diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java index d3c0996..5778f77 100644 --- a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java +++ b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java @@ -36,6 +36,8 @@ public class ConnexionScreen { /* RadioButton : l'utilisateur est local */ public RadioButton localButton; + private int MaxLength = 10; + @FXML // ResourceBundle that was given to the FXMLLoader private ResourceBundle resources; @@ -55,37 +57,47 @@ public class ConnexionScreen { */ public void connexion(ActionEvent actionEvent) { Boolean connexion = false; - if(this.localButton.isSelected()) { + if (this.localButton.isSelected()) { // PARTIE CONNEXION LOCALE ChatApp.getInstance().setExterne(false); - } - else{ + } else { // PARTIE CONNEXION DISTANTE ChatApp.getInstance().setExterne(true); } - try { - connexion = ChatApp.getInstance().connexion(pseudonyme.getText()); - } catch (IOException e) { - e.printStackTrace(); - } - if (!connexion) { + if (pseudonyme.getText().length() > MaxLength) { 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.setContentText("Echec de Connexion: le pseudo entre fait plus de " + MaxLength + " caracteres"); alert.showAndWait(); } else { - Stage stage = (Stage) connexionButton.getScene().getWindow(); - Parent root = null; + + 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(); + } + } } - } }