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

java/.idea/workspace.xml

   </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/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$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionQuestions.class" afterPath="$PROJECT_DIR$/out/production/java/GestionQuestions.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$/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/GestionQuestions.java" afterPath="$PROJECT_DIR$/src/GestionQuestions.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" />
       <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>
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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>
-            </state>
-          </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" />
+              <caret line="231" column="68" selection-start-line="231" selection-start-column="68" selection-end-line="231" selection-end-column="68" />
               <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" />
+                <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+                <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+                <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+                <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+                <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
               </folding>
             </state>
           </provider>
         <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
+              <caret line="83" column="30" selection-start-line="83" selection-start-column="30" selection-end-line="83" selection-end-column="30" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1239#1240#0" expanded="true" />
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GestionCategories.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
+      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
+              <caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#2160#2161#0" expanded="true" />
-                <element signature="e#2188#2189#0" expanded="true" />
+                <element signature="e#2627#2628#0" expanded="true" />
+                <element signature="e#2653#2654#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
+      <file leaf-file-name="GestionQuestions.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
           <provider selected="true" editor-type-id="text-editor">
             <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" />
+              <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="36" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#2635#2636#0" expanded="true" />
-                <element signature="e#2661#2662#0" expanded="true" />
+                <element signature="e#2985#2986#0" expanded="true" />
+                <element signature="e#3013#3014#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Reponses.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Reponses.java">
+      <file leaf-file-name="NouvelleQuestionDialog.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/NouvelleQuestionDialog.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+              <caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="28" />
               <folding>
-                <element signature="e#223#224#0" expanded="true" />
-                <element signature="e#245#246#0" expanded="true" />
-                <element signature="e#290#291#0" expanded="true" />
-                <element signature="e#321#322#0" expanded="true" />
-                <element signature="e#353#354#0" expanded="true" />
-                <element signature="e#375#376#0" expanded="true" />
-                <element signature="e#420#421#0" expanded="true" />
-                <element signature="e#451#452#0" expanded="true" />
-                <element signature="e#480#481#0" expanded="true" />
-                <element signature="e#539#540#0" expanded="true" />
+                <element signature="imports" expanded="true" />
+                <element signature="e#1976#1977#0" expanded="true" />
+                <element signature="e#2008#2009#0" expanded="true" />
+                <element signature="e#2036#2037#0" expanded="true" />
+                <element signature="e#2076#2077#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="mcd.png" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mcd.png">
-          <provider selected="true" editor-type-id="images">
-            <state />
+      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5635359">
+              <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
           </provider>
         </entry>
       </file>
         <option value="$PROJECT_DIR$/src/Bouton.java" />
         <option value="$PROJECT_DIR$/src/Categorie.java" />
         <option value="$PROJECT_DIR$/src/Reponses.java" />
-        <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/MainAdminBddBurgerQuizz.java" />
+        <option value="$PROJECT_DIR$/src/Question.java" />
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
-        <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
+        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
+        <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
+        <option value="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" />
+        <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
       </list>
     </option>
   </component>
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
           <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/api/controller/palmares.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>
       <option name="project" value="LOCAL" />
       <updated>1433172079872</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="++ gestion reponsesV2">
+      <created>1433236557607</created>
+      <option name="number" value="00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1433236557607</updated>
+    </task>
+    <task id="LOCAL-00018" summary="++ gestion reponsesV3">
+      <created>1433247288224</created>
+      <option name="number" value="00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1433247288224</updated>
+    </task>
+    <task id="LOCAL-00019" summary="++ gestion reponsesV4">
+      <created>1433253655646</created>
+      <option name="number" value="00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1433253655646</updated>
+    </task>
+    <task id="LOCAL-00020" summary="++ gestion reponsesV5">
+      <created>1433256920732</created>
+      <option name="number" value="00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1433256920732</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TodoView">
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" 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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="5" 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.32864675" sideWeight="0.5" order="1" 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="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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="2" 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="9" 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" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="6" side_tool="false" 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="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" 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="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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" 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="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="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30579966" sideWeight="0.5" order="7" 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="3" 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="4" 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">
     <MESSAGE value="++" />
     <MESSAGE value="correction de bug" />
     <MESSAGE value="++ gestion reponses" />
-    <option name="LAST_COMMIT_MESSAGE" value="++ gestion reponses" />
+    <MESSAGE value="++ gestion reponsesV2" />
+    <MESSAGE value="++ gestion reponsesV3" />
+    <MESSAGE value="++ gestion reponsesV4" />
+    <MESSAGE value="++ gestion reponsesV5" />
+    <option name="LAST_COMMIT_MESSAGE" value="++ gestion reponsesV5" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="5" />
+      <option name="time" value="6" />
     </breakpoint-manager>
     <watches-manager />
   </component>
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
           </folding>
         </state>
       </provider>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6130031">
-          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Question.java">
+    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26915887">
-          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24930748">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+        <state vertical-scroll-proportion="0.51657456">
+          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Categorie.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="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
+        <state vertical-scroll-proportion="2.4738805">
+          <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#2160#2161#0" expanded="true" />
+            <element signature="e#2188#2189#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Reponses.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="0.3488806">
           <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
           <folding>
             <element signature="e#223#224#0" expanded="true" />
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
+    <entry file="file://$PROJECT_DIR$/src/Question.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <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#2160#2161#0" expanded="true" />
-            <element signature="e#2188#2189#0" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.46082088">
+          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
+          <folding />
         </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.0">
-          <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
+          <caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
           <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" />
+            <element signature="e#2627#2628#0" expanded="true" />
+            <element signature="e#2653#2654#0" expanded="true" />
           </folding>
         </state>
       </provider>
     <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
+          <caret line="83" column="30" selection-start-line="83" selection-start-column="30" selection-end-line="83" selection-end-column="30" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1239#1240#0" expanded="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
+    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
+          <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="36" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2635#2636#0" expanded="true" />
-            <element signature="e#2661#2662#0" expanded="true" />
+            <element signature="e#2985#2986#0" expanded="true" />
+            <element signature="e#3013#3014#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="0.45895523">
-          <caret line="470" column="79" selection-start-line="470" selection-start-column="79" selection-end-line="470" selection-end-column="79" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="231" column="68" selection-start-line="231" selection-start-column="68" selection-end-line="231" selection-end-column="68" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/NouvelleQuestionDialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1976#1977#0" expanded="true" />
+            <element signature="e#2008#2009#0" expanded="true" />
+            <element signature="e#2036#2037#0" expanded="true" />
+            <element signature="e#2076#2077#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5635359">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

java/src/ConnexionBDD.java

 		gestionReponses.deleteReponses(reponse1, reponse2);
 	}
 
-	public void modifyReponsesReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
+	public void modifyReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
 	{
-		gestionReponses.updateReponsesReponses(categorie, oldRep1, oldRep2, newRep1, newRep2);
+		gestionReponses.updateReponses(categorie, oldRep1, oldRep2, newRep1, newRep2);
+	}
+
+	//Gestion questions
+	public ArrayList<Question> getListeQuestions(String reponse1, String reponse2)
+	{
+		gestionQuestions.readQuestions(reponse1, reponse2);
+		return gestionQuestions.getListeQuestions();
+	}
+
+	public void createQuestion(String intitule, String reponse1, String reponse2, int num_reponse)
+	{
+		gestionQuestions.createQuestion(intitule, reponse1, reponse2, num_reponse);
+	}
+
+	public void deleteQuestion(String intitule, String reponse1, String reponse2)
+	{
+		gestionQuestions.deleteQuestion(intitule, reponse1, reponse2);
+	}
+
+	public void modifyQuestion(String oldIntitule, String newIntitule, String reponse1, String reponse2, int newNum_reponse)
+	{
+		gestionQuestions.updateQuestion(oldIntitule, newIntitule, reponse1, reponse2, newNum_reponse);
 	}
 }

java/src/GestionQuestions.java

 import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 
 public class GestionQuestions
 	public GestionQuestions(Connection bdd)
 	{
 		this.bdd = bdd;
+		this.listeQuestions = new ArrayList<Question>();
+	}
+
+	public void readQuestions(String reponse1, String reponse2)
+	{
+		String rq = "SELECT *" +
+				" FROM questions" +
+				" WHERE reponse1 = ? AND reponse2 = ?";
+
+		try
+		{
+			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
+			preparedStatement.setString(1, reponse1);
+			preparedStatement.setString(2, reponse2);
+			ResultSet resultat = preparedStatement.executeQuery();
+
+			listeQuestions.clear();
+
+			while(resultat.next())
+			{
+				listeQuestions.add(new Question(resultat.getString("intitule"), resultat.getString("reponse1"), resultat.getString("reponse2"), resultat.getInt("num_reponse")));
+			}
+
+			resultat.close();
+			preparedStatement.close();
+
+		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public void createQuestion(String intitule, String reponse1, String reponse2, int num_reponse)
+	{
+		String rq = "INSERT INTO questions(intitule, reponse1, reponse2, num_reponse)" +
+				" VALUES(?, ?, ?, ?)";
+		try
+		{
+			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
+			preparedStatement.setString(1, intitule);
+			preparedStatement.setString(2, reponse1);
+			preparedStatement.setString(3, reponse2);
+			preparedStatement.setInt(4, num_reponse);
+			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
+		}
+		catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void deleteQuestion(String intitule, String reponse1, String reponse2)
+	{
+		String rq ="DELETE FROM questions" +
+				" WHERE reponse1 = ? AND reponse2 = ? AND intitule = ?";
+		try
+		{
+			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
+			preparedStatement.setString(1, reponse1);
+			preparedStatement.setString(2, reponse2);
+			preparedStatement.setString(3, intitule);
+			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
+		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public void updateQuestion(String oldIntitule, String newIntitule, String reponse1, String reponse2, int newNum_reponse)
+	{
+		String rq ="UPDATE questions" +
+				" SET intitule = ?, num_reponse = ?" +
+				" WHERE intitule = ? AND reponse1 = ? AND reponse2 = ?";
+		try
+		{
+			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
+			preparedStatement.setString(1, newIntitule);
+			preparedStatement.setInt(2, newNum_reponse);
+			preparedStatement.setString(3, oldIntitule);
+			preparedStatement.setString(4, reponse1);
+			preparedStatement.setString(5, reponse2);
+			preparedStatement.executeUpdate();
+
+			preparedStatement.close();
+		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	public ArrayList<Question> getListeQuestions() {
+		return listeQuestions;
 	}
 }

java/src/GestionReponses.java

 		}
 	}
 
-	public void updateReponsesReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
+	public void updateReponses(String categorie, String oldRep1, String oldRep2, String newRep1, String newRep2)
 	{
 		String rq ="UPDATE reponses" +
 				" SET nom_cat = ?, reponse1 = ?, reponse2 = ?" +

java/src/InterfacePrincipale.java

 	private Bouton addQ;
 	private Bouton delQ;
 	private Bouton editQ;
-	private JComboBox comboQueRep;
 	private JList listQ;
 
 	//image pour les boutons
 		panReponses.add(delR);
 		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
 		panReponses.add(sp);
-		panReponses.add(Box.createRigidArea(new Dimension(1, 5)));
+		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
 		panReponses.add(editR);
 
 
 		addQ = new Bouton("Ajouter une question", plusImg);
 		delQ = new Bouton("Supprimer la question", delImg);
 		editQ = new Bouton("Modifier la question", editImg);
-		comboQueRep = new JComboBox();
 
-		String tab[] = {"a","b","c","d","e","f"};
-		listQ = new JList(tab);
+		listQ = new JList();
 		JScrollPane sp = new JScrollPane(listQ,
 				JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
 				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		addQ.setAlignmentX(CENTER_ALIGNMENT);
 		delQ.setAlignmentX(CENTER_ALIGNMENT);
 		editQ.setAlignmentX(CENTER_ALIGNMENT);
-		comboQueRep.setOpaque(false);
 
 		addQ.setMaximumSize(new Dimension(208,34));
 		delQ.setMaximumSize(new Dimension(208,34));
 		editQ.setMaximumSize(new Dimension(208,34));
-		comboQueRep.setMaximumSize(new Dimension(1000,34));
 
 		JLabel labQ = new JLabel("Questions");
 		labQ.setAlignmentX(Component.CENTER_ALIGNMENT);
 		panQuestions.add(Box.createRigidArea(new Dimension(1, 10)));
 		panQuestions.add(sp);
 		panQuestions.add(Box.createRigidArea(new Dimension(1, 10)));
-		panQuestions.add(comboQueRep);
-		panQuestions.add(Box.createRigidArea(new Dimension(1, 5)));
 		panQuestions.add(editQ);
 
 
 		}
 	}
 
+	private void reSelectQuestion(String intitule)
+	{
+		Reponses r = (Reponses) listR.getSelectedValue();
+		Object[] tabObject = bdd.getListeQuestions(r.getReponse1(), r.getReponse2()).toArray();
+		Question[] tabQuestions = Arrays.copyOf(tabObject, tabObject.length, Question[].class);
+		listQ.setListData(tabQuestions);
+
+		for(int i=0; i<tabQuestions.length; i++)
+		{
+			if(tabQuestions[i].getIntitule().equals(intitule))
+			{
+				listQ.setSelectedValue(tabQuestions[i], true);
+				break;
+			}
+		}
+	}
+
 	private String[] getCategorieList()
 	{
 		ListModel model = listC.getModel();
 				}
 
 				bdd.createCategorie(catName);
-				listC.setListData(bdd.getListeCategorie().toArray());
+				//listC.setListData(bdd.getListeCategorie().toArray());
 				reSelectCategorie(catName);
+				listQ.setListData(new Vector(0));
 			}
 			else if(e.getSource() == delC)
 			{
 					bdd.deleteCategorie(categorieName);
 					listC.setListData(bdd.getListeCategorie().toArray());
 					listR.setListData(new Vector(0));
+					listQ.setListData(new Vector(0));
 				}
 			}
 			else if(e.getSource() == editC)
 			if(!listC.isSelectionEmpty())
 			{
 				listR.setListData(bdd.getListeReponses(listC.getSelectedValue().toString()).toArray());
+				listQ.setListData(new Vector(0));
 			}
 		}
 	}
 				{
 					String catName = listC.getSelectedValue().toString();
 					bdd.createReponses(catName, nrd.getRep1(), nrd.getRep2());
-					listR.setListData(bdd.getListeReponses(catName).toArray());
+					//listR.setListData(bdd.getListeReponses(catName).toArray());
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
 				}
 			}
 				NouvelleReponseDialog nrd = new NouvelleReponseDialog("Modification jeu de réponses", reponse1, reponse2, catName, getCategorieList(), null);
 				if(nrd.afficher() == true)
 				{
-					bdd.modifyReponsesReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
-					listR.setListData(bdd.getListeReponses(catName).toArray());
+					bdd.modifyReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
+					//listR.setListData(bdd.getListeReponses(catName).toArray());
 					reSelectCategorie(nrd.getCat());
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
 				}
 
 		public void valueChanged(ListSelectionEvent listSelectionEvent)
 		{
-
+			if(!listR.isSelectionEmpty())
+			{
+				Reponses r = (Reponses) listR.getSelectedValue();
+				listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()).toArray());
+			}
 		}
 	}
 
 		{
 			if(listR.isSelectionEmpty())
 			{
-				statusText.setText("Veuillez selectioner une catégorie.");
+				statusText.setText("Veuillez selectioner une sous-catégorie.");
 				return;
 			}
 
 			if(e.getSource() == addQ)
 			{
-				statusText.setText("Création de question");
+				Reponses r = (Reponses) listR.getSelectedValue();
+				NouvelleQuestionDialog nqd = new NouvelleQuestionDialog("Nouvelle question", "",
+						0, r.getReponse1(),r.getReponse2(), null);
+
+				if(nqd.afficher() == true)
+				{
+					bdd.createQuestion(nqd.getIntitule(), r.getReponse1(), r.getReponse2(), nqd.getReponse());
+					//listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()));
+					reSelectQuestion(nqd.getIntitule());
+				}
 			}
 			else if(e.getSource() == delQ)
 			{
-				statusText.setText("Supression de question");
+				JOptionPane jop = new JOptionPane();
+
+				Question q = (Question) listQ.getSelectedValue();
+
+				if(q == null)
+				{
+					statusText.setText("Veuiller d'abord selectionner une question.");
+					return;
+				}
+
+				if(jop.showConfirmDialog(null,"Voulez vous vraiment supprimer la question " + q.getIntitule() + " ?", "Supression de question", JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
+				{
+					bdd.deleteQuestion(q.getIntitule(), q.getReponse1(), q.getReponse2());
+					listQ.setListData(bdd.getListeQuestions(q.getReponse1(), q.getReponse2()).toArray());
+				}
 			}
 			else if(e.getSource() == editQ)
 			{
-				statusText.setText("Modification de question");
+				Question q = (Question) listQ.getSelectedValue();
+				if(q == null)
+				{
+					statusText.setText("Veuiller d'abord selectionner une question.");
+					return;
+				}
+
+				NouvelleQuestionDialog nqd = new NouvelleQuestionDialog("Modification question", q.getIntitule(),
+						q.getReponse(), q.getReponse1(), q.getReponse2(), null);
+
+				if(nqd.afficher() == true)
+				{
+					bdd.modifyQuestion(q.getIntitule(), nqd.getIntitule(),
+							q.getReponse1(), q.getReponse2(), nqd.getReponse());
+					reSelectQuestion(nqd.getIntitule());
+				}
 			}
 		}
 	}

java/src/NouvelleQuestionDialog.java

+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class NouvelleQuestionDialog extends JDialog implements ActionListener
+{
+	private JTextField intitule;
+	private JButton ok;
+	private JButton annuler;
+	private boolean mofidEffectues;
+	private JComboBox reponse;
+
+	public NouvelleQuestionDialog(String title, String defIntitule, int defReponse, String reponse1, String reponse2, JFrame parent)
+	{
+		super(parent, title, true);
+		createInterface(defIntitule, defReponse, reponse1, reponse2);
+		pack();
+		setLocationRelativeTo(null);
+		setResizable(false);
+	}
+
+	private void createInterface(String defIntitule, int defReponse, String reponse1, String reponse2)
+	{
+		JPanel champs = new JPanel();
+		JPanel boutons = new JPanel();
+
+		intitule = new JTextField(defIntitule, 20);
+		intitule.setBackground(Color.WHITE);
+
+		ok = new JButton("OK");
+		annuler = new JButton("Annuler");
+		ok.addActionListener(this);
+		annuler.addActionListener(this);
+
+		reponse = new JComboBox();
+		reponse.addItem("Les deux");
+		reponse.addItem(reponse1);
+		reponse.addItem(reponse2);
+		reponse.setSelectedIndex(defReponse);
+
+		GridLayout gridLayout = new GridLayout(2, 2);
+		champs.setLayout(gridLayout);
+		champs.add(new JLabel("Intitulé:"));
+		champs.add(intitule);
+		champs.add(new JLabel("Bonne réponse:"));
+		champs.add(reponse);
+
+		boutons.add(annuler);
+		boutons.add(ok);
+
+		getContentPane().setLayout(new BorderLayout());
+		getContentPane().add(champs, BorderLayout.CENTER);
+		getContentPane().add(boutons, BorderLayout.SOUTH);
+	}
+
+	public boolean afficher()
+	{
+		setVisible(true);
+		return mofidEffectues;
+	}
+
+	public void actionPerformed(ActionEvent e)
+	{
+		if(e.getSource() == annuler)
+		{
+			mofidEffectues = false;
+			setVisible(false);
+		}
+		else if(e.getSource() == ok) {
+			if(intitule.getText().isEmpty())
+			{
+				return;
+			}
+			mofidEffectues = true;
+			setVisible(false);
+		}
+	}
+
+	public String getIntitule() {
+		return intitule.getText();
+	}
+
+	public int getReponse() {
+		return reponse.getSelectedIndex();
+	}
+}

java/src/NouvelleReponseDialog.java

 
 	public NouvelleReponseDialog(String title, String defRep1, String defRep2, String defCategorie, String[] tabCategorie,JFrame parent)
 	{
-		super(parent,title,true);
+		super(parent, title, true);
 		createInterface(defRep1, defRep2, defCategorie, tabCategorie);
 		pack();
 		setLocationRelativeTo(null);
+		setResizable(false);
 	}
 
-	private void createInterface(String defRep1, String defRep2, String defCategorie, String[] tabCatrgorie)
+	private void createInterface(String defRep1, String defRep2, String defCategorie, String[] tabCategorie)
 	{
 		JPanel champs = new JPanel();
 		JPanel boutons = new JPanel();
 		champs.add(new JLabel("Réponse 2:"));
 		champs.add(rep2);
 
-		if(defCategorie == null)
+		if(defCategorie != null)
 		{
 			comboCat = new JComboBox();
 			comboCat.setOpaque(true);
-			for(int i=0; i<tabCatrgorie.length; i++)
+			for(int i=0; i< tabCategorie.length; i++)
 			{
-				comboCat.addItem(tabCatrgorie[i]);
-				if(tabCatrgorie[i].equals(defCategorie))
+				comboCat.addItem(tabCategorie[i]);
+				if(tabCategorie[i].equals(defCategorie))
 				{
 					comboCat.setSelectedIndex(i);
 				}

java/src/Question.java

 public class Question
 {
-    protected String intitule;
-    protected int reponse;
+	protected String intitule;
+	protected String reponse1;
+	protected String reponse2;
+	protected int reponse;
 
-    public Question(String intitule, int reponse) {
-        this.intitule = intitule;
-        this.reponse = reponse;
-    }
+	public Question(String intitule, String reponse1, String reponse2, int reponse) {
+		this.intitule = intitule;
+		this.reponse1 = reponse1;
+		this.reponse2 = reponse2;
+		this.reponse = reponse;
+	}
 
-    public String getIntitule() {
-        return intitule;
-    }
+	public String getIntitule() {
+		return intitule;
+	}
 
-    public void setIntitule(String intitule) {
-        this.intitule = intitule;
-    }
+	public void setIntitule(String intitule) {
+		this.intitule = intitule;
+	}
 
-    public int getReponse() {
-        return reponse;
-    }
+	public String getReponse1() {
+		return reponse1;
+	}
 
-    public void setReponse(int reponse) {
-        this.reponse = reponse;
-    }
+	public void setReponse1(String reponse1) {
+		this.reponse1 = reponse1;
+	}
 
-    public String toString() {
-        return intitule + " - " + reponse;
-    }
+	public String getReponse2() {
+		return reponse2;
+	}
+
+	public void setReponse2(String reponse2) {
+		this.reponse2 = reponse2;
+	}
+
+	public int getReponse() {
+		return reponse;
+	}
+
+	public void setReponse(int reponse) {
+		this.reponse = reponse;
+	}
+
+	public String toString() {
+		String bonneReponse = new String();
+		if(reponse == 0)
+		{
+			bonneReponse = "Les deux";
+		}
+		else if(reponse == 1)
+		{
+			bonneReponse = reponse1;
+		}
+		else
+		{
+			bonneReponse = reponse2;
+		}
+
+		return intitule + " " + bonneReponse;
+	}
 }