Browse Source

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

Brendan Abolivier 9 years ago
parent
commit
d1e5c7101c

+ 208
- 75
java/.idea/workspace.xml View File

1
 <?xml version="1.0" encoding="UTF-8"?>
1
 <?xml version="1.0" encoding="UTF-8"?>
2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
-    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="" />
4
+    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
5
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
6
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="$PROJECT_DIR$/out/production/java/GestionCategories.class" />
7
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8
+    </list>
5
     <ignored path="java.iws" />
9
     <ignored path="java.iws" />
6
     <ignored path=".idea/workspace.xml" />
10
     <ignored path=".idea/workspace.xml" />
7
     <ignored path="$PROJECT_DIR$/out/" />
11
     <ignored path="$PROJECT_DIR$/out/" />
22
   </component>
26
   </component>
23
   <component name="FileEditorManager">
27
   <component name="FileEditorManager">
24
     <leaf>
28
     <leaf>
25
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
29
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
26
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
30
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
27
           <provider selected="true" editor-type-id="text-editor">
31
           <provider selected="true" editor-type-id="text-editor">
28
-            <state vertical-scroll-proportion="0.0">
29
-              <caret line="49" column="8" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
32
+            <state vertical-scroll-proportion="0.22099447">
33
+              <caret line="340" column="71" selection-start-line="340" selection-start-column="71" selection-end-line="340" selection-end-column="71" />
30
               <folding>
34
               <folding>
31
                 <element signature="imports" expanded="true" />
35
                 <element signature="imports" expanded="true" />
32
               </folding>
36
               </folding>
34
           </provider>
38
           </provider>
35
         </entry>
39
         </entry>
36
       </file>
40
       </file>
37
-      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
38
-        <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
41
+      <file leaf-file-name="Categorie.java" pinned="false" current-in-tab="false">
42
+        <entry file="file://$PROJECT_DIR$/src/Categorie.java">
39
           <provider selected="true" editor-type-id="text-editor">
43
           <provider selected="true" editor-type-id="text-editor">
40
             <state vertical-scroll-proportion="0.0">
44
             <state vertical-scroll-proportion="0.0">
41
-              <caret line="48" column="53" selection-start-line="48" selection-start-column="53" selection-end-line="48" selection-end-column="53" />
45
+              <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
42
               <folding>
46
               <folding>
43
-                <element signature="imports" expanded="true" />
47
+                <element signature="e#80#81#0" expanded="true" />
48
+                <element signature="e#101#102#0" expanded="true" />
44
               </folding>
49
               </folding>
45
             </state>
50
             </state>
46
           </provider>
51
           </provider>
47
         </entry>
52
         </entry>
48
       </file>
53
       </file>
49
-      <file leaf-file-name="GestionCategories.java" pinned="false" current-in-tab="true">
50
-        <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
54
+      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
55
+        <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
51
           <provider selected="true" editor-type-id="text-editor">
56
           <provider selected="true" editor-type-id="text-editor">
52
-            <state vertical-scroll-proportion="0.03601108">
53
-              <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
57
+            <state vertical-scroll-proportion="0.0">
58
+              <caret line="63" column="76" selection-start-line="63" selection-start-column="76" selection-end-line="63" selection-end-column="76" />
54
               <folding>
59
               <folding>
55
                 <element signature="imports" expanded="true" />
60
                 <element signature="imports" expanded="true" />
61
+                <element signature="e#1239#1240#0" expanded="true" />
62
+                <element signature="e#1294#1295#0" expanded="true" />
63
+                <element signature="e#1349#1350#0" expanded="true" />
64
+                <element signature="e#1404#1405#0" expanded="true" />
56
               </folding>
65
               </folding>
57
             </state>
66
             </state>
58
           </provider>
67
           </provider>
59
         </entry>
68
         </entry>
60
       </file>
69
       </file>
61
-      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
62
-        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
70
+      <file leaf-file-name="GestionCategories.java" pinned="false" current-in-tab="false">
71
+        <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
63
           <provider selected="true" editor-type-id="text-editor">
72
           <provider selected="true" editor-type-id="text-editor">
64
             <state vertical-scroll-proportion="0.0">
73
             <state vertical-scroll-proportion="0.0">
65
-              <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
74
+              <caret line="80" column="18" selection-start-line="80" selection-start-column="18" selection-end-line="80" selection-end-column="18" />
66
               <folding>
75
               <folding>
67
                 <element signature="imports" expanded="true" />
76
                 <element signature="imports" expanded="true" />
68
-                <element signature="e#198#199#0" expanded="true" />
69
-                <element signature="e#219#220#0" expanded="true" />
77
+                <element signature="e#2067#2068#0" expanded="true" />
78
+                <element signature="e#2095#2096#0" expanded="true" />
70
               </folding>
79
               </folding>
71
             </state>
80
             </state>
72
           </provider>
81
           </provider>
73
         </entry>
82
         </entry>
74
       </file>
83
       </file>
75
-      <file leaf-file-name="GestionQuestions.java" pinned="false" current-in-tab="false">
76
-        <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
77
-          <provider selected="true" editor-type-id="text-editor">
78
-            <state vertical-scroll-proportion="0.0">
79
-              <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
80
-              <folding>
81
-                <element signature="imports" expanded="true" />
82
-                <element signature="e#202#203#0" expanded="true" />
83
-                <element signature="e#223#224#0" expanded="true" />
84
-              </folding>
85
-            </state>
84
+      <file leaf-file-name="mcd.png" pinned="false" current-in-tab="false">
85
+        <entry file="file://$PROJECT_DIR$/mcd.png">
86
+          <provider selected="true" editor-type-id="images">
87
+            <state />
86
           </provider>
88
           </provider>
87
         </entry>
89
         </entry>
88
       </file>
90
       </file>
119
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
121
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
120
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
122
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
121
         <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
123
         <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
122
-        <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
123
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
124
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
125
+        <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
124
       </list>
126
       </list>
125
     </option>
127
     </option>
126
   </component>
128
   </component>
135
     <order />
137
     <order />
136
   </component>
138
   </component>
137
   <component name="ProjectFrameBounds">
139
   <component name="ProjectFrameBounds">
140
+    <option name="x" value="-1" />
138
     <option name="y" value="27" />
141
     <option name="y" value="27" />
139
-    <option name="width" value="1366" />
140
-    <option name="height" value="711" />
142
+    <option name="width" value="1368" />
143
+    <option name="height" value="712" />
141
   </component>
144
   </component>
142
   <component name="ProjectInspectionProfilesVisibleTreeState">
145
   <component name="ProjectInspectionProfilesVisibleTreeState">
143
     <entry key="Project Default">
146
     <entry key="Project Default">
217
       <sortByType />
220
       <sortByType />
218
     </navigator>
221
     </navigator>
219
     <panes>
222
     <panes>
220
-      <pane id="PackagesPane" />
221
-      <pane id="Scope" />
222
       <pane id="ProjectPane">
223
       <pane id="ProjectPane">
223
         <subPane>
224
         <subPane>
224
           <PATH>
225
           <PATH>
253
           </PATH>
254
           </PATH>
254
         </subPane>
255
         </subPane>
255
       </pane>
256
       </pane>
257
+      <pane id="Scope" />
258
+      <pane id="PackagesPane" />
256
       <pane id="Scratches" />
259
       <pane id="Scratches" />
257
     </panes>
260
     </panes>
258
   </component>
261
   </component>
274
       <recent name="" />
277
       <recent name="" />
275
     </key>
278
     </key>
276
   </component>
279
   </component>
280
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
281
+    <UpdatedFiles>
282
+      <FILE-GROUP>
283
+        <option name="myUpdateName" value="Updated from server" />
284
+        <option name="myStatusName" value="Changed on server" />
285
+        <option name="mySupportsDeletion" value="false" />
286
+        <option name="myCanBeAbsent" value="false" />
287
+        <option name="myId" value="CHANGED_ON_SERVER" />
288
+        <FILE-GROUP>
289
+          <option name="myUpdateName" value="Updated" />
290
+          <option name="myStatusName" value="Changed" />
291
+          <option name="mySupportsDeletion" value="false" />
292
+          <option name="myCanBeAbsent" value="false" />
293
+          <option name="myId" value="UPDATED" />
294
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/index.php</PATH>
295
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.categorie.php</PATH>
296
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.connector.php</PATH>
297
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.score.php</PATH>
298
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/tests.php</PATH>
299
+        </FILE-GROUP>
300
+        <FILE-GROUP>
301
+          <option name="myUpdateName" value="Created" />
302
+          <option name="myStatusName" value="Created" />
303
+          <option name="mySupportsDeletion" value="false" />
304
+          <option name="myCanBeAbsent" value="false" />
305
+          <option name="myId" value="CREATED" />
306
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/controller/palmares.php</PATH>
307
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/controller/questions.php</PATH>
308
+        </FILE-GROUP>
309
+        <FILE-GROUP>
310
+          <option name="myUpdateName" value="Deleted" />
311
+          <option name="myStatusName" value="Deleted" />
312
+          <option name="mySupportsDeletion" value="false" />
313
+          <option name="myCanBeAbsent" value="true" />
314
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
315
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/view/palmares.php</PATH>
316
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/view/questions.php</PATH>
317
+        </FILE-GROUP>
318
+        <FILE-GROUP>
319
+          <option name="myUpdateName" value="Restored" />
320
+          <option name="myStatusName" value="Will be restored" />
321
+          <option name="mySupportsDeletion" value="false" />
322
+          <option name="myCanBeAbsent" value="false" />
323
+          <option name="myId" value="RESTORED" />
324
+        </FILE-GROUP>
325
+      </FILE-GROUP>
326
+      <FILE-GROUP>
327
+        <option name="myUpdateName" value="Modified" />
328
+        <option name="myStatusName" value="Modified" />
329
+        <option name="mySupportsDeletion" value="false" />
330
+        <option name="myCanBeAbsent" value="false" />
331
+        <option name="myId" value="MODIFIED" />
332
+      </FILE-GROUP>
333
+      <FILE-GROUP>
334
+        <option name="myUpdateName" value="Skipped" />
335
+        <option name="myStatusName" value="Skipped" />
336
+        <option name="mySupportsDeletion" value="false" />
337
+        <option name="myCanBeAbsent" value="false" />
338
+        <option name="myId" value="SKIPPED" />
339
+      </FILE-GROUP>
340
+      <FILE-GROUP>
341
+        <option name="myUpdateName" value="Merged with conflicts" />
342
+        <option name="myStatusName" value="Will be merged with conflicts" />
343
+        <option name="mySupportsDeletion" value="false" />
344
+        <option name="myCanBeAbsent" value="false" />
345
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
346
+      </FILE-GROUP>
347
+      <FILE-GROUP>
348
+        <option name="myUpdateName" value="Merged with tree conflicts" />
349
+        <option name="myStatusName" value="Merged with tree conflicts" />
350
+        <option name="mySupportsDeletion" value="false" />
351
+        <option name="myCanBeAbsent" value="false" />
352
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
353
+      </FILE-GROUP>
354
+      <FILE-GROUP>
355
+        <option name="myUpdateName" value="Merged with property conflicts" />
356
+        <option name="myStatusName" value="Will be merged with property conflicts" />
357
+        <option name="mySupportsDeletion" value="false" />
358
+        <option name="myCanBeAbsent" value="false" />
359
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
360
+      </FILE-GROUP>
361
+      <FILE-GROUP>
362
+        <option name="myUpdateName" value="Merged" />
363
+        <option name="myStatusName" value="Will be merged" />
364
+        <option name="mySupportsDeletion" value="false" />
365
+        <option name="myCanBeAbsent" value="false" />
366
+        <option name="myId" value="MERGED" />
367
+      </FILE-GROUP>
368
+      <FILE-GROUP>
369
+        <option name="myUpdateName" value="Not in repository" />
370
+        <option name="myStatusName" value="Not in repository" />
371
+        <option name="mySupportsDeletion" value="true" />
372
+        <option name="myCanBeAbsent" value="false" />
373
+        <option name="myId" value="UNKNOWN" />
374
+      </FILE-GROUP>
375
+      <FILE-GROUP>
376
+        <option name="myUpdateName" value="Locally added" />
377
+        <option name="myStatusName" value="Locally added" />
378
+        <option name="mySupportsDeletion" value="false" />
379
+        <option name="myCanBeAbsent" value="false" />
380
+        <option name="myId" value="LOCALLY_ADDED" />
381
+      </FILE-GROUP>
382
+      <FILE-GROUP>
383
+        <option name="myUpdateName" value="Locally removed" />
384
+        <option name="myStatusName" value="Locally removed" />
385
+        <option name="mySupportsDeletion" value="false" />
386
+        <option name="myCanBeAbsent" value="false" />
387
+        <option name="myId" value="LOCALLY_REMOVED" />
388
+      </FILE-GROUP>
389
+      <FILE-GROUP>
390
+        <option name="myUpdateName" value="Switched" />
391
+        <option name="myStatusName" value="Switched" />
392
+        <option name="mySupportsDeletion" value="false" />
393
+        <option name="myCanBeAbsent" value="false" />
394
+        <option name="myId" value="SWITCHED" />
395
+      </FILE-GROUP>
396
+    </UpdatedFiles>
397
+  </component>
277
   <component name="RunManager" selected="Application.Main">
398
   <component name="RunManager" selected="Application.Main">
278
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
399
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
279
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
400
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
499
       <option name="project" value="LOCAL" />
620
       <option name="project" value="LOCAL" />
500
       <updated>1432749145047</updated>
621
       <updated>1432749145047</updated>
501
     </task>
622
     </task>
502
-    <option name="localTasksCounter" value="11" />
623
+    <task id="LOCAL-00011" summary="java: gestion categorie operationelle">
624
+      <created>1432891735205</created>
625
+      <option name="number" value="00011" />
626
+      <option name="project" value="LOCAL" />
627
+      <updated>1432891735205</updated>
628
+    </task>
629
+    <task id="LOCAL-00012" summary="java: gestion categorie operationelle et ergonomique">
630
+      <created>1432894050823</created>
631
+      <option name="number" value="00012" />
632
+      <option name="project" value="LOCAL" />
633
+      <updated>1432894050823</updated>
634
+    </task>
635
+    <option name="localTasksCounter" value="13" />
503
     <servers />
636
     <servers />
504
   </component>
637
   </component>
505
   <component name="TodoView">
638
   <component name="TodoView">
512
     </todo-panel>
645
     </todo-panel>
513
   </component>
646
   </component>
514
   <component name="ToolWindowManager">
647
   <component name="ToolWindowManager">
515
-    <frame x="0" y="27" width="1366" height="711" extended-state="0" />
516
-    <editor active="false" />
648
+    <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
649
+    <editor active="true" />
517
     <layout>
650
     <layout>
518
       <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" />
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" />
519
       <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="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" />
525
       <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" />
658
       <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" />
526
       <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" />
659
       <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" />
527
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
660
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
528
-      <window_info id="Messages" 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" />
661
+      <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" />
529
       <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" />
662
       <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" />
530
       <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" />
663
       <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" />
531
       <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" />
664
       <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" />
532
       <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" />
665
       <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" />
533
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1674277" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
534
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30633804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
666
+      <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" />
667
+      <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="2" side_tool="false" content_ui="tabs" />
535
       <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" />
668
       <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" />
536
       <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" />
669
       <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" />
537
       <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" />
670
       <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" />
538
       <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" />
671
       <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" />
539
-      <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" />
540
       <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" />
672
       <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" />
673
+      <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" />
541
     </layout>
674
     </layout>
542
   </component>
675
   </component>
543
   <component name="Vcs.Log.UiProperties">
676
   <component name="Vcs.Log.UiProperties">
562
     <MESSAGE value="les boutons ecoutent" />
695
     <MESSAGE value="les boutons ecoutent" />
563
     <MESSAGE value="conexion bdd operationelle et avance classe de base" />
696
     <MESSAGE value="conexion bdd operationelle et avance classe de base" />
564
     <MESSAGE value="selection categorie fonctionelle" />
697
     <MESSAGE value="selection categorie fonctionelle" />
565
-    <option name="LAST_COMMIT_MESSAGE" value="selection categorie fonctionelle" />
698
+    <MESSAGE value="java: gestion categorie operationelle" />
699
+    <MESSAGE value="java: gestion categorie operationelle et ergonomique" />
700
+    <option name="LAST_COMMIT_MESSAGE" value="java: gestion categorie operationelle et ergonomique" />
566
   </component>
701
   </component>
567
   <component name="XDebuggerManager">
702
   <component name="XDebuggerManager">
568
     <breakpoint-manager>
703
     <breakpoint-manager>
581
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
716
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
582
           <folding>
717
           <folding>
583
             <element signature="imports" expanded="true" />
718
             <element signature="imports" expanded="true" />
719
+            <element signature="e#2067#2068#0" expanded="true" />
720
+            <element signature="e#2095#2096#0" expanded="true" />
584
           </folding>
721
           </folding>
585
         </state>
722
         </state>
586
       </provider>
723
       </provider>
603
           <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
740
           <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
604
           <folding>
741
           <folding>
605
             <element signature="imports" expanded="true" />
742
             <element signature="imports" expanded="true" />
606
-            <element signature="e#202#203#0" expanded="true" />
607
-            <element signature="e#223#224#0" expanded="true" />
608
           </folding>
743
           </folding>
609
         </state>
744
         </state>
610
       </provider>
745
       </provider>
894
         </state>
1029
         </state>
895
       </provider>
1030
       </provider>
896
     </entry>
1031
     </entry>
897
-    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
898
-      <provider selected="true" editor-type-id="text-editor">
899
-        <state vertical-scroll-proportion="0.0">
900
-          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
901
-          <folding>
902
-            <element signature="e#80#81#0" expanded="true" />
903
-            <element signature="e#101#102#0" expanded="true" />
904
-            <element signature="e#128#129#0" expanded="true" />
905
-            <element signature="e#145#146#0" expanded="true" />
906
-            <element signature="e#180#181#0" expanded="true" />
907
-            <element signature="e#201#202#0" expanded="true" />
908
-            <element signature="e#230#231#0" expanded="true" />
909
-            <element signature="e#247#248#0" expanded="true" />
910
-          </folding>
911
-        </state>
912
-      </provider>
913
-    </entry>
914
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1032
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
915
       <provider selected="true" editor-type-id="text-editor">
1033
       <provider selected="true" editor-type-id="text-editor">
916
         <state vertical-scroll-proportion="0.6130031">
1034
         <state vertical-scroll-proportion="0.6130031">
933
         </state>
1051
         </state>
934
       </provider>
1052
       </provider>
935
     </entry>
1053
     </entry>
936
-    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
1054
+    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
937
       <provider selected="true" editor-type-id="text-editor">
1055
       <provider selected="true" editor-type-id="text-editor">
938
         <state vertical-scroll-proportion="0.0">
1056
         <state vertical-scroll-proportion="0.0">
939
           <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
1057
           <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
940
           <folding>
1058
           <folding>
941
             <element signature="imports" expanded="true" />
1059
             <element signature="imports" expanded="true" />
942
-            <element signature="e#202#203#0" expanded="true" />
943
-            <element signature="e#223#224#0" expanded="true" />
1060
+            <element signature="e#198#199#0" expanded="true" />
1061
+            <element signature="e#219#220#0" expanded="true" />
1062
+          </folding>
1063
+        </state>
1064
+      </provider>
1065
+    </entry>
1066
+    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
1067
+      <provider selected="true" editor-type-id="text-editor">
1068
+        <state vertical-scroll-proportion="0.24930748">
1069
+          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
1070
+          <folding>
1071
+            <element signature="imports" expanded="true" />
944
           </folding>
1072
           </folding>
945
         </state>
1073
         </state>
946
       </provider>
1074
       </provider>
950
         <state />
1078
         <state />
951
       </provider>
1079
       </provider>
952
     </entry>
1080
     </entry>
953
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
1081
+    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
954
       <provider selected="true" editor-type-id="text-editor">
1082
       <provider selected="true" editor-type-id="text-editor">
955
         <state vertical-scroll-proportion="0.0">
1083
         <state vertical-scroll-proportion="0.0">
956
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
1084
+          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
957
           <folding>
1085
           <folding>
958
-            <element signature="imports" expanded="true" />
959
-            <element signature="e#198#199#0" expanded="true" />
960
-            <element signature="e#219#220#0" expanded="true" />
1086
+            <element signature="e#80#81#0" expanded="true" />
1087
+            <element signature="e#101#102#0" expanded="true" />
961
           </folding>
1088
           </folding>
962
         </state>
1089
         </state>
963
       </provider>
1090
       </provider>
964
     </entry>
1091
     </entry>
965
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1092
+    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
966
       <provider selected="true" editor-type-id="text-editor">
1093
       <provider selected="true" editor-type-id="text-editor">
967
         <state vertical-scroll-proportion="0.0">
1094
         <state vertical-scroll-proportion="0.0">
968
-          <caret line="48" column="53" selection-start-line="48" selection-start-column="53" selection-end-line="48" selection-end-column="53" />
1095
+          <caret line="80" column="18" selection-start-line="80" selection-start-column="18" selection-end-line="80" selection-end-column="18" />
969
           <folding>
1096
           <folding>
970
             <element signature="imports" expanded="true" />
1097
             <element signature="imports" expanded="true" />
1098
+            <element signature="e#2067#2068#0" expanded="true" />
1099
+            <element signature="e#2095#2096#0" expanded="true" />
971
           </folding>
1100
           </folding>
972
         </state>
1101
         </state>
973
       </provider>
1102
       </provider>
974
     </entry>
1103
     </entry>
975
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1104
+    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
976
       <provider selected="true" editor-type-id="text-editor">
1105
       <provider selected="true" editor-type-id="text-editor">
977
         <state vertical-scroll-proportion="0.0">
1106
         <state vertical-scroll-proportion="0.0">
978
-          <caret line="49" column="8" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
1107
+          <caret line="63" column="76" selection-start-line="63" selection-start-column="76" selection-end-line="63" selection-end-column="76" />
979
           <folding>
1108
           <folding>
980
             <element signature="imports" expanded="true" />
1109
             <element signature="imports" expanded="true" />
1110
+            <element signature="e#1239#1240#0" expanded="true" />
1111
+            <element signature="e#1294#1295#0" expanded="true" />
1112
+            <element signature="e#1349#1350#0" expanded="true" />
1113
+            <element signature="e#1404#1405#0" expanded="true" />
981
           </folding>
1114
           </folding>
982
         </state>
1115
         </state>
983
       </provider>
1116
       </provider>
984
     </entry>
1117
     </entry>
985
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
1118
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
986
       <provider selected="true" editor-type-id="text-editor">
1119
       <provider selected="true" editor-type-id="text-editor">
987
-        <state vertical-scroll-proportion="0.03601108">
988
-          <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
1120
+        <state vertical-scroll-proportion="0.22099447">
1121
+          <caret line="340" column="71" selection-start-line="340" selection-start-column="71" selection-end-line="340" selection-end-column="71" />
989
           <folding>
1122
           <folding>
990
             <element signature="imports" expanded="true" />
1123
             <element signature="imports" expanded="true" />
991
           </folding>
1124
           </folding>

BIN
java/out/production/java/ConnexionBDD.class View File


BIN
java/out/production/java/GestionCategories.class View File


BIN
java/out/production/java/InterfacePrincipale$PanCategoriesListener.class View File


BIN
java/out/production/java/InterfacePrincipale$PanQuestionsListener.class View File


BIN
java/out/production/java/InterfacePrincipale$PanReponsesListener.class View File


BIN
java/out/production/java/InterfacePrincipale.class View File


+ 15
- 1
java/src/InterfacePrincipale.java View File

4
 import java.awt.*;
4
 import java.awt.*;
5
 import java.awt.event.ActionEvent;
5
 import java.awt.event.ActionEvent;
6
 import java.awt.event.ActionListener;
6
 import java.awt.event.ActionListener;
7
+import java.lang.reflect.Array;
8
+import java.util.Arrays;
7
 
9
 
8
 import static java.lang.Thread.currentThread;
10
 import static java.lang.Thread.currentThread;
9
 import static java.lang.Thread.sleep;
11
 import static java.lang.Thread.sleep;
335
 				}
337
 				}
336
 
338
 
337
 				bdd.renameCategorie(oldCatName, newCatName);
339
 				bdd.renameCategorie(oldCatName, newCatName);
338
-				listC.setListData(bdd.getListeCategorie().toArray());
340
+
341
+				Object[] tabObject = bdd.getListeCategorie().toArray();
342
+				Categorie[] tabCategorie = Arrays.copyOf(tabObject, tabObject.length, Categorie[].class);
343
+				listC.setListData(tabCategorie);
344
+
345
+				for(int i=0; i<tabCategorie.length; i++)
346
+				{
347
+					if(tabCategorie[i].getNom().equals(newCatName))
348
+					{
349
+						listC.setSelectedValue(tabCategorie[i], true);
350
+						break;
351
+					}
352
+				}
339
 			}
353
 			}
340
 		}
354
 		}
341
 	}
355
 	}