Merge branch 'master' of https://github.com/babolivier/burger-quizz

java/.idea/workspace.xml

@@ -7,16 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="$PROJECT_DIR$/out/production/java/GestionCategories.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionReponses.class" afterPath="$PROJECT_DIR$/out/production/java/GestionReponses.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/ConnexionBDD.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionCategories.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionReponses.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" afterPath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -43,8 +39,8 @@
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="3.2033582">
-              <caret line="472" column="13" selection-start-line="472" selection-start-column="13" selection-end-line="472" selection-end-column="13" />
+            <state vertical-scroll-proportion="0.45895523">
+              <caret line="470" column="79" selection-start-line="470" selection-start-column="79" selection-end-line="470" selection-end-column="79" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -52,11 +48,29 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#2268#2269#0" expanded="true" />
+                <element signature="e#2296#2297#0" expanded="true" />
+                <element signature="e#2324#2325#0" expanded="true" />
+                <element signature="e#2352#2353#0" expanded="true" />
+                <element signature="e#2379#2380#0" expanded="true" />
+                <element signature="e#2430#2431#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="88" column="94" selection-start-line="88" selection-start-column="94" selection-end-line="88" selection-end-column="94" />
+              <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1239#1240#0" expanded="true" />
@@ -74,11 +88,11 @@
         <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="82" column="11" selection-start-line="82" selection-start-column="11" selection-end-line="82" selection-end-column="11" />
+              <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#2067#2068#0" expanded="true" />
-                <element signature="e#2095#2096#0" expanded="true" />
+                <element signature="e#2160#2161#0" expanded="true" />
+                <element signature="e#2188#2189#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -88,11 +102,11 @@
         <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="102" column="33" selection-start-line="102" selection-start-column="33" selection-end-line="102" selection-end-column="33" />
+              <caret line="99" column="38" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#2963#2964#0" expanded="true" />
-                <element signature="e#2989#2990#0" expanded="true" />
+                <element signature="e#2635#2636#0" expanded="true" />
+                <element signature="e#2661#2662#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -157,9 +171,9 @@
         <option value="$PROJECT_DIR$/src/Question.java" />
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
+        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
-        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
       </list>
@@ -280,8 +294,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -316,6 +328,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -344,6 +358,118 @@
       <recent name="" />
     </key>
   </component>
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
+    <UpdatedFiles>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Updated from server" />
+        <option name="myStatusName" value="Changed on server" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="CHANGED_ON_SERVER" />
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated" />
+          <option name="myStatusName" value="Changed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.questset.php</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/index.htm</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/game.js</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Created" />
+          <option name="myStatusName" value="Created" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CREATED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Deleted" />
+          <option name="myStatusName" value="Deleted" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="true" />
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Restored" />
+          <option name="myStatusName" value="Will be restored" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="RESTORED" />
+        </FILE-GROUP>
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Modified" />
+        <option name="myStatusName" value="Modified" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MODIFIED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Skipped" />
+        <option name="myStatusName" value="Skipped" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SKIPPED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with conflicts" />
+        <option name="myStatusName" value="Will be merged with conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with tree conflicts" />
+        <option name="myStatusName" value="Merged with tree conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with property conflicts" />
+        <option name="myStatusName" value="Will be merged with property conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged" />
+        <option name="myStatusName" value="Will be merged" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Not in repository" />
+        <option name="myStatusName" value="Not in repository" />
+        <option name="mySupportsDeletion" value="true" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="UNKNOWN" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally added" />
+        <option name="myStatusName" value="Locally added" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_ADDED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally removed" />
+        <option name="myStatusName" value="Locally removed" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_REMOVED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Switched" />
+        <option name="myStatusName" value="Switched" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SWITCHED" />
+      </FILE-GROUP>
+    </UpdatedFiles>
+  </component>
   <component name="RunManager" selected="Application.Main">
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -599,7 +725,13 @@
       <option name="project" value="LOCAL" />
       <updated>1432923249468</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="++ gestion reponses">
+      <created>1433172079872</created>
+      <option name="number" value="00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1433172079872</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TodoView">
@@ -621,7 +753,6 @@
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5030441" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
@@ -631,13 +762,14 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16717325" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30579966" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30579966" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -666,7 +798,8 @@
     <MESSAGE value="java: gestion categorie operationelle et ergonomique" />
     <MESSAGE value="++" />
     <MESSAGE value="correction de bug" />
-    <option name="LAST_COMMIT_MESSAGE" value="correction de bug" />
+    <MESSAGE value="++ gestion reponses" />
+    <option name="LAST_COMMIT_MESSAGE" value="++ gestion reponses" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,26 +1136,30 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
+    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="102" column="33" selection-start-line="102" selection-start-column="33" selection-end-line="102" selection-end-column="33" />
+          <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2963#2964#0" expanded="true" />
-            <element signature="e#2989#2990#0" expanded="true" />
+            <element signature="e#2160#2161#0" expanded="true" />
+            <element signature="e#2188#2189#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
+    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="82" column="11" selection-start-line="82" selection-start-column="11" selection-end-line="82" selection-end-column="11" />
+          <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2067#2068#0" expanded="true" />
-            <element signature="e#2095#2096#0" expanded="true" />
+            <element signature="e#2268#2269#0" expanded="true" />
+            <element signature="e#2296#2297#0" expanded="true" />
+            <element signature="e#2324#2325#0" expanded="true" />
+            <element signature="e#2352#2353#0" expanded="true" />
+            <element signature="e#2379#2380#0" expanded="true" />
+            <element signature="e#2430#2431#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1030,7 +1167,7 @@
     <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="88" column="94" selection-start-line="88" selection-start-column="94" selection-end-line="88" selection-end-column="94" />
+          <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1239#1240#0" expanded="true" />
@@ -1043,20 +1180,22 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
+    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.6325967">
-          <caret line="30" column="12" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="99" column="38" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#2635#2636#0" expanded="true" />
+            <element signature="e#2661#2662#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="3.2033582">
-          <caret line="472" column="13" selection-start-line="472" selection-start-column="13" selection-end-line="472" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.45895523">
+          <caret line="470" column="79" selection-start-line="470" selection-start-column="79" selection-end-line="470" selection-end-column="79" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

java/src/ConnexionBDD.java

@@ -81,13 +81,8 @@ public class ConnexionBDD
 		gestionReponses.deleteReponses(reponse1, reponse2);
 	}
 
-	public void modifyReponsesReponses(String oldRep1, String oldRep2, String newRep1, String newRep2)
+	public void modifyReponsesReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
 	{
-		gestionReponses.updateReponsesReponses(oldRep1, oldRep2, newRep1, newRep2);
-	}
-
-	public void modifyReponsesCategorie(String reponse1, String reponses2, String newCategorie)
-	{
-		gestionReponses.updateReponsesCategorie(reponse1, reponses2, newCategorie);
+		gestionReponses.updateReponsesReponses(categorie, oldRep1, oldRep2, newRep1, newRep2);
 	}
 }

java/src/GestionCategories.java

@@ -51,6 +51,8 @@ public class GestionCategories
 			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
 			preparedStatement.setString(1,categorieName);
 			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
 		}
 		catch (SQLException e)
 		{
@@ -67,6 +69,8 @@ public class GestionCategories
 			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
 			preparedStatement.setString(1,categorieName);
 			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
 		}
 		catch (SQLException e)
 		{
@@ -86,6 +90,8 @@ public class GestionCategories
 			preparedStatement.setString(1, newCategorieName);
 			preparedStatement.setString(2, oldCategorieName);
 			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
 		}
 		catch (SQLException e)
 		{

java/src/GestionReponses.java

@@ -55,7 +55,10 @@ public class GestionReponses
 			preparedStatement.setString(2, reponse1);
 			preparedStatement.setString(3, reponse2);
 			preparedStatement.executeUpdate();
-		} catch (SQLException e) {
+
+			preparedStatement.close();
+		}
+		catch (SQLException e) {
 			e.printStackTrace();
 		}
 	}
@@ -70,26 +73,8 @@ public class GestionReponses
 			preparedStatement.setString(1, rep1);
 			preparedStatement.setString(2, rep2);
 			preparedStatement.executeUpdate();
-		}
-		catch (SQLException e)
-		{
-			e.printStackTrace();
-		}
-	}
 
-	public void updateReponsesReponses(String oldRep1, String oldRep2, String newRep1, String newRep2)
-	{
-		String rq ="UPDATE reponses" +
-				" SET reponse1 = ?, reponse2 = ?" +
-				" WHERE reponse1 = ? AND reponse2 = ?";
-		try
-		{
-			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
-			preparedStatement.setString(1, newRep1);
-			preparedStatement.setString(2, newRep2);
-			preparedStatement.setString(3, oldRep1);
-			preparedStatement.setString(4, oldRep2);
-			preparedStatement.executeUpdate();
+			preparedStatement.close();
 		}
 		catch (SQLException e)
 		{
@@ -97,18 +82,22 @@ public class GestionReponses
 		}
 	}
 
-	public void updateReponsesCategorie(String rep1, String rep2, String newCategorie)
+	public void updateReponsesReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
 	{
 		String rq ="UPDATE reponses" +
-				" SET nom_cat = ?" +
+				" SET nom_cat = ?, reponse1 = ?, reponse2 = ?" +
 				" WHERE reponse1 = ? AND reponse2 = ?";
 		try
 		{
 			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
-			preparedStatement.setString(1, newCategorie);
-			preparedStatement.setString(2, rep1);
-			preparedStatement.setString(3, rep2);
+			preparedStatement.setString(1, categorie);
+			preparedStatement.setString(2, newRep1);
+			preparedStatement.setString(3, newRep2);
+			preparedStatement.setString(4, oldRep1);
+			preparedStatement.setString(5, oldRep2);
 			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
 		}
 		catch (SQLException e)
 		{

java/src/InterfacePrincipale.java

@@ -25,7 +25,6 @@ public class InterfacePrincipale extends JFrame
 	private Bouton addR;
 	private Bouton delR;
 	private Bouton editR;
-	private JComboBox comboRepCat;
 	private JList listR;
 
 	//Panel des questions
@@ -160,7 +159,6 @@ public class InterfacePrincipale extends JFrame
 		addR = new Bouton("Ajouter un jeu de réponses", plusImg);
 		delR = new Bouton("Supprimer le jeu de réponses", delImg);
 		editR = new Bouton("Modifier le jeu de réponse", editImg);
-		comboRepCat = new JComboBox();
 
 		listR = new JList();
 		JScrollPane sp = new JScrollPane(listR,
@@ -173,12 +171,10 @@ public class InterfacePrincipale extends JFrame
 		addR.setAlignmentX(CENTER_ALIGNMENT);
 		delR.setAlignmentX(CENTER_ALIGNMENT);
 		editR.setAlignmentX(CENTER_ALIGNMENT);
-		comboRepCat.setOpaque(false);
 
 		addR.setMaximumSize(new Dimension(300,34));
 		delR.setMaximumSize(new Dimension(300,34));
 		editR.setMaximumSize(new Dimension(300,34));
-		comboRepCat.setMaximumSize(new Dimension(1000,34));
 
 		JLabel labR = new JLabel("Réponses");
 		labR.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -190,8 +186,6 @@ public class InterfacePrincipale extends JFrame
 		panReponses.add(delR);
 		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
 		panReponses.add(sp);
-		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
-		panReponses.add(comboRepCat);
 		panReponses.add(Box.createRigidArea(new Dimension(1, 5)));
 		panReponses.add(editR);
 
@@ -201,7 +195,6 @@ public class InterfacePrincipale extends JFrame
 		delR.addActionListener(prl);
 		editR.addActionListener(prl);
 		listR.addListSelectionListener(prl);
-		comboRepCat.addActionListener(prl);
 	}
 
 	private void createPanelQuestion()
@@ -310,6 +303,19 @@ public class InterfacePrincipale extends JFrame
 		}
 	}
 
+	private String[] getCategorieList()
+	{
+		ListModel model = listC.getModel();
+		String[] tabCategories = new String[model.getSize()];
+
+		for(int i=0; i < model.getSize(); i++)
+		{
+			Categorie c =  (Categorie)model.getElementAt(i);
+			tabCategories[i] = c.getNom();
+		}
+		return tabCategories;
+	}
+
 	private class PanCategoriesListener implements ActionListener, ListSelectionListener
 	{
 		public void actionPerformed(ActionEvent e)
@@ -397,7 +403,6 @@ public class InterfacePrincipale extends JFrame
 			if(!listC.isSelectionEmpty())
 			{
 				listR.setListData(bdd.getListeReponses(listC.getSelectedValue().toString()).toArray());
-				comboRepCat.removeAllItems();
 			}
 		}
 	}
@@ -414,7 +419,7 @@ public class InterfacePrincipale extends JFrame
 
 			if(e.getSource() == addR)
 			{
-				NouvelleReponseDialog nrd = new NouvelleReponseDialog("Nouveau jeu de réponses","","",null);
+				NouvelleReponseDialog nrd = new NouvelleReponseDialog("Nouveau jeu de réponses", "", "", null, null, null);
 				if(nrd.afficher() == true)
 				{
 					String catName = listC.getSelectedValue().toString();
@@ -457,38 +462,22 @@ public class InterfacePrincipale extends JFrame
 
 				String reponse1 = r.getReponse1();
 				String reponse2 = r.getReponse2();
+				String catName = listC.getSelectedValue().toString();
 
-				NouvelleReponseDialog nrd = new NouvelleReponseDialog("Modification jeu de réponses", reponse1, reponse2, null);
+				NouvelleReponseDialog nrd = new NouvelleReponseDialog("Modification jeu de réponses", reponse1, reponse2, catName, getCategorieList(), null);
 				if(nrd.afficher() == true)
 				{
-					String catName = listC.getSelectedValue().toString();
-					bdd.modifyReponsesReponses(reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
+					bdd.modifyReponsesReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
 					listR.setListData(bdd.getListeReponses(catName).toArray());
+					reSelectCategorie(nrd.getCat());
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
 				}
 			}
-			else if(e.getSource() == comboRepCat)
-			{
-				System.out.println("éLOL");
-			}
 		}
 
 		public void valueChanged(ListSelectionEvent listSelectionEvent)
 		{
-			ListModel model = listC.getModel();
-			comboRepCat.removeAllItems();
 
-			String cat = listC.getSelectedValue().toString();
-
-			for(int i=0; i < model.getSize(); i++)
-			{
-				Categorie c =  (Categorie)model.getElementAt(i);
-				comboRepCat.addItem(c.getNom());
-				if(cat.equals(c.getNom()))
-				{
-					comboRepCat.setSelectedItem(c.getNom());
-				}
-			}
 		}
 	}
 

java/src/NouvelleReponseDialog.java

@@ -10,16 +10,17 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
 	private JButton ok;
 	private JButton annuler;
 	private boolean mofidEffectues;
+	private JComboBox comboCat;
 
-	public NouvelleReponseDialog(String title, String defRep1, String defRep2, JFrame parent)
+	public NouvelleReponseDialog(String title, String defRep1, String defRep2, String defCategorie, String[] tabCategorie,JFrame parent)
 	{
 		super(parent,title,true);
-		createInterface(defRep1,defRep2);
+		createInterface(defRep1, defRep2, defCategorie, tabCategorie);
 		pack();
 		setLocationRelativeTo(null);
 	}
 
-	private void createInterface(String defRep1, String defRep2)
+	private void createInterface(String defRep1, String defRep2, String defCategorie, String[] tabCatrgorie)
 	{
 		JPanel champs = new JPanel();
 		JPanel boutons = new JPanel();
@@ -35,11 +36,30 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
 		ok.addActionListener(this);
 		annuler.addActionListener(this);
 
-		champs.setLayout(new GridLayout(2,2));
+		GridLayout gridLayout = new GridLayout(2, 2);
+		champs.setLayout(gridLayout);
 		champs.add(new JLabel("Réponse 1:"));
 		champs.add(rep1);
 		champs.add(new JLabel("Réponse 2:"));
 		champs.add(rep2);
+
+		if(defCategorie == null)
+		{
+			comboCat = new JComboBox();
+			comboCat.setOpaque(true);
+			for(int i=0; i<tabCatrgorie.length; i++)
+			{
+				comboCat.addItem(tabCatrgorie[i]);
+				if(tabCatrgorie[i].equals(defCategorie))
+				{
+					comboCat.setSelectedIndex(i);
+				}
+			}
+			gridLayout.setRows(3);
+			champs.add(new JLabel("Catégorie:"));
+			champs.add(comboCat);
+		}
+
 		boutons.add(annuler);
 		boutons.add(ok);
 
@@ -78,4 +98,8 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
 	public String getRep1() {
 		return rep1.getText();
 	}
+
+	public String getCat() {
+		return comboCat.getSelectedItem().toString();
+	}
 }