diff --git a/chatGit/.classpath b/Projet Eclipse/chatGit/.classpath similarity index 100% rename from chatGit/.classpath rename to Projet Eclipse/chatGit/.classpath diff --git a/chatGit/.project b/Projet Eclipse/chatGit/.project similarity index 100% rename from chatGit/.project rename to Projet Eclipse/chatGit/.project diff --git a/chatGit/.settings/org.eclipse.jdt.core.prefs b/Projet Eclipse/chatGit/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chatGit/.settings/org.eclipse.jdt.core.prefs rename to Projet Eclipse/chatGit/.settings/org.eclipse.jdt.core.prefs diff --git a/chatGit/b1.jpg b/Projet Eclipse/chatGit/b1.jpg similarity index 100% rename from chatGit/b1.jpg rename to Projet Eclipse/chatGit/b1.jpg diff --git a/chatGit/background2.jpg b/Projet Eclipse/chatGit/background2.jpg similarity index 100% rename from chatGit/background2.jpg rename to Projet Eclipse/chatGit/background2.jpg diff --git a/chatGit/bin/config/ConfLoad$ConfLoadCb.class b/Projet Eclipse/chatGit/bin/config/ConfLoad$ConfLoadCb.class similarity index 100% rename from chatGit/bin/config/ConfLoad$ConfLoadCb.class rename to Projet Eclipse/chatGit/bin/config/ConfLoad$ConfLoadCb.class diff --git a/chatGit/bin/config/ConfLoad.class b/Projet Eclipse/chatGit/bin/config/ConfLoad.class similarity index 100% rename from chatGit/bin/config/ConfLoad.class rename to Projet Eclipse/chatGit/bin/config/ConfLoad.class diff --git a/chatGit/bin/config/Configuration$Conf.class b/Projet Eclipse/chatGit/bin/config/Configuration$Conf.class similarity index 100% rename from chatGit/bin/config/Configuration$Conf.class rename to Projet Eclipse/chatGit/bin/config/Configuration$Conf.class diff --git a/chatGit/bin/config/Configuration$SConf.class b/Projet Eclipse/chatGit/bin/config/Configuration$SConf.class similarity index 100% rename from chatGit/bin/config/Configuration$SConf.class rename to Projet Eclipse/chatGit/bin/config/Configuration$SConf.class diff --git a/chatGit/bin/config/Configuration.class b/Projet Eclipse/chatGit/bin/config/Configuration.class similarity index 100% rename from chatGit/bin/config/Configuration.class rename to Projet Eclipse/chatGit/bin/config/Configuration.class diff --git a/chatGit/bin/config/package-info.class b/Projet Eclipse/chatGit/bin/config/package-info.class similarity index 100% rename from chatGit/bin/config/package-info.class rename to Projet Eclipse/chatGit/bin/config/package-info.class diff --git a/chatGit/bin/controller/Agent.class b/Projet Eclipse/chatGit/bin/controller/Agent.class similarity index 100% rename from chatGit/bin/controller/Agent.class rename to Projet Eclipse/chatGit/bin/controller/Agent.class diff --git a/chatGit/bin/controller/DataBase.class b/Projet Eclipse/chatGit/bin/controller/DataBase.class similarity index 100% rename from chatGit/bin/controller/DataBase.class rename to Projet Eclipse/chatGit/bin/controller/DataBase.class diff --git a/chatGit/bin/controller/Test.class b/Projet Eclipse/chatGit/bin/controller/Test.class similarity index 100% rename from chatGit/bin/controller/Test.class rename to Projet Eclipse/chatGit/bin/controller/Test.class diff --git a/chatGit/bin/controller/package-info.class b/Projet Eclipse/chatGit/bin/controller/package-info.class similarity index 100% rename from chatGit/bin/controller/package-info.class rename to Projet Eclipse/chatGit/bin/controller/package-info.class diff --git a/chatGit/bin/gui/FenetreChat$1.class b/Projet Eclipse/chatGit/bin/gui/FenetreChat$1.class similarity index 100% rename from chatGit/bin/gui/FenetreChat$1.class rename to Projet Eclipse/chatGit/bin/gui/FenetreChat$1.class diff --git a/chatGit/bin/gui/FenetreChat$2.class b/Projet Eclipse/chatGit/bin/gui/FenetreChat$2.class similarity index 100% rename from chatGit/bin/gui/FenetreChat$2.class rename to Projet Eclipse/chatGit/bin/gui/FenetreChat$2.class diff --git a/chatGit/bin/gui/FenetreChat$3.class b/Projet Eclipse/chatGit/bin/gui/FenetreChat$3.class similarity index 100% rename from chatGit/bin/gui/FenetreChat$3.class rename to Projet Eclipse/chatGit/bin/gui/FenetreChat$3.class diff --git a/chatGit/bin/gui/FenetreChat.class b/Projet Eclipse/chatGit/bin/gui/FenetreChat.class similarity index 100% rename from chatGit/bin/gui/FenetreChat.class rename to Projet Eclipse/chatGit/bin/gui/FenetreChat.class diff --git a/chatGit/bin/gui/FenetreConnexion$1.class b/Projet Eclipse/chatGit/bin/gui/FenetreConnexion$1.class similarity index 100% rename from chatGit/bin/gui/FenetreConnexion$1.class rename to Projet Eclipse/chatGit/bin/gui/FenetreConnexion$1.class diff --git a/chatGit/bin/gui/FenetreConnexion$2.class b/Projet Eclipse/chatGit/bin/gui/FenetreConnexion$2.class similarity index 100% rename from chatGit/bin/gui/FenetreConnexion$2.class rename to Projet Eclipse/chatGit/bin/gui/FenetreConnexion$2.class diff --git a/chatGit/bin/gui/FenetreConnexion.class b/Projet Eclipse/chatGit/bin/gui/FenetreConnexion.class similarity index 100% rename from chatGit/bin/gui/FenetreConnexion.class rename to Projet Eclipse/chatGit/bin/gui/FenetreConnexion.class diff --git a/chatGit/bin/gui/FenetreInscription$1.class b/Projet Eclipse/chatGit/bin/gui/FenetreInscription$1.class similarity index 100% rename from chatGit/bin/gui/FenetreInscription$1.class rename to Projet Eclipse/chatGit/bin/gui/FenetreInscription$1.class diff --git a/chatGit/bin/gui/FenetreInscription$2.class b/Projet Eclipse/chatGit/bin/gui/FenetreInscription$2.class similarity index 100% rename from chatGit/bin/gui/FenetreInscription$2.class rename to Projet Eclipse/chatGit/bin/gui/FenetreInscription$2.class diff --git a/chatGit/bin/gui/FenetreInscription$3.class b/Projet Eclipse/chatGit/bin/gui/FenetreInscription$3.class similarity index 100% rename from chatGit/bin/gui/FenetreInscription$3.class rename to Projet Eclipse/chatGit/bin/gui/FenetreInscription$3.class diff --git a/chatGit/bin/gui/FenetreInscription$4.class b/Projet Eclipse/chatGit/bin/gui/FenetreInscription$4.class similarity index 100% rename from chatGit/bin/gui/FenetreInscription$4.class rename to Projet Eclipse/chatGit/bin/gui/FenetreInscription$4.class diff --git a/chatGit/bin/gui/FenetreInscription.class b/Projet Eclipse/chatGit/bin/gui/FenetreInscription.class similarity index 100% rename from chatGit/bin/gui/FenetreInscription.class rename to Projet Eclipse/chatGit/bin/gui/FenetreInscription.class diff --git a/chatGit/bin/gui/FenetreMenu$1.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu$1.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu$1.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu$1.class diff --git a/chatGit/bin/gui/FenetreMenu$2.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu$2.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu$2.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu$2.class diff --git a/chatGit/bin/gui/FenetreMenu$3.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu$3.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu$3.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu$3.class diff --git a/chatGit/bin/gui/FenetreMenu$4.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu$4.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu$4.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu$4.class diff --git a/chatGit/bin/gui/FenetreMenu$5.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu$5.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu$5.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu$5.class diff --git a/chatGit/bin/gui/FenetreMenu.class b/Projet Eclipse/chatGit/bin/gui/FenetreMenu.class similarity index 100% rename from chatGit/bin/gui/FenetreMenu.class rename to Projet Eclipse/chatGit/bin/gui/FenetreMenu.class diff --git a/chatGit/bin/gui/FenetreModifPseudo.class b/Projet Eclipse/chatGit/bin/gui/FenetreModifPseudo.class similarity index 100% rename from chatGit/bin/gui/FenetreModifPseudo.class rename to Projet Eclipse/chatGit/bin/gui/FenetreModifPseudo.class diff --git a/chatGit/bin/gui/SmartScroller$1.class b/Projet Eclipse/chatGit/bin/gui/SmartScroller$1.class similarity index 100% rename from chatGit/bin/gui/SmartScroller$1.class rename to Projet Eclipse/chatGit/bin/gui/SmartScroller$1.class diff --git a/chatGit/bin/gui/SmartScroller.class b/Projet Eclipse/chatGit/bin/gui/SmartScroller.class similarity index 100% rename from chatGit/bin/gui/SmartScroller.class rename to Projet Eclipse/chatGit/bin/gui/SmartScroller.class diff --git a/chatGit/bin/gui/package-info.class b/Projet Eclipse/chatGit/bin/gui/package-info.class similarity index 100% rename from chatGit/bin/gui/package-info.class rename to Projet Eclipse/chatGit/bin/gui/package-info.class diff --git a/chatGit/bin/images/panda.png b/Projet Eclipse/chatGit/bin/images/panda.png similarity index 100% rename from chatGit/bin/images/panda.png rename to Projet Eclipse/chatGit/bin/images/panda.png diff --git a/chatGit/bin/model/Contact.class b/Projet Eclipse/chatGit/bin/model/Contact.class similarity index 100% rename from chatGit/bin/model/Contact.class rename to Projet Eclipse/chatGit/bin/model/Contact.class diff --git a/chatGit/bin/model/ListeContacts.class b/Projet Eclipse/chatGit/bin/model/ListeContacts.class similarity index 100% rename from chatGit/bin/model/ListeContacts.class rename to Projet Eclipse/chatGit/bin/model/ListeContacts.class diff --git a/chatGit/bin/model/Message.class b/Projet Eclipse/chatGit/bin/model/Message.class similarity index 100% rename from chatGit/bin/model/Message.class rename to Projet Eclipse/chatGit/bin/model/Message.class diff --git a/chatGit/bin/model/MessageAffichage.class b/Projet Eclipse/chatGit/bin/model/MessageAffichage.class similarity index 100% rename from chatGit/bin/model/MessageAffichage.class rename to Projet Eclipse/chatGit/bin/model/MessageAffichage.class diff --git a/chatGit/bin/model/MessageChat.class b/Projet Eclipse/chatGit/bin/model/MessageChat.class similarity index 100% rename from chatGit/bin/model/MessageChat.class rename to Projet Eclipse/chatGit/bin/model/MessageChat.class diff --git a/chatGit/bin/model/MessagePseudo.class b/Projet Eclipse/chatGit/bin/model/MessagePseudo.class similarity index 100% rename from chatGit/bin/model/MessagePseudo.class rename to Projet Eclipse/chatGit/bin/model/MessagePseudo.class diff --git a/chatGit/bin/module-info.class b/Projet Eclipse/chatGit/bin/module-info.class similarity index 100% rename from chatGit/bin/module-info.class rename to Projet Eclipse/chatGit/bin/module-info.class diff --git a/chatGit/bin/network/Manager.class b/Projet Eclipse/chatGit/bin/network/Manager.class similarity index 100% rename from chatGit/bin/network/Manager.class rename to Projet Eclipse/chatGit/bin/network/Manager.class diff --git a/chatGit/bin/network/TCPChat.class b/Projet Eclipse/chatGit/bin/network/TCPChat.class similarity index 100% rename from chatGit/bin/network/TCPChat.class rename to Projet Eclipse/chatGit/bin/network/TCPChat.class diff --git a/chatGit/bin/network/TCPServer.class b/Projet Eclipse/chatGit/bin/network/TCPServer.class similarity index 100% rename from chatGit/bin/network/TCPServer.class rename to Projet Eclipse/chatGit/bin/network/TCPServer.class diff --git a/chatGit/bin/network/Tools.class b/Projet Eclipse/chatGit/bin/network/Tools.class similarity index 100% rename from chatGit/bin/network/Tools.class rename to Projet Eclipse/chatGit/bin/network/Tools.class diff --git a/chatGit/bin/network/UDPInput.class b/Projet Eclipse/chatGit/bin/network/UDPInput.class similarity index 100% rename from chatGit/bin/network/UDPInput.class rename to Projet Eclipse/chatGit/bin/network/UDPInput.class diff --git a/chatGit/bin/network/UDPOutput.class b/Projet Eclipse/chatGit/bin/network/UDPOutput.class similarity index 100% rename from chatGit/bin/network/UDPOutput.class rename to Projet Eclipse/chatGit/bin/network/UDPOutput.class diff --git a/chatGit/bin/server/Request.class b/Projet Eclipse/chatGit/bin/server/Request.class similarity index 100% rename from chatGit/bin/server/Request.class rename to Projet Eclipse/chatGit/bin/server/Request.class diff --git a/chatGit/bin/server/package-info.class b/Projet Eclipse/chatGit/bin/server/package-info.class similarity index 100% rename from chatGit/bin/server/package-info.class rename to Projet Eclipse/chatGit/bin/server/package-info.class diff --git a/chatGit/bin/test/App$1.class b/Projet Eclipse/chatGit/bin/test/App$1.class similarity index 100% rename from chatGit/bin/test/App$1.class rename to Projet Eclipse/chatGit/bin/test/App$1.class diff --git a/chatGit/bin/test/App.class b/Projet Eclipse/chatGit/bin/test/App.class similarity index 100% rename from chatGit/bin/test/App.class rename to Projet Eclipse/chatGit/bin/test/App.class diff --git a/chatGit/bin/test/Launcher.class b/Projet Eclipse/chatGit/bin/test/Launcher.class similarity index 100% rename from chatGit/bin/test/Launcher.class rename to Projet Eclipse/chatGit/bin/test/Launcher.class diff --git a/chatGit/bin/test/package-info.class b/Projet Eclipse/chatGit/bin/test/package-info.class similarity index 100% rename from chatGit/bin/test/package-info.class rename to Projet Eclipse/chatGit/bin/test/package-info.class diff --git a/chatGit/config.json b/Projet Eclipse/chatGit/config.json similarity index 100% rename from chatGit/config.json rename to Projet Eclipse/chatGit/config.json diff --git a/chatGit/lib/JTattoo-1.6.13.jar b/Projet Eclipse/chatGit/lib/JTattoo-1.6.13.jar similarity index 100% rename from chatGit/lib/JTattoo-1.6.13.jar rename to Projet Eclipse/chatGit/lib/JTattoo-1.6.13.jar diff --git a/chatGit/lib/java-json.jar b/Projet Eclipse/chatGit/lib/java-json.jar similarity index 100% rename from chatGit/lib/java-json.jar rename to Projet Eclipse/chatGit/lib/java-json.jar diff --git a/chatGit/lib/mysql-connector-java-5.0.5-bin.jar b/Projet Eclipse/chatGit/lib/mysql-connector-java-5.0.5-bin.jar similarity index 100% rename from chatGit/lib/mysql-connector-java-5.0.5-bin.jar rename to Projet Eclipse/chatGit/lib/mysql-connector-java-5.0.5-bin.jar diff --git a/chatGit/panda.png b/Projet Eclipse/chatGit/panda.png similarity index 100% rename from chatGit/panda.png rename to Projet Eclipse/chatGit/panda.png diff --git a/chatGit/src/config/ConfLoad.java b/Projet Eclipse/chatGit/src/config/ConfLoad.java similarity index 100% rename from chatGit/src/config/ConfLoad.java rename to Projet Eclipse/chatGit/src/config/ConfLoad.java diff --git a/chatGit/src/config/Configuration.java b/Projet Eclipse/chatGit/src/config/Configuration.java similarity index 100% rename from chatGit/src/config/Configuration.java rename to Projet Eclipse/chatGit/src/config/Configuration.java diff --git a/chatGit/src/config/package-info.java b/Projet Eclipse/chatGit/src/config/package-info.java similarity index 100% rename from chatGit/src/config/package-info.java rename to Projet Eclipse/chatGit/src/config/package-info.java diff --git a/chatGit/src/controller/Agent.java b/Projet Eclipse/chatGit/src/controller/Agent.java similarity index 100% rename from chatGit/src/controller/Agent.java rename to Projet Eclipse/chatGit/src/controller/Agent.java diff --git a/chatGit/src/controller/DataBase.java b/Projet Eclipse/chatGit/src/controller/DataBase.java similarity index 100% rename from chatGit/src/controller/DataBase.java rename to Projet Eclipse/chatGit/src/controller/DataBase.java diff --git a/chatGit/src/controller/Test.java b/Projet Eclipse/chatGit/src/controller/Test.java similarity index 100% rename from chatGit/src/controller/Test.java rename to Projet Eclipse/chatGit/src/controller/Test.java diff --git a/chatGit/src/controller/package-info.java b/Projet Eclipse/chatGit/src/controller/package-info.java similarity index 100% rename from chatGit/src/controller/package-info.java rename to Projet Eclipse/chatGit/src/controller/package-info.java diff --git a/chatGit/src/gui/FenetreChat.java b/Projet Eclipse/chatGit/src/gui/FenetreChat.java similarity index 100% rename from chatGit/src/gui/FenetreChat.java rename to Projet Eclipse/chatGit/src/gui/FenetreChat.java diff --git a/chatGit/src/gui/FenetreConnexion.java b/Projet Eclipse/chatGit/src/gui/FenetreConnexion.java similarity index 100% rename from chatGit/src/gui/FenetreConnexion.java rename to Projet Eclipse/chatGit/src/gui/FenetreConnexion.java diff --git a/chatGit/src/gui/FenetreInscription.java b/Projet Eclipse/chatGit/src/gui/FenetreInscription.java similarity index 100% rename from chatGit/src/gui/FenetreInscription.java rename to Projet Eclipse/chatGit/src/gui/FenetreInscription.java diff --git a/chatGit/src/gui/FenetreMenu.java b/Projet Eclipse/chatGit/src/gui/FenetreMenu.java similarity index 100% rename from chatGit/src/gui/FenetreMenu.java rename to Projet Eclipse/chatGit/src/gui/FenetreMenu.java diff --git a/chatGit/src/gui/FenetreModifPseudo.java b/Projet Eclipse/chatGit/src/gui/FenetreModifPseudo.java similarity index 100% rename from chatGit/src/gui/FenetreModifPseudo.java rename to Projet Eclipse/chatGit/src/gui/FenetreModifPseudo.java diff --git a/chatGit/src/gui/SmartScroller.java b/Projet Eclipse/chatGit/src/gui/SmartScroller.java similarity index 100% rename from chatGit/src/gui/SmartScroller.java rename to Projet Eclipse/chatGit/src/gui/SmartScroller.java diff --git a/chatGit/src/gui/package-info.java b/Projet Eclipse/chatGit/src/gui/package-info.java similarity index 100% rename from chatGit/src/gui/package-info.java rename to Projet Eclipse/chatGit/src/gui/package-info.java diff --git a/chatGit/src/images/panda.png b/Projet Eclipse/chatGit/src/images/panda.png similarity index 100% rename from chatGit/src/images/panda.png rename to Projet Eclipse/chatGit/src/images/panda.png diff --git a/chatGit/src/model/Contact.java b/Projet Eclipse/chatGit/src/model/Contact.java similarity index 100% rename from chatGit/src/model/Contact.java rename to Projet Eclipse/chatGit/src/model/Contact.java diff --git a/chatGit/src/model/ListeContacts.java b/Projet Eclipse/chatGit/src/model/ListeContacts.java similarity index 100% rename from chatGit/src/model/ListeContacts.java rename to Projet Eclipse/chatGit/src/model/ListeContacts.java diff --git a/chatGit/src/model/Message.java b/Projet Eclipse/chatGit/src/model/Message.java similarity index 100% rename from chatGit/src/model/Message.java rename to Projet Eclipse/chatGit/src/model/Message.java diff --git a/chatGit/src/model/MessageAffichage.java b/Projet Eclipse/chatGit/src/model/MessageAffichage.java similarity index 100% rename from chatGit/src/model/MessageAffichage.java rename to Projet Eclipse/chatGit/src/model/MessageAffichage.java diff --git a/chatGit/src/model/MessageChat.java b/Projet Eclipse/chatGit/src/model/MessageChat.java similarity index 100% rename from chatGit/src/model/MessageChat.java rename to Projet Eclipse/chatGit/src/model/MessageChat.java diff --git a/chatGit/src/model/MessagePseudo.java b/Projet Eclipse/chatGit/src/model/MessagePseudo.java similarity index 100% rename from chatGit/src/model/MessagePseudo.java rename to Projet Eclipse/chatGit/src/model/MessagePseudo.java diff --git a/chatGit/src/module-info.java b/Projet Eclipse/chatGit/src/module-info.java similarity index 100% rename from chatGit/src/module-info.java rename to Projet Eclipse/chatGit/src/module-info.java diff --git a/chatGit/src/network/Manager.java b/Projet Eclipse/chatGit/src/network/Manager.java similarity index 100% rename from chatGit/src/network/Manager.java rename to Projet Eclipse/chatGit/src/network/Manager.java diff --git a/chatGit/src/network/TCPChat.java b/Projet Eclipse/chatGit/src/network/TCPChat.java similarity index 100% rename from chatGit/src/network/TCPChat.java rename to Projet Eclipse/chatGit/src/network/TCPChat.java diff --git a/chatGit/src/network/TCPServer.java b/Projet Eclipse/chatGit/src/network/TCPServer.java similarity index 100% rename from chatGit/src/network/TCPServer.java rename to Projet Eclipse/chatGit/src/network/TCPServer.java diff --git a/chatGit/src/network/Tools.java b/Projet Eclipse/chatGit/src/network/Tools.java similarity index 100% rename from chatGit/src/network/Tools.java rename to Projet Eclipse/chatGit/src/network/Tools.java diff --git a/chatGit/src/network/UDPInput.java b/Projet Eclipse/chatGit/src/network/UDPInput.java similarity index 100% rename from chatGit/src/network/UDPInput.java rename to Projet Eclipse/chatGit/src/network/UDPInput.java diff --git a/chatGit/src/network/UDPOutput.java b/Projet Eclipse/chatGit/src/network/UDPOutput.java similarity index 100% rename from chatGit/src/network/UDPOutput.java rename to Projet Eclipse/chatGit/src/network/UDPOutput.java diff --git a/chatGit/src/server/Request.java b/Projet Eclipse/chatGit/src/server/Request.java similarity index 100% rename from chatGit/src/server/Request.java rename to Projet Eclipse/chatGit/src/server/Request.java diff --git a/chatGit/src/server/package-info.java b/Projet Eclipse/chatGit/src/server/package-info.java similarity index 100% rename from chatGit/src/server/package-info.java rename to Projet Eclipse/chatGit/src/server/package-info.java diff --git a/chatGit/src/test/App.java b/Projet Eclipse/chatGit/src/test/App.java similarity index 100% rename from chatGit/src/test/App.java rename to Projet Eclipse/chatGit/src/test/App.java diff --git a/chatGit/src/test/Launcher.java b/Projet Eclipse/chatGit/src/test/Launcher.java similarity index 100% rename from chatGit/src/test/Launcher.java rename to Projet Eclipse/chatGit/src/test/Launcher.java diff --git a/chatGit/src/test/package-info.java b/Projet Eclipse/chatGit/src/test/package-info.java similarity index 100% rename from chatGit/src/test/package-info.java rename to Projet Eclipse/chatGit/src/test/package-info.java diff --git a/ProjetClavardage.zip b/ProjetClavardage.zip deleted file mode 100644 index d83de79..0000000 Binary files a/ProjetClavardage.zip and /dev/null differ diff --git a/README.md b/README.md index a38656a..463c5ad 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,13 @@ Le projet consiste à implémenter un tchat permettant aux utilisateurs de commu ## Installation et fonctionnement Pour avoir plus de détails sur l'installation et le fonctionnement du tchat, il suffit d'aller voir le PDF intitulé "Rapport" dans lequel se trouve une partie expliquant tous les détails qu'il est nécessaire de connaître. +## Arborescence du répertoire Git +*Conception : contient les photos des différents diagrammes +*Projet Eclipse : contient le code du projet à importer sur Eclipse +*Rapport : contient le pdf du rapport à rendre +*Serveur : contient le .war déployé sur le serveur tomcat ainsi que le projet Eclipse JEE + + ## Langage utilisé Java, développé sur Eclipse. diff --git a/Serveur/barnabeFoussats.war b/Serveur/barnabeFoussats.war new file mode 100644 index 0000000..2c2c8fa Binary files /dev/null and b/Serveur/barnabeFoussats.war differ diff --git a/test/.classpath b/Serveur/test/.classpath similarity index 100% rename from test/.classpath rename to Serveur/test/.classpath diff --git a/test/.project b/Serveur/test/.project similarity index 100% rename from test/.project rename to Serveur/test/.project diff --git a/test/.settings/.jsdtscope b/Serveur/test/.settings/.jsdtscope similarity index 100% rename from test/.settings/.jsdtscope rename to Serveur/test/.settings/.jsdtscope diff --git a/test/.settings/org.eclipse.jdt.core.prefs b/Serveur/test/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from test/.settings/org.eclipse.jdt.core.prefs rename to Serveur/test/.settings/org.eclipse.jdt.core.prefs diff --git a/test/.settings/org.eclipse.wst.common.component b/Serveur/test/.settings/org.eclipse.wst.common.component similarity index 100% rename from test/.settings/org.eclipse.wst.common.component rename to Serveur/test/.settings/org.eclipse.wst.common.component diff --git a/test/.settings/org.eclipse.wst.common.project.facet.core.xml b/Serveur/test/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 100% rename from test/.settings/org.eclipse.wst.common.project.facet.core.xml rename to Serveur/test/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/Serveur/test/.settings/org.eclipse.wst.jsdt.ui.superType.container similarity index 100% rename from test/.settings/org.eclipse.wst.jsdt.ui.superType.container rename to Serveur/test/.settings/org.eclipse.wst.jsdt.ui.superType.container diff --git a/test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/Serveur/test/.settings/org.eclipse.wst.jsdt.ui.superType.name similarity index 100% rename from test/.settings/org.eclipse.wst.jsdt.ui.superType.name rename to Serveur/test/.settings/org.eclipse.wst.jsdt.ui.superType.name diff --git a/test/WebContent/META-INF/MANIFEST.MF b/Serveur/test/WebContent/META-INF/MANIFEST.MF similarity index 100% rename from test/WebContent/META-INF/MANIFEST.MF rename to Serveur/test/WebContent/META-INF/MANIFEST.MF diff --git a/test/WebContent/WEB-INF/classes/com/controller/Contact.class b/Serveur/test/WebContent/WEB-INF/classes/com/controller/Contact.class similarity index 100% rename from test/WebContent/WEB-INF/classes/com/controller/Contact.class rename to Serveur/test/WebContent/WEB-INF/classes/com/controller/Contact.class diff --git a/test/WebContent/WEB-INF/classes/com/controller/DataBase.class b/Serveur/test/WebContent/WEB-INF/classes/com/controller/DataBase.class similarity index 90% rename from test/WebContent/WEB-INF/classes/com/controller/DataBase.class rename to Serveur/test/WebContent/WEB-INF/classes/com/controller/DataBase.class index 6b1d17c..c1fb0ef 100644 Binary files a/test/WebContent/WEB-INF/classes/com/controller/DataBase.class and b/Serveur/test/WebContent/WEB-INF/classes/com/controller/DataBase.class differ diff --git a/Serveur/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class b/Serveur/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class new file mode 100644 index 0000000..f3ebad9 Binary files /dev/null and b/Serveur/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class differ diff --git a/Serveur/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class b/Serveur/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class new file mode 100644 index 0000000..9600905 Binary files /dev/null and b/Serveur/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class differ diff --git a/test/WebContent/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar b/Serveur/test/WebContent/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar similarity index 100% rename from test/WebContent/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar rename to Serveur/test/WebContent/WEB-INF/lib/mysql-connector-java-5.0.5-bin.jar diff --git a/test/WebContent/WEB-INF/web.xml b/Serveur/test/WebContent/WEB-INF/web.xml similarity index 100% rename from test/WebContent/WEB-INF/web.xml rename to Serveur/test/WebContent/WEB-INF/web.xml diff --git a/test/WebContent/test.html b/Serveur/test/WebContent/test.html similarity index 100% rename from test/WebContent/test.html rename to Serveur/test/WebContent/test.html diff --git a/test/src/com/controller/Contact.java b/Serveur/test/src/com/controller/Contact.java similarity index 100% rename from test/src/com/controller/Contact.java rename to Serveur/test/src/com/controller/Contact.java diff --git a/test/src/com/controller/DataBase.java b/Serveur/test/src/com/controller/DataBase.java similarity index 91% rename from test/src/com/controller/DataBase.java rename to Serveur/test/src/com/controller/DataBase.java index dd1eef0..89da74e 100644 --- a/test/src/com/controller/DataBase.java +++ b/Serveur/test/src/com/controller/DataBase.java @@ -190,4 +190,21 @@ public class DataBase { } } + public String getStatus(String login) { + String query = "SELECT * FROM `users` WHERE login=?"; + PreparedStatement pStat = null; + String status = null; + try { + pStat = connexion.prepareStatement(query); + pStat.setString(1, login); + ResultSet resPseudo = pStat.executeQuery(); + if(resPseudo.first()) { + status = resPseudo.getString("statut"); + } + }catch(SQLException e) { + e.printStackTrace(); + } + return status; + } + } \ No newline at end of file diff --git a/test/src/com/controller/ListeContacts.java b/Serveur/test/src/com/controller/ListeContacts.java similarity index 92% rename from test/src/com/controller/ListeContacts.java rename to Serveur/test/src/com/controller/ListeContacts.java index 238a998..3fe26aa 100644 --- a/test/src/com/controller/ListeContacts.java +++ b/Serveur/test/src/com/controller/ListeContacts.java @@ -29,6 +29,15 @@ public class ListeContacts { return false; } + public boolean idExist (int id) { + for(Contact c : listeContact) { + if(c.getId()==id){ + return true; + } + } + return false; + } + public boolean pseudoExist(String pseudo) { for(Contact c : listeContact) { if(c.getPseudo().equals(pseudo)){ diff --git a/test/src/com/sdzee/servlets/Test.java b/Serveur/test/src/com/sdzee/servlets/Test.java similarity index 85% rename from test/src/com/sdzee/servlets/Test.java rename to Serveur/test/src/com/sdzee/servlets/Test.java index c6f6a02..3c1e421 100644 --- a/test/src/com/sdzee/servlets/Test.java +++ b/Serveur/test/src/com/sdzee/servlets/Test.java @@ -11,11 +11,9 @@ import com.controller.*; public class Test extends HttpServlet { - private DataBase db; private ListeContacts listActifs; public void init() { listActifs = ListeContacts.getInstance(); - db = DataBase.getInstance(); } public void doGet( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException{ @@ -34,6 +32,23 @@ public class Test extends HttpServlet { res = Boolean.toString(loginOK); response.setHeader("result", res); break; + + case "estActif": + login = request.getParameter("login"); + boolean existe = DataBase.getInstance().loginExiste(login); + boolean estActif = false; + if(existe) { + String status = DataBase.getInstance().getStatus(login); + + if(status.equals("En ligne")) { + estActif = true; + } + } + + res = Boolean.toString(estActif); + response.setHeader("result", res); + break; + case "pseudoOK": boolean pseudoOK = true; pseudo = request.getParameter("pseudo"); @@ -76,7 +91,7 @@ public class Test extends HttpServlet { int id = Integer.parseInt(idRequest); Contact c = listActifs.findContact(pseudo); listActifs.deleteContact(c); - db.updateStatus(id, "Hors Ligne"); + DataBase.getInstance().updateStatus(id, "Hors Ligne"); break; diff --git a/config.json b/config.json new file mode 100644 index 0000000..b5a5399 --- /dev/null +++ b/config.json @@ -0,0 +1,12 @@ +{ + "serveur":{ + "actif": 1, + "url": "https://srv-gei-tomcat.insa-toulouse.fr/barnabeFoussats/toto", + "port": 8080 + }, + "config":{ + "interface": "wlan3", + "portSrc": 26000, + "portDest":26001 + } +} \ No newline at end of file diff --git a/interface.jar b/interface.jar new file mode 100644 index 0000000..6a394f5 Binary files /dev/null and b/interface.jar differ diff --git a/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class b/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class deleted file mode 100644 index 9b4e06d..0000000 Binary files a/test/WebContent/WEB-INF/classes/com/controller/ListeContacts.class and /dev/null differ diff --git a/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class b/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class deleted file mode 100644 index e6c96d2..0000000 Binary files a/test/WebContent/WEB-INF/classes/com/sdzee/servlets/Test.class and /dev/null differ