alartigu/ChatApp-AL-NM
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Mise en place du json

Browse source
This commit is contained in:
Nabzzz 2021-02-11 15:30:37 +01:00
parent c4e5f8c1cd
commit 8c3a3c66f7
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
View file

@ -1,5 +1,11 @@
chatapp/Launcher.java
chatapp.Launcher
chatapp/Model/Utilisateur.java
chatapp.Model.Utilisateur
chatapp/Model/MessageHorodate.java
chatapp.Model.MessageHorodate
chatapp/Model/ListUtilisateurs.java
chatapp.Model.ListUtilisateurs
chatapp/Protocol/RunnerEcouteTCP.java
chatapp.Protocol.RunnerEcouteTCP
chatapp/View/FenetreSession.java
@ -12,13 +18,9 @@ chatapp/View/ChangementPseudo.java
chatapp.View.ChangementPseudo
chatapp/Protocol/RunnerEcouteUDP.java
chatapp.Protocol.RunnerEcouteUDP
chatapp/Model/ListUtilisateurs.java
chatapp.Model.ListUtilisateurs
chatapp/Protocol/UDPEchange.java
chatapp.Protocol.RunnerUDP
chatapp.Protocol.UDPEchange
chatapp/Model/MessageHorodate.java
chatapp.Model.MessageHorodate
chatapp/Main.java
chatapp.Main
chatapp/View/Clavardage.java
@ -30,8 +32,6 @@ chatapp/View/ConnexionScreen.java
chatapp.View.ConnexionScreen
chatapp/View/View_Utilisateurs.java
chatapp.View.View_Utilisateurs
chatapp/Model/Utilisateur.java
chatapp.Model.Utilisateur
chatapp/View/View_Menu.java
chatapp.View.View_Menu
chatapp/Protocol/HttpEchange.java

3
Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java
View file

@ -91,7 +91,7 @@ public class ChatApp implements PropertyChangeListener {
this.me = new Utilisateur(pseudo,port,ip);
this.actifUsers.addList(getMe());
this.main = main;
this.db= DataBase.getInstance();
this.connecte=false;
String path = System.getProperty("user.dir")+ FILE_SEPARATOR + "config.json";
@ -107,6 +107,7 @@ public class ChatApp implements PropertyChangeListener {
e.printStackTrace();
}
this.externeEchange = new HttpEchange(this);
this.db= DataBase.getInstance(this);
}
/**

15
Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java
View file

@ -41,6 +41,8 @@ public class DataBase {
/* Mdp pour se connecter à la BDD */
private String pswd = "baePh9ei";
private ChatApp chatapp;
/* Singleton */
private static final DataBase instance = null;
@ -48,10 +50,11 @@ public class DataBase {
* Constructeur de la database
* <br> On installe le driver et on établit la connection.
*/
public DataBase() {
this.dBurl = (String) ChatApp.getInstance().getConfigJSON().get("BaseDeDonnesURL");
this.login = (String) ChatApp.getInstance().getConfigJSON().get("BaseDeDonnesLogin");
this.pswd = (String) ChatApp.getInstance().getConfigJSON().get("BaseDeDonnesMDP");
public DataBase(ChatApp chatapp) {
this.chatapp = chatapp;
this.login = (String) chatapp.getConfigJSON().get("BaseDeDonnesLogin");
this.pswd = (String) chatapp.getConfigJSON().get("BaseDeDonnesMDP");
this.dBurl = (String) chatapp.getConfigJSON().get("BaseDeDonnesURL");
try {
//Besoin d'installer le driver JDBC entre java IDE et le system DBMS pour faire un pont entre les deux
Class.forName("com.mysql.cj.jdbc.Driver");
@ -78,9 +81,9 @@ public class DataBase {
* Méthode permettant de renvoyer une instance de la classe DataBase
* @return L'instance du singleton DataBase.
*/
public static DataBase getInstance() {
public static DataBase getInstance(ChatApp chatapp) {
synchronized (DataBase.class) {
return new DataBase();
return new DataBase(chatapp);
}
}