瀏覽代碼

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

Brendan Abolivier 9 年之前
父節點
當前提交
2e311cdb14
共有 31 個檔案被更改,包括 351 行新增222 行删除
  1. 262
    161
      java/.idea/workspace.xml
  2. 二進制
      java/out/production/java/Bouton.class
  3. 二進制
      java/out/production/java/Categorie.class
  4. 二進制
      java/out/production/java/ConnectDialog.class
  5. 二進制
      java/out/production/java/ConnexionBDD.class
  6. 二進制
      java/out/production/java/GestionCategories.class
  7. 二進制
      java/out/production/java/GestionQuestions.class
  8. 二進制
      java/out/production/java/GestionReponses.class
  9. 二進制
      java/out/production/java/InterfacePrincipale$1.class
  10. 二進制
      java/out/production/java/InterfacePrincipale$PanQuestionsListener.class
  11. 二進制
      java/out/production/java/InterfacePrincipale$PanReponsesListener.class
  12. 二進制
      java/out/production/java/MainAdminBddBurgerQuizz.class
  13. 二進制
      java/out/production/java/Question.class
  14. 二進制
      java/out/production/java/Reponses.class
  15. 二進制
      java/rsc/burgerquizz.png
  16. 0
    17
      java/src/Bouton.java
  17. 0
    6
      java/src/ConnectDialog.java
  18. 4
    2
      java/src/GestionBddDAO/ConfigBDD.java
  19. 11
    3
      java/src/GestionBddDAO/ConnexionBDD.java
  20. 8
    5
      java/src/GestionBddDAO/GestionCategories.java
  21. 8
    4
      java/src/GestionBddDAO/GestionQuestions.java
  22. 8
    4
      java/src/GestionBddDAO/GestionReponses.java
  23. 13
    0
      java/src/InterfaceGraphique/Bouton.java
  24. 7
    5
      java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java
  25. 2
    0
      java/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java
  26. 2
    0
      java/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java
  27. 11
    4
      java/src/InterfaceGraphique/InterfacePrincipale.java
  28. 9
    11
      java/src/MainAdminBddBurgerQuizz.java
  29. 2
    0
      java/src/Modele/Categorie.java
  30. 2
    0
      java/src/Modele/Question.java
  31. 2
    0
      java/src/Modele/Reponses.java

+ 262
- 161
java/.idea/workspace.xml 查看文件

7
   </component>
7
   </component>
8
   <component name="ChangeListManager">
8
   <component name="ChangeListManager">
9
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
9
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
11
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$1.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$1.class" />
12
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" />
13
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" />
14
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" afterPath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" />
15
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/ConnexionBDD.java" />
16
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
17
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
10
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
11
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
12
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
13
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
14
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
15
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
16
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
17
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
18
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
18
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
19
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" />
20
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
21
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
19
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
22
     </list>
20
     </list>
23
     <ignored path="java.iws" />
21
     <ignored path="java.iws" />
40
   </component>
38
   </component>
41
   <component name="FileEditorManager">
39
   <component name="FileEditorManager">
42
     <leaf>
40
     <leaf>
43
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
44
-        <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
41
+      <file leaf-file-name="Bouton.java" pinned="false" current-in-tab="true">
42
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
45
           <provider selected="true" editor-type-id="text-editor">
43
           <provider selected="true" editor-type-id="text-editor">
46
-            <state vertical-scroll-proportion="0.0">
47
-              <caret line="584" column="26" selection-start-line="584" selection-start-column="19" selection-end-line="584" selection-end-column="26" />
44
+            <state vertical-scroll-proportion="0.19428572">
45
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="19" />
48
               <folding />
46
               <folding />
49
             </state>
47
             </state>
50
           </provider>
48
           </provider>
51
         </entry>
49
         </entry>
52
       </file>
50
       </file>
53
-      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="false">
54
-        <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
55
-          <provider selected="true" editor-type-id="text-editor">
56
-            <state vertical-scroll-proportion="0.0">
57
-              <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
58
-              <folding />
59
-            </state>
60
-          </provider>
61
-        </entry>
62
-      </file>
63
-      <file leaf-file-name="MainAdminBddBurgerQuizz.java" pinned="false" current-in-tab="true">
64
-        <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
65
-          <provider selected="true" editor-type-id="text-editor">
66
-            <state vertical-scroll-proportion="0.06716418">
67
-              <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
68
-              <folding>
69
-                <element signature="imports" expanded="true" />
70
-              </folding>
71
-            </state>
72
-          </provider>
73
-        </entry>
74
-      </file>
75
-      <file leaf-file-name="NouvelleQuestionDialog.java" pinned="false" current-in-tab="false">
76
-        <entry file="file://$PROJECT_DIR$/src/NouvelleQuestionDialog.java">
77
-          <provider selected="true" editor-type-id="text-editor">
78
-            <state vertical-scroll-proportion="0.0">
79
-              <caret line="73" column="143" selection-start-line="73" selection-start-column="143" selection-end-line="73" selection-end-column="143" />
80
-              <folding />
81
-            </state>
82
-          </provider>
83
-        </entry>
84
-      </file>
85
-      <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="false">
86
-        <entry file="file://$PROJECT_DIR$/src/ConnexionBddDialog.java">
87
-          <provider selected="true" editor-type-id="text-editor">
88
-            <state vertical-scroll-proportion="0.0">
89
-              <caret line="105" column="143" selection-start-line="105" selection-start-column="143" selection-end-line="105" selection-end-column="143" />
90
-              <folding>
91
-                <element signature="imports" expanded="true" />
92
-              </folding>
93
-            </state>
94
-          </provider>
95
-        </entry>
96
-      </file>
97
     </leaf>
51
     </leaf>
98
   </component>
52
   </component>
99
   <component name="FileTemplateManagerImpl">
53
   <component name="FileTemplateManagerImpl">
133
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
87
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
134
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
88
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
135
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
89
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
90
+        <option value="$PROJECT_DIR$/src/DialogBoxes/NouvelleReponseDialog.java" />
91
+        <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
92
+        <option value="$PROJECT_DIR$/src/Modele/ConfigBDD.java" />
93
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
94
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
95
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
136
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
96
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
97
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
98
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
99
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
100
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
101
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
137
       </list>
102
       </list>
138
     </option>
103
     </option>
139
   </component>
104
   </component>
252
       <sortByType />
217
       <sortByType />
253
     </navigator>
218
     </navigator>
254
     <panes>
219
     <panes>
220
+      <pane id="Scratches" />
221
+      <pane id="Scope" />
255
       <pane id="ProjectPane">
222
       <pane id="ProjectPane">
256
         <subPane>
223
         <subPane>
257
           <PATH>
224
           <PATH>
284
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
251
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285
             </PATH_ELEMENT>
252
             </PATH_ELEMENT>
286
           </PATH>
253
           </PATH>
254
+          <PATH>
255
+            <PATH_ELEMENT>
256
+              <option name="myItemId" value="java" />
257
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
258
+            </PATH_ELEMENT>
259
+            <PATH_ELEMENT>
260
+              <option name="myItemId" value="java" />
261
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
262
+            </PATH_ELEMENT>
263
+            <PATH_ELEMENT>
264
+              <option name="myItemId" value="src" />
265
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
266
+            </PATH_ELEMENT>
267
+            <PATH_ELEMENT>
268
+              <option name="myItemId" value="Modele" />
269
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
270
+            </PATH_ELEMENT>
271
+          </PATH>
272
+          <PATH>
273
+            <PATH_ELEMENT>
274
+              <option name="myItemId" value="java" />
275
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
276
+            </PATH_ELEMENT>
277
+            <PATH_ELEMENT>
278
+              <option name="myItemId" value="java" />
279
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
280
+            </PATH_ELEMENT>
281
+            <PATH_ELEMENT>
282
+              <option name="myItemId" value="src" />
283
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
284
+            </PATH_ELEMENT>
285
+            <PATH_ELEMENT>
286
+              <option name="myItemId" value="InterfaceGraphique" />
287
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
288
+            </PATH_ELEMENT>
289
+          </PATH>
290
+          <PATH>
291
+            <PATH_ELEMENT>
292
+              <option name="myItemId" value="java" />
293
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
294
+            </PATH_ELEMENT>
295
+            <PATH_ELEMENT>
296
+              <option name="myItemId" value="java" />
297
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
298
+            </PATH_ELEMENT>
299
+            <PATH_ELEMENT>
300
+              <option name="myItemId" value="src" />
301
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
302
+            </PATH_ELEMENT>
303
+            <PATH_ELEMENT>
304
+              <option name="myItemId" value="InterfaceGraphique" />
305
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
306
+            </PATH_ELEMENT>
307
+            <PATH_ELEMENT>
308
+              <option name="myItemId" value="DialogBoxes" />
309
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310
+            </PATH_ELEMENT>
311
+          </PATH>
312
+          <PATH>
313
+            <PATH_ELEMENT>
314
+              <option name="myItemId" value="java" />
315
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
316
+            </PATH_ELEMENT>
317
+            <PATH_ELEMENT>
318
+              <option name="myItemId" value="java" />
319
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
320
+            </PATH_ELEMENT>
321
+            <PATH_ELEMENT>
322
+              <option name="myItemId" value="src" />
323
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
324
+            </PATH_ELEMENT>
325
+            <PATH_ELEMENT>
326
+              <option name="myItemId" value="GestionBddDAO" />
327
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
328
+            </PATH_ELEMENT>
329
+          </PATH>
287
         </subPane>
330
         </subPane>
288
       </pane>
331
       </pane>
289
-      <pane id="Scope" />
290
       <pane id="PackagesPane" />
332
       <pane id="PackagesPane" />
291
-      <pane id="Scratches" />
292
     </panes>
333
     </panes>
293
   </component>
334
   </component>
294
   <component name="PropertiesComponent">
335
   <component name="PropertiesComponent">
310
     <property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
351
     <property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
311
     <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
352
     <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
312
     <property name="GenerateAntBuildDialog.outputFileNameProperty" value="java" />
353
     <property name="GenerateAntBuildDialog.outputFileNameProperty" value="java" />
354
+    <property name="SearchEverywhereHistoryKey" value="printStack&#9;null&#9;null" />
313
   </component>
355
   </component>
314
   <component name="RecentsManager">
356
   <component name="RecentsManager">
315
     <key name="ExtractSuperBase.RECENT_KEYS">
357
     <key name="ExtractSuperBase.RECENT_KEYS">
316
       <recent name="" />
358
       <recent name="" />
317
     </key>
359
     </key>
360
+    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
361
+      <recent name="GestionBddDAO" />
362
+      <recent name="InterfaceGraphique" />
363
+      <recent name="Modele" />
364
+      <recent name="DialogBoxes" />
365
+    </key>
318
   </component>
366
   </component>
319
   <component name="RunManager" selected="Application.Main">
367
   <component name="RunManager" selected="Application.Main">
320
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
368
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
631
       <option name="project" value="LOCAL" />
679
       <option name="project" value="LOCAL" />
632
       <updated>1433413381772</updated>
680
       <updated>1433413381772</updated>
633
     </task>
681
     </task>
634
-    <option name="localTasksCounter" value="26" />
682
+    <task id="LOCAL-00026" summary="boite de dialogue plus ergonomique">
683
+      <created>1433508006053</created>
684
+      <option name="number" value="00026" />
685
+      <option name="project" value="LOCAL" />
686
+      <updated>1433508006053</updated>
687
+    </task>
688
+    <task id="LOCAL-00027" summary="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon)&#10;NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)">
689
+      <created>1433516680268</created>
690
+      <option name="number" value="00027" />
691
+      <option name="project" value="LOCAL" />
692
+      <updated>1433516680268</updated>
693
+    </task>
694
+    <task id="LOCAL-00028" summary="redimensionnement de certains elms">
695
+      <created>1433522454971</created>
696
+      <option name="number" value="00028" />
697
+      <option name="project" value="LOCAL" />
698
+      <updated>1433522454971</updated>
699
+    </task>
700
+    <option name="localTasksCounter" value="29" />
635
     <servers />
701
     <servers />
636
   </component>
702
   </component>
637
   <component name="TodoView">
703
   <component name="TodoView">
647
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
713
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
648
     <editor active="false" />
714
     <editor active="false" />
649
     <layout>
715
     <layout>
650
-      <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" />
651
       <window_info id="Palette&#9;" 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" />
716
       <window_info id="Palette&#9;" 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" />
717
+      <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" />
652
       <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" />
718
       <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" />
653
-      <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" />
654
-      <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" />
655
       <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" />
719
       <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" />
720
+      <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" />
656
       <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" />
721
       <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" />
722
+      <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" />
723
+      <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" />
724
+      <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" />
725
+      <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" />
726
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32688928" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
727
+      <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" />
657
       <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" />
728
       <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" />
658
       <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" />
729
       <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" />
659
       <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" />
730
       <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" />
660
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26291794" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
661
-      <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" />
662
-      <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" />
663
-      <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" />
731
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14893617" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
732
+      <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="7" side_tool="false" content_ui="tabs" />
664
       <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" />
733
       <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" />
665
       <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" />
734
       <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" />
666
       <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" />
735
       <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" />
667
-      <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" />
668
-      <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" />
669
       <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" />
736
       <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" />
670
       <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" />
737
       <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" />
671
       <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" />
738
       <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" />
672
-      <window_info id="Run" active="false" 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" />
673
     </layout>
739
     </layout>
674
   </component>
740
   </component>
675
   <component name="Vcs.Log.UiProperties">
741
   <component name="Vcs.Log.UiProperties">
684
     <option name="myLimit" value="2678400000" />
750
     <option name="myLimit" value="2678400000" />
685
   </component>
751
   </component>
686
   <component name="VcsManagerConfiguration">
752
   <component name="VcsManagerConfiguration">
687
-    <MESSAGE value="test" />
688
     <MESSAGE value="creation classe de base" />
753
     <MESSAGE value="creation classe de base" />
689
     <MESSAGE value="evolution" />
754
     <MESSAGE value="evolution" />
690
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
755
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
706
     <MESSAGE value="dialogu co bdd" />
771
     <MESSAGE value="dialogu co bdd" />
707
     <MESSAGE value="amelioration diverse concernant la boite de dialogue des parametres" />
772
     <MESSAGE value="amelioration diverse concernant la boite de dialogue des parametres" />
708
     <MESSAGE value="modification parametre operationelle" />
773
     <MESSAGE value="modification parametre operationelle" />
709
-    <option name="LAST_COMMIT_MESSAGE" value="modification parametre operationelle" />
774
+    <MESSAGE value="boite de dialogue plus ergonomique" />
775
+    <MESSAGE value="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon)&#10;NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)" />
776
+    <MESSAGE value="redimensionnement de certains elms" />
777
+    <MESSAGE value="++mieux" />
778
+    <option name="LAST_COMMIT_MESSAGE" value="++mieux" />
710
   </component>
779
   </component>
711
   <component name="XDebuggerManager">
780
   <component name="XDebuggerManager">
712
     <breakpoint-manager>
781
     <breakpoint-manager>
719
     <option name="FILTER_TARGETS" value="false" />
788
     <option name="FILTER_TARGETS" value="false" />
720
   </component>
789
   </component>
721
   <component name="editorHistoryManager">
790
   <component name="editorHistoryManager">
791
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
792
+      <provider selected="true" editor-type-id="text-editor">
793
+        <state vertical-scroll-proportion="0.0">
794
+          <caret line="75" column="143" selection-start-line="75" selection-start-column="143" selection-end-line="75" selection-end-column="143" />
795
+          <folding />
796
+        </state>
797
+      </provider>
798
+    </entry>
799
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
800
+      <provider selected="true" editor-type-id="text-editor">
801
+        <state vertical-scroll-proportion="0.0">
802
+          <caret line="107" column="143" selection-start-line="107" selection-start-column="143" selection-end-line="107" selection-end-column="143" />
803
+          <folding>
804
+            <element signature="imports" expanded="true" />
805
+          </folding>
806
+        </state>
807
+      </provider>
808
+    </entry>
722
     <entry file="file://$PROJECT_DIR$/mcd.png">
809
     <entry file="file://$PROJECT_DIR$/mcd.png">
723
       <provider selected="true" editor-type-id="images">
810
       <provider selected="true" editor-type-id="images">
724
         <state />
811
         <state />
729
         <state />
816
         <state />
730
       </provider>
817
       </provider>
731
     </entry>
818
     </entry>
732
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
819
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
733
       <provider selected="true" editor-type-id="text-editor">
820
       <provider selected="true" editor-type-id="text-editor">
734
         <state vertical-scroll-proportion="0.0">
821
         <state vertical-scroll-proportion="0.0">
735
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
822
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
736
-          <folding />
823
+          <folding>
824
+            <element signature="imports" expanded="true" />
825
+          </folding>
737
         </state>
826
         </state>
738
       </provider>
827
       </provider>
739
     </entry>
828
     </entry>
744
         </state>
833
         </state>
745
       </provider>
834
       </provider>
746
     </entry>
835
     </entry>
747
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
836
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
748
       <provider selected="true" editor-type-id="text-editor">
837
       <provider selected="true" editor-type-id="text-editor">
749
         <state vertical-scroll-proportion="0.0">
838
         <state vertical-scroll-proportion="0.0">
750
           <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
839
           <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
761
         <state />
850
         <state />
762
       </provider>
851
       </provider>
763
     </entry>
852
     </entry>
764
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
853
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
765
       <provider selected="true" editor-type-id="text-editor">
854
       <provider selected="true" editor-type-id="text-editor">
766
         <state vertical-scroll-proportion="0.0">
855
         <state vertical-scroll-proportion="0.0">
767
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
856
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
768
-          <folding />
857
+          <folding>
858
+            <element signature="imports" expanded="true" />
859
+          </folding>
769
         </state>
860
         </state>
770
       </provider>
861
       </provider>
771
     </entry>
862
     </entry>
776
         </state>
867
         </state>
777
       </provider>
868
       </provider>
778
     </entry>
869
     </entry>
779
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
870
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
780
       <provider selected="true" editor-type-id="text-editor">
871
       <provider selected="true" editor-type-id="text-editor">
781
         <state vertical-scroll-proportion="0.0">
872
         <state vertical-scroll-proportion="0.0">
782
           <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
873
           <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
793
         <state />
884
         <state />
794
       </provider>
885
       </provider>
795
     </entry>
886
     </entry>
796
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
887
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
797
       <provider selected="true" editor-type-id="text-editor">
888
       <provider selected="true" editor-type-id="text-editor">
798
         <state vertical-scroll-proportion="0.0">
889
         <state vertical-scroll-proportion="0.0">
799
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
890
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
800
-          <folding />
891
+          <folding>
892
+            <element signature="imports" expanded="true" />
893
+          </folding>
801
         </state>
894
         </state>
802
       </provider>
895
       </provider>
803
     </entry>
896
     </entry>
808
         </state>
901
         </state>
809
       </provider>
902
       </provider>
810
     </entry>
903
     </entry>
811
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
904
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
812
       <provider selected="true" editor-type-id="text-editor">
905
       <provider selected="true" editor-type-id="text-editor">
813
         <state vertical-scroll-proportion="0.0">
906
         <state vertical-scroll-proportion="0.0">
814
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
907
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
825
         <state />
918
         <state />
826
       </provider>
919
       </provider>
827
     </entry>
920
     </entry>
828
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
921
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
829
       <provider selected="true" editor-type-id="text-editor">
922
       <provider selected="true" editor-type-id="text-editor">
830
         <state vertical-scroll-proportion="0.0">
923
         <state vertical-scroll-proportion="0.0">
831
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
924
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
832
-          <folding />
925
+          <folding>
926
+            <element signature="imports" expanded="true" />
927
+          </folding>
833
         </state>
928
         </state>
834
       </provider>
929
       </provider>
835
     </entry>
930
     </entry>
840
         </state>
935
         </state>
841
       </provider>
936
       </provider>
842
     </entry>
937
     </entry>
843
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
938
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
844
       <provider selected="true" editor-type-id="text-editor">
939
       <provider selected="true" editor-type-id="text-editor">
845
         <state vertical-scroll-proportion="0.0">
940
         <state vertical-scroll-proportion="0.0">
846
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
941
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
857
         <state />
952
         <state />
858
       </provider>
953
       </provider>
859
     </entry>
954
     </entry>
860
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
955
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
861
       <provider selected="true" editor-type-id="text-editor">
956
       <provider selected="true" editor-type-id="text-editor">
862
         <state vertical-scroll-proportion="0.0">
957
         <state vertical-scroll-proportion="0.0">
863
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
958
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
864
-          <folding />
959
+          <folding>
960
+            <element signature="imports" expanded="true" />
961
+          </folding>
865
         </state>
962
         </state>
866
       </provider>
963
       </provider>
867
     </entry>
964
     </entry>
872
         </state>
969
         </state>
873
       </provider>
970
       </provider>
874
     </entry>
971
     </entry>
875
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
972
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
876
       <provider selected="true" editor-type-id="text-editor">
973
       <provider selected="true" editor-type-id="text-editor">
877
         <state vertical-scroll-proportion="0.0">
974
         <state vertical-scroll-proportion="0.0">
878
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
975
           <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
889
         <state />
986
         <state />
890
       </provider>
987
       </provider>
891
     </entry>
988
     </entry>
892
-    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
989
+    <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
893
       <provider selected="true" editor-type-id="text-editor">
990
       <provider selected="true" editor-type-id="text-editor">
894
         <state vertical-scroll-proportion="0.0">
991
         <state vertical-scroll-proportion="0.0">
895
           <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
992
           <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
896
         </state>
993
         </state>
897
       </provider>
994
       </provider>
898
     </entry>
995
     </entry>
899
-    <entry file="file://$PROJECT_DIR$/src/Reponses.java">
996
+    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
900
       <provider selected="true" editor-type-id="text-editor">
997
       <provider selected="true" editor-type-id="text-editor">
901
         <state vertical-scroll-proportion="0.0">
998
         <state vertical-scroll-proportion="0.0">
902
           <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
999
           <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
903
         </state>
1000
         </state>
904
       </provider>
1001
       </provider>
905
     </entry>
1002
     </entry>
906
-    <entry file="file://$PROJECT_DIR$/src/Question.java">
1003
+    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
907
       <provider selected="true" editor-type-id="text-editor">
1004
       <provider selected="true" editor-type-id="text-editor">
908
         <state vertical-scroll-proportion="0.0">
1005
         <state vertical-scroll-proportion="0.0">
909
           <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
1006
           <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
910
         </state>
1007
         </state>
911
       </provider>
1008
       </provider>
912
     </entry>
1009
     </entry>
913
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1010
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
914
       <provider selected="true" editor-type-id="text-editor">
1011
       <provider selected="true" editor-type-id="text-editor">
915
         <state vertical-scroll-proportion="0.0">
1012
         <state vertical-scroll-proportion="0.0">
916
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1013
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
917
-          <folding />
918
-        </state>
919
-      </provider>
920
-    </entry>
921
-    <entry file="file://$PROJECT_DIR$/src/ConnectDialog.java">
922
-      <provider selected="true" editor-type-id="text-editor">
923
-        <state vertical-scroll-proportion="0.0">
924
-          <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
1014
+          <folding>
1015
+            <element signature="imports" expanded="true" />
1016
+          </folding>
925
         </state>
1017
         </state>
926
       </provider>
1018
       </provider>
927
     </entry>
1019
     </entry>
928
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1020
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
929
       <provider selected="true" editor-type-id="text-editor">
1021
       <provider selected="true" editor-type-id="text-editor">
930
         <state vertical-scroll-proportion="0.0">
1022
         <state vertical-scroll-proportion="0.0">
931
           <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
1023
           <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
932
         </state>
1024
         </state>
933
       </provider>
1025
       </provider>
934
     </entry>
1026
     </entry>
935
-    <entry file="file://$PROJECT_DIR$/src/ConnectDialog.java">
936
-      <provider selected="true" editor-type-id="text-editor">
937
-        <state vertical-scroll-proportion="0.0">
938
-          <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
939
-        </state>
1027
+    <entry file="file://$PROJECT_DIR$/java.png">
1028
+      <provider selected="true" editor-type-id="images">
1029
+        <state />
940
       </provider>
1030
       </provider>
941
     </entry>
1031
     </entry>
942
-    <entry file="file://$PROJECT_DIR$/java.png">
1032
+    <entry file="file://$PROJECT_DIR$/mcd.png">
943
       <provider selected="true" editor-type-id="images">
1033
       <provider selected="true" editor-type-id="images">
944
         <state />
1034
         <state />
945
       </provider>
1035
       </provider>
946
     </entry>
1036
     </entry>
947
-    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
1037
+    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
948
       <provider selected="true" editor-type-id="text-editor">
1038
       <provider selected="true" editor-type-id="text-editor">
949
-        <state vertical-scroll-proportion="0.0">
950
-          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
1039
+        <state vertical-scroll-proportion="0.46082088">
1040
+          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
1041
+          <folding />
951
         </state>
1042
         </state>
952
       </provider>
1043
       </provider>
953
     </entry>
1044
     </entry>
954
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
1045
+    <entry file="file://$PROJECT_DIR$/conf.xml">
955
       <provider selected="true" editor-type-id="text-editor">
1046
       <provider selected="true" editor-type-id="text-editor">
956
-        <state vertical-scroll-proportion="2.4738805">
957
-          <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
1047
+        <state vertical-scroll-proportion="0.0">
1048
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1049
+          <folding />
958
         </state>
1050
         </state>
959
       </provider>
1051
       </provider>
960
     </entry>
1052
     </entry>
961
-    <entry file="file://$PROJECT_DIR$/src/Reponses.java">
1053
+    <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
962
       <provider selected="true" editor-type-id="text-editor">
1054
       <provider selected="true" editor-type-id="text-editor">
963
-        <state vertical-scroll-proportion="0.3488806">
964
-          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1055
+        <state vertical-scroll-proportion="0.0">
1056
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
1057
+          <folding>
1058
+            <element signature="e#97#98#0" expanded="true" />
1059
+            <element signature="e#118#119#0" expanded="true" />
1060
+          </folding>
965
         </state>
1061
         </state>
966
       </provider>
1062
       </provider>
967
     </entry>
1063
     </entry>
968
-    <entry file="file://$PROJECT_DIR$/mcd.png">
969
-      <provider selected="true" editor-type-id="images">
970
-        <state />
971
-      </provider>
972
-    </entry>
973
-    <entry file="file://$PROJECT_DIR$/src/Question.java">
1064
+    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
974
       <provider selected="true" editor-type-id="text-editor">
1065
       <provider selected="true" editor-type-id="text-editor">
975
-        <state vertical-scroll-proportion="0.46082088">
976
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
1066
+        <state vertical-scroll-proportion="0.0">
1067
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1068
+          <folding />
977
         </state>
1069
         </state>
978
       </provider>
1070
       </provider>
979
     </entry>
1071
     </entry>
980
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
1072
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
981
       <provider selected="true" editor-type-id="text-editor">
1073
       <provider selected="true" editor-type-id="text-editor">
982
-        <state vertical-scroll-proportion="0.0">
983
-          <caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
1074
+        <state vertical-scroll-proportion="0.7044199">
1075
+          <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />
1076
+          <folding>
1077
+            <element signature="imports" expanded="true" />
1078
+          </folding>
984
         </state>
1079
         </state>
985
       </provider>
1080
       </provider>
986
     </entry>
1081
     </entry>
987
-    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
1082
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
988
       <provider selected="true" editor-type-id="text-editor">
1083
       <provider selected="true" editor-type-id="text-editor">
989
-        <state vertical-scroll-proportion="0.0">
990
-          <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="36" />
1084
+        <state vertical-scroll-proportion="-2.3283582">
1085
+          <caret line="38" column="47" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="47" />
1086
+          <folding />
991
         </state>
1087
         </state>
992
       </provider>
1088
       </provider>
993
     </entry>
1089
     </entry>
994
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
1090
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
995
       <provider selected="true" editor-type-id="text-editor">
1091
       <provider selected="true" editor-type-id="text-editor">
996
-        <state vertical-scroll-proportion="0.20165746">
997
-          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
1092
+        <state vertical-scroll-proportion="-7.402985">
1093
+          <caret line="49" column="47" selection-start-line="49" selection-start-column="47" selection-end-line="49" selection-end-column="47" />
1094
+          <folding>
1095
+            <element signature="imports" expanded="true" />
1096
+          </folding>
998
         </state>
1097
         </state>
999
       </provider>
1098
       </provider>
1000
     </entry>
1099
     </entry>
1001
-    <entry file="file://$PROJECT_DIR$/conf.xml">
1100
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java">
1002
       <provider selected="true" editor-type-id="text-editor">
1101
       <provider selected="true" editor-type-id="text-editor">
1003
-        <state vertical-scroll-proportion="0.0">
1004
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1102
+        <state vertical-scroll-proportion="0.6012793">
1103
+          <caret line="100" column="47" selection-start-line="100" selection-start-column="47" selection-end-line="100" selection-end-column="47" />
1005
           <folding />
1104
           <folding />
1006
         </state>
1105
         </state>
1007
       </provider>
1106
       </provider>
1008
     </entry>
1107
     </entry>
1009
-    <entry file="file://$PROJECT_DIR$/src/ConfigBDD.java">
1108
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java">
1010
       <provider selected="true" editor-type-id="text-editor">
1109
       <provider selected="true" editor-type-id="text-editor">
1011
-        <state vertical-scroll-proportion="0.60261196">
1012
-          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
1110
+        <state vertical-scroll-proportion="0.6012793">
1111
+          <caret line="110" column="47" selection-start-line="110" selection-start-column="47" selection-end-line="110" selection-end-column="47" />
1112
+          <folding />
1013
         </state>
1113
         </state>
1014
       </provider>
1114
       </provider>
1015
     </entry>
1115
     </entry>
1016
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1116
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java">
1017
       <provider selected="true" editor-type-id="text-editor">
1117
       <provider selected="true" editor-type-id="text-editor">
1018
-        <state vertical-scroll-proportion="-0.29104477">
1019
-          <caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
1118
+        <state vertical-scroll-proportion="1.8550106">
1119
+          <caret line="107" column="47" selection-start-line="107" selection-start-column="47" selection-end-line="107" selection-end-column="47" />
1120
+          <folding />
1020
         </state>
1121
         </state>
1021
       </provider>
1122
       </provider>
1022
     </entry>
1123
     </entry>
1023
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBddDialog.java">
1124
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1024
       <provider selected="true" editor-type-id="text-editor">
1125
       <provider selected="true" editor-type-id="text-editor">
1025
-        <state vertical-scroll-proportion="0.0">
1026
-          <caret line="105" column="143" selection-start-line="105" selection-start-column="143" selection-end-line="105" selection-end-column="143" />
1126
+        <state vertical-scroll-proportion="0.9872068">
1127
+          <caret line="577" column="110" selection-start-line="577" selection-start-column="110" selection-end-line="577" selection-end-column="110" />
1027
           <folding>
1128
           <folding>
1028
             <element signature="imports" expanded="true" />
1129
             <element signature="imports" expanded="true" />
1029
           </folding>
1130
           </folding>
1030
         </state>
1131
         </state>
1031
       </provider>
1132
       </provider>
1032
     </entry>
1133
     </entry>
1033
-    <entry file="file://$PROJECT_DIR$/src/NouvelleQuestionDialog.java">
1134
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1034
       <provider selected="true" editor-type-id="text-editor">
1135
       <provider selected="true" editor-type-id="text-editor">
1035
-        <state vertical-scroll-proportion="0.0">
1036
-          <caret line="73" column="143" selection-start-line="73" selection-start-column="143" selection-end-line="73" selection-end-column="143" />
1037
-          <folding />
1136
+        <state vertical-scroll-proportion="2.2111554">
1137
+          <caret line="72" column="13" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
1138
+          <folding>
1139
+            <element signature="imports" expanded="true" />
1140
+          </folding>
1038
         </state>
1141
         </state>
1039
       </provider>
1142
       </provider>
1040
     </entry>
1143
     </entry>
1041
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1144
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1042
       <provider selected="true" editor-type-id="text-editor">
1145
       <provider selected="true" editor-type-id="text-editor">
1043
-        <state vertical-scroll-proportion="0.0">
1044
-          <caret line="584" column="26" selection-start-line="584" selection-start-column="19" selection-end-line="584" selection-end-column="26" />
1146
+        <state vertical-scroll-proportion="0.45816734">
1147
+          <caret line="75" column="143" selection-start-line="75" selection-start-column="143" selection-end-line="75" selection-end-column="143" />
1045
           <folding />
1148
           <folding />
1046
         </state>
1149
         </state>
1047
       </provider>
1150
       </provider>
1048
     </entry>
1151
     </entry>
1049
-    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
1152
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
1050
       <provider selected="true" editor-type-id="text-editor">
1153
       <provider selected="true" editor-type-id="text-editor">
1051
-        <state vertical-scroll-proportion="0.0">
1052
-          <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
1154
+        <state vertical-scroll-proportion="-0.033864543">
1155
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
1053
           <folding />
1156
           <folding />
1054
         </state>
1157
         </state>
1055
       </provider>
1158
       </provider>
1056
     </entry>
1159
     </entry>
1057
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1160
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
1058
       <provider selected="true" editor-type-id="text-editor">
1161
       <provider selected="true" editor-type-id="text-editor">
1059
-        <state vertical-scroll-proportion="0.06716418">
1060
-          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
1061
-          <folding>
1062
-            <element signature="imports" expanded="true" />
1063
-          </folding>
1162
+        <state vertical-scroll-proportion="0.19428572">
1163
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="19" />
1164
+          <folding />
1064
         </state>
1165
         </state>
1065
       </provider>
1166
       </provider>
1066
     </entry>
1167
     </entry>

二進制
java/out/production/java/Bouton.class 查看文件


二進制
java/out/production/java/Categorie.class 查看文件


二進制
java/out/production/java/ConnectDialog.class 查看文件


二進制
java/out/production/java/ConnexionBDD.class 查看文件


二進制
java/out/production/java/GestionCategories.class 查看文件


二進制
java/out/production/java/GestionQuestions.class 查看文件


二進制
java/out/production/java/GestionReponses.class 查看文件


二進制
java/out/production/java/InterfacePrincipale$1.class 查看文件


二進制
java/out/production/java/InterfacePrincipale$PanQuestionsListener.class 查看文件


二進制
java/out/production/java/InterfacePrincipale$PanReponsesListener.class 查看文件


二進制
java/out/production/java/MainAdminBddBurgerQuizz.class 查看文件


二進制
java/out/production/java/Question.class 查看文件


二進制
java/out/production/java/Reponses.class 查看文件


二進制
java/rsc/burgerquizz.png 查看文件


+ 0
- 17
java/src/Bouton.java 查看文件

1
-import javax.swing.*;
2
-import javax.swing.border.Border;
3
-import java.awt.*;
4
-
5
-public class Bouton extends JButton
6
-{
7
-	public Bouton(String text, Icon icon)
8
-	{
9
-		super(text, icon);
10
-		//setBackground(Color.WHITE);
11
-		setFocusPainted(false);
12
-		//Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
13
-		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
14
-		//setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
15
-		setIconTextGap(10);
16
-	}
17
-}

+ 0
- 6
java/src/ConnectDialog.java 查看文件

1
-import javax.swing.*;
2
-
3
-public class ConnectDialog extends JDialog
4
-{
5
-
6
-}

java/src/ConfigBDD.java → java/src/GestionBddDAO/ConfigBDD.java 查看文件

1
+package GestionBddDAO;
2
+
1
 import java.io.*;
3
 import java.io.*;
2
 import java.util.Properties;
4
 import java.util.Properties;
3
 
5
 
20
 		{
22
 		{
21
 			loadDefaultConf();
23
 			loadDefaultConf();
22
 			saveConf();
24
 			saveConf();
23
-			e.printStackTrace();
25
+			System.out.println(e.getMessage());
24
 			return false;
26
 			return false;
25
 		}
27
 		}
26
 	}
28
 	}
34
 		}
36
 		}
35
 		catch (IOException e)
37
 		catch (IOException e)
36
 		{
38
 		{
37
-			e.printStackTrace();
39
+			System.out.println(e.getMessage());
38
 			return false;
40
 			return false;
39
 		}
41
 		}
40
 	}
42
 	}

java/src/ConnexionBDD.java → java/src/GestionBddDAO/ConnexionBDD.java 查看文件

1
+package GestionBddDAO;
2
+
3
+import GestionBddDAO.GestionCategories;
4
+import GestionBddDAO.GestionQuestions;
5
+import GestionBddDAO.GestionReponses;
6
+import Modele.Categorie;
7
+import Modele.Question;
8
+import Modele.Reponses;
9
+
1
 import java.sql.Connection;
10
 import java.sql.Connection;
2
 import java.sql.DriverManager;
11
 import java.sql.DriverManager;
3
 import java.sql.SQLException;
12
 import java.sql.SQLException;
18
 		}
27
 		}
19
 		catch(ClassNotFoundException e)
28
 		catch(ClassNotFoundException e)
20
 		{
29
 		{
21
-			e.printStackTrace();
30
+			System.out.println(e.getMessage());
22
 			System.exit(1);
31
 			System.exit(1);
23
 		}
32
 		}
24
 	}
33
 	}
38
 		}
47
 		}
39
 		catch(SQLException e)
48
 		catch(SQLException e)
40
 		{
49
 		{
41
-			e.printStackTrace();
50
+			System.out.println(e.getMessage());
42
 			System.out.println("Erreur de conexion à la base de données: " + e.getMessage());
51
 			System.out.println("Erreur de conexion à la base de données: " + e.getMessage());
43
 			return false;
52
 			return false;
44
-			//System.exit(1);
45
 		}
53
 		}
46
 	}
54
 	}
47
 
55
 

java/src/GestionCategories.java → java/src/GestionBddDAO/GestionCategories.java 查看文件

1
-import java.beans.Statement;
1
+package GestionBddDAO;
2
+
3
+import Modele.Categorie;
4
+
2
 import java.sql.Connection;
5
 import java.sql.Connection;
3
 import java.sql.PreparedStatement;
6
 import java.sql.PreparedStatement;
4
 import java.sql.ResultSet;
7
 import java.sql.ResultSet;
38
 		}
41
 		}
39
 		catch (SQLException e)
42
 		catch (SQLException e)
40
 		{
43
 		{
41
-			e.printStackTrace();
44
+			System.out.println(e.getMessage());
42
 		}
45
 		}
43
 	}
46
 	}
44
 
47
 
56
 		}
59
 		}
57
 		catch (SQLException e)
60
 		catch (SQLException e)
58
 		{
61
 		{
59
-			e.printStackTrace();
62
+			System.out.println(e.getMessage());
60
 		}
63
 		}
61
 	}
64
 	}
62
 
65
 
74
 		}
77
 		}
75
 		catch (SQLException e)
78
 		catch (SQLException e)
76
 		{
79
 		{
77
-			e.printStackTrace();
80
+			System.out.println(e.getMessage());
78
 		}
81
 		}
79
 	}
82
 	}
80
 
83
 
95
 		}
98
 		}
96
 		catch (SQLException e)
99
 		catch (SQLException e)
97
 		{
100
 		{
98
-			e.printStackTrace();
101
+			System.out.println(e.getMessage());
99
 		}
102
 		}
100
 	}
103
 	}
101
 
104
 

java/src/GestionQuestions.java → java/src/GestionBddDAO/GestionQuestions.java 查看文件

1
+package GestionBddDAO;
2
+
3
+import Modele.Question;
4
+
1
 import java.sql.Connection;
5
 import java.sql.Connection;
2
 import java.sql.PreparedStatement;
6
 import java.sql.PreparedStatement;
3
 import java.sql.ResultSet;
7
 import java.sql.ResultSet;
41
 		}
45
 		}
42
 		catch (SQLException e)
46
 		catch (SQLException e)
43
 		{
47
 		{
44
-			e.printStackTrace();
48
+			System.out.println(e.getMessage());
45
 		}
49
 		}
46
 	}
50
 	}
47
 
51
 
61
 			preparedStatement.close();
65
 			preparedStatement.close();
62
 		}
66
 		}
63
 		catch (SQLException e) {
67
 		catch (SQLException e) {
64
-			e.printStackTrace();
68
+			System.out.println(e.getMessage());
65
 		}
69
 		}
66
 	}
70
 	}
67
 
71
 
81
 		}
85
 		}
82
 		catch (SQLException e)
86
 		catch (SQLException e)
83
 		{
87
 		{
84
-			e.printStackTrace();
88
+			System.out.println(e.getMessage());
85
 		}
89
 		}
86
 	}
90
 	}
87
 
91
 
104
 		}
108
 		}
105
 		catch (SQLException e)
109
 		catch (SQLException e)
106
 		{
110
 		{
107
-			e.printStackTrace();
111
+			System.out.println(e.getMessage());
108
 		}
112
 		}
109
 	}
113
 	}
110
 
114
 

java/src/GestionReponses.java → java/src/GestionBddDAO/GestionReponses.java 查看文件

1
+package GestionBddDAO;
2
+
3
+import Modele.Reponses;
4
+
1
 import java.sql.Connection;
5
 import java.sql.Connection;
2
 import java.sql.PreparedStatement;
6
 import java.sql.PreparedStatement;
3
 import java.sql.ResultSet;
7
 import java.sql.ResultSet;
40
 		}
44
 		}
41
 		catch (SQLException e)
45
 		catch (SQLException e)
42
 		{
46
 		{
43
-			e.printStackTrace();
47
+			System.out.println(e.getMessage());
44
 		}
48
 		}
45
 	}
49
 	}
46
 
50
 
59
 			preparedStatement.close();
63
 			preparedStatement.close();
60
 		}
64
 		}
61
 		catch (SQLException e) {
65
 		catch (SQLException e) {
62
-			e.printStackTrace();
66
+			System.out.println(e.getMessage());
63
 		}
67
 		}
64
 	}
68
 	}
65
 
69
 
78
 		}
82
 		}
79
 		catch (SQLException e)
83
 		catch (SQLException e)
80
 		{
84
 		{
81
-			e.printStackTrace();
85
+			System.out.println(e.getMessage());
82
 		}
86
 		}
83
 	}
87
 	}
84
 
88
 
101
 		}
105
 		}
102
 		catch (SQLException e)
106
 		catch (SQLException e)
103
 		{
107
 		{
104
-			e.printStackTrace();
108
+			System.out.println(e.getMessage());
105
 		}
109
 		}
106
 	}
110
 	}
107
 
111
 

+ 13
- 0
java/src/InterfaceGraphique/Bouton.java 查看文件

1
+package InterfaceGraphique;
2
+
3
+import javax.swing.*;
4
+
5
+public class Bouton extends JButton
6
+{
7
+	public Bouton(String text, Icon icon)
8
+	{
9
+		super(text, icon);
10
+		setFocusPainted(false);
11
+		setIconTextGap(10);
12
+	}
13
+}

java/src/ConnexionBddDialog.java → java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java 查看文件

1
+package InterfaceGraphique.DialogBoxes;
2
+
1
 import javax.swing.*;
3
 import javax.swing.*;
2
 import java.awt.*;
4
 import java.awt.*;
3
 import java.awt.event.ActionEvent;
5
 import java.awt.event.ActionEvent;
4
 import java.awt.event.ActionListener;
6
 import java.awt.event.ActionListener;
5
 import java.text.NumberFormat;
7
 import java.text.NumberFormat;
6
 
8
 
7
-import static javax.swing.BoxLayout.Y_AXIS;
8
-
9
 public class ConnexionBddDialog extends JDialog implements ActionListener
9
 public class ConnexionBddDialog extends JDialog implements ActionListener
10
 {
10
 {
11
 	private JTextField nomBdd;
11
 	private JTextField nomBdd;
21
 
21
 
22
 	public ConnexionBddDialog(String nomBdd, int port, String ip, String login, String password, JFrame parent, boolean showExitButton)
22
 	public ConnexionBddDialog(String nomBdd, int port, String ip, String login, String password, JFrame parent, boolean showExitButton)
23
 	{
23
 	{
24
-		super(parent, "Paramètres de connexion à la  base de données", true);
24
+		super(parent, "Paramètres de connexion à la base de données", true);
25
 		modifEffectuees = false;
25
 		modifEffectuees = false;
26
 		createInterface(nomBdd, port, ip, login, password, showExitButton);
26
 		createInterface(nomBdd, port, ip, login, password, showExitButton);
27
 		pack();
27
 		pack();
69
 		fieldPanel.add(new JLabel("Mot de passe utilisateur:"));
69
 		fieldPanel.add(new JLabel("Mot de passe utilisateur:"));
70
 		fieldPanel.add(password);
70
 		fieldPanel.add(password);
71
 
71
 
72
-		if(!showExitButton)boutons.add(annuler);
72
+		if(!showExitButton)
73
+			{boutons.add(annuler);}
73
 		boutons.add(defParams);
74
 		boutons.add(defParams);
74
 		boutons.add(ok);
75
 		boutons.add(ok);
75
-		if(showExitButton)boutons.add(quitter);
76
+		if(showExitButton)
77
+			{boutons.add(quitter);}
76
 
78
 
77
 		getContentPane().add(fieldPanel, BorderLayout.CENTER);
79
 		getContentPane().add(fieldPanel, BorderLayout.CENTER);
78
 		getContentPane().add(boutons, BorderLayout.SOUTH);
80
 		getContentPane().add(boutons, BorderLayout.SOUTH);

java/src/NouvelleQuestionDialog.java → java/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java 查看文件

1
+package InterfaceGraphique.DialogBoxes;
2
+
1
 import javax.swing.*;
3
 import javax.swing.*;
2
 import java.awt.*;
4
 import java.awt.*;
3
 import java.awt.event.ActionEvent;
5
 import java.awt.event.ActionEvent;

java/src/NouvelleReponseDialog.java → java/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java 查看文件

1
+package InterfaceGraphique.DialogBoxes;
2
+
1
 import javax.swing.*;
3
 import javax.swing.*;
2
 import java.awt.*;
4
 import java.awt.*;
3
 import java.awt.event.ActionEvent;
5
 import java.awt.event.ActionEvent;

java/src/InterfacePrincipale.java → java/src/InterfaceGraphique/InterfacePrincipale.java 查看文件

1
+package InterfaceGraphique;
2
+
3
+import InterfaceGraphique.DialogBoxes.ConnexionBddDialog;
4
+import InterfaceGraphique.DialogBoxes.NouvelleQuestionDialog;
5
+import InterfaceGraphique.DialogBoxes.NouvelleReponseDialog;
6
+import GestionBddDAO.ConnexionBDD;
7
+import Modele.Categorie;
8
+import GestionBddDAO.ConfigBDD;
9
+import Modele.Question;
10
+import Modele.Reponses;
11
+
1
 import javax.swing.*;
12
 import javax.swing.*;
2
 import javax.swing.border.Border;
13
 import javax.swing.border.Border;
3
 import javax.swing.event.ListSelectionEvent;
14
 import javax.swing.event.ListSelectionEvent;
407
 				}
418
 				}
408
 
419
 
409
 				bdd.createCategorie(catName);
420
 				bdd.createCategorie(catName);
410
-				//listC.setListData(bdd.getListeCategorie().toArray());
411
 				reSelectCategorie(catName);
421
 				reSelectCategorie(catName);
412
 				listQ.setListData(new Vector(0));
422
 				listQ.setListData(new Vector(0));
413
 			}
423
 			}
490
 				{
500
 				{
491
 					String catName = listC.getSelectedValue().toString();
501
 					String catName = listC.getSelectedValue().toString();
492
 					bdd.createReponses(catName, nrd.getRep1(), nrd.getRep2());
502
 					bdd.createReponses(catName, nrd.getRep1(), nrd.getRep2());
493
-					//listR.setListData(bdd.getListeReponses(catName).toArray());
494
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
503
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
495
 				}
504
 				}
496
 			}
505
 			}
532
 				if(nrd.afficher() == true)
541
 				if(nrd.afficher() == true)
533
 				{
542
 				{
534
 					bdd.modifyReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
543
 					bdd.modifyReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
535
-					//listR.setListData(bdd.getListeReponses(catName).toArray());
536
 					reSelectCategorie(nrd.getCat());
544
 					reSelectCategorie(nrd.getCat());
537
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
545
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
538
 				}
546
 				}
568
 				if(nqd.afficher() == true)
576
 				if(nqd.afficher() == true)
569
 				{
577
 				{
570
 					bdd.createQuestion(nqd.getIntitule(), r.getReponse1(), r.getReponse2(), nqd.getReponse());
578
 					bdd.createQuestion(nqd.getIntitule(), r.getReponse1(), r.getReponse2(), nqd.getReponse());
571
-					//listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()));
572
 					reSelectQuestion(nqd.getIntitule());
579
 					reSelectQuestion(nqd.getIntitule());
573
 				}
580
 				}
574
 			}
581
 			}

+ 9
- 11
java/src/MainAdminBddBurgerQuizz.java 查看文件

1
+import InterfaceGraphique.InterfacePrincipale;
2
+
1
 import javax.swing.*;
3
 import javax.swing.*;
2
-import java.util.Enumeration;
3
 
4
 
4
 public class MainAdminBddBurgerQuizz
5
 public class MainAdminBddBurgerQuizz
5
 {
6
 {
6
-	public static void main(String args[])
7
+	public static void main(String[] args)
7
 	{
8
 	{
8
 		//https://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
9
 		//https://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
9
-		try {
10
+		try
11
+		{
10
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
12
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
11
-		} catch (ClassNotFoundException e) {
12
-			e.printStackTrace();
13
-		} catch (InstantiationException e) {
14
-			e.printStackTrace();
15
-		} catch (IllegalAccessException e) {
16
-			e.printStackTrace();
17
-		} catch (UnsupportedLookAndFeelException e) {
18
-			e.printStackTrace();
19
 		}
13
 		}
14
+		catch (ClassNotFoundException e) {}
15
+		catch (InstantiationException e) {}
16
+		catch (IllegalAccessException e) {}
17
+		catch (UnsupportedLookAndFeelException e) {}
20
 
18
 
21
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
19
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
22
 
20
 

java/src/Categorie.java → java/src/Modele/Categorie.java 查看文件

1
+package Modele;
2
+
1
 public class Categorie
3
 public class Categorie
2
 {
4
 {
3
 	protected String nom;
5
 	protected String nom;

java/src/Question.java → java/src/Modele/Question.java 查看文件

1
+package Modele;
2
+
1
 public class Question
3
 public class Question
2
 {
4
 {
3
 	protected String intitule;
5
 	protected String intitule;

java/src/Reponses.java → java/src/Modele/Reponses.java 查看文件

1
+package Modele;
2
+
1
 public class Reponses
3
 public class Reponses
2
 {
4
 {
3
 	protected String reponse1;
5
 	protected String reponse1;