Browse Source

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

Brendan Abolivier 9 years ago
parent
commit
c111369bdb

+ 195
- 23
java/.idea/workspace.xml View File

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/Bouton.class" afterPath="$PROJECT_DIR$/out/production/java/Bouton.class" />
6
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
7
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/burgerquizz.png" afterPath="$PROJECT_DIR$/rsc/burgerquizz.png" />
8
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/del.png" afterPath="$PROJECT_DIR$/rsc/del.png" />
9
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/edit.png" afterPath="$PROJECT_DIR$/rsc/edit.png" />
10
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/plus.png" afterPath="$PROJECT_DIR$/rsc/plus.png" />
11
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
5
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
12
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6
     </list>
13
     </list>
7
     <ignored path="java.iws" />
14
     <ignored path="java.iws" />
41
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
48
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
42
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
49
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
43
           <provider selected="true" editor-type-id="text-editor">
50
           <provider selected="true" editor-type-id="text-editor">
44
-            <state vertical-scroll-proportion="0.76448596">
45
-              <caret line="35" column="40" selection-start-line="35" selection-start-column="40" selection-end-line="35" selection-end-column="40" />
51
+            <state vertical-scroll-proportion="0.74712646">
52
+              <caret line="51" column="10" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="10" />
46
               <folding>
53
               <folding>
47
                 <element signature="imports" expanded="true" />
54
                 <element signature="imports" expanded="true" />
48
               </folding>
55
               </folding>
67
         <entry file="file://$PROJECT_DIR$/src/Bouton.java">
74
         <entry file="file://$PROJECT_DIR$/src/Bouton.java">
68
           <provider selected="true" editor-type-id="text-editor">
75
           <provider selected="true" editor-type-id="text-editor">
69
             <state vertical-scroll-proportion="0.0">
76
             <state vertical-scroll-proportion="0.0">
70
-              <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
77
+              <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
71
               <folding>
78
               <folding>
72
-                <element signature="e#125#126#0" expanded="true" />
79
+                <element signature="imports" expanded="true" />
73
               </folding>
80
               </folding>
74
             </state>
81
             </state>
75
           </provider>
82
           </provider>
85
     </option>
92
     </option>
86
   </component>
93
   </component>
87
   <component name="Git.Settings">
94
   <component name="Git.Settings">
95
+    <option name="UPDATE_TYPE" value="MERGE" />
88
     <option name="PUSH_AUTO_UPDATE" value="true" />
96
     <option name="PUSH_AUTO_UPDATE" value="true" />
89
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
97
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
90
   </component>
98
   </component>
106
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
114
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
107
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
115
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
108
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
116
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
109
-        <option value="$PROJECT_DIR$/src/Bouton.java" />
110
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
117
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
118
+        <option value="$PROJECT_DIR$/src/Bouton.java" />
111
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
119
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
112
       </list>
120
       </list>
113
     </option>
121
     </option>
205
       <sortByType />
213
       <sortByType />
206
     </navigator>
214
     </navigator>
207
     <panes>
215
     <panes>
208
-      <pane id="Scratches" />
216
+      <pane id="Scope" />
209
       <pane id="PackagesPane" />
217
       <pane id="PackagesPane" />
210
       <pane id="ProjectPane">
218
       <pane id="ProjectPane">
211
         <subPane>
219
         <subPane>
241
           </PATH>
249
           </PATH>
242
         </subPane>
250
         </subPane>
243
       </pane>
251
       </pane>
244
-      <pane id="Scope" />
252
+      <pane id="Scratches" />
245
     </panes>
253
     </panes>
246
   </component>
254
   </component>
247
   <component name="PropertiesComponent">
255
   <component name="PropertiesComponent">
252
     <property name="dynamic.classpath" value="false" />
260
     <property name="dynamic.classpath" value="false" />
253
     <property name="restartRequiresConfirmation" value="true" />
261
     <property name="restartRequiresConfirmation" value="true" />
254
   </component>
262
   </component>
263
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
264
+    <UpdatedFiles>
265
+      <FILE-GROUP>
266
+        <option name="myUpdateName" value="Updated from server" />
267
+        <option name="myStatusName" value="Changed on server" />
268
+        <option name="mySupportsDeletion" value="false" />
269
+        <option name="myCanBeAbsent" value="false" />
270
+        <option name="myId" value="CHANGED_ON_SERVER" />
271
+        <FILE-GROUP>
272
+          <option name="myUpdateName" value="Updated" />
273
+          <option name="myStatusName" value="Changed" />
274
+          <option name="mySupportsDeletion" value="false" />
275
+          <option name="myCanBeAbsent" value="false" />
276
+          <option name="myId" value="UPDATED" />
277
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../sql/CTITbq.sql</PATH>
278
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../sql/ITbq.sql</PATH>
279
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.connector.php</PATH>
280
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.questset.php</PATH>
281
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/classes.php</PATH>
282
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/test.php</PATH>
283
+        </FILE-GROUP>
284
+        <FILE-GROUP>
285
+          <option name="myUpdateName" value="Created" />
286
+          <option name="myStatusName" value="Created" />
287
+          <option name="mySupportsDeletion" value="false" />
288
+          <option name="myCanBeAbsent" value="false" />
289
+          <option name="myId" value="CREATED" />
290
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.categorie.php</PATH>
291
+        </FILE-GROUP>
292
+        <FILE-GROUP>
293
+          <option name="myUpdateName" value="Deleted" />
294
+          <option name="myStatusName" value="Deleted" />
295
+          <option name="mySupportsDeletion" value="false" />
296
+          <option name="myCanBeAbsent" value="true" />
297
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
298
+        </FILE-GROUP>
299
+        <FILE-GROUP>
300
+          <option name="myUpdateName" value="Restored" />
301
+          <option name="myStatusName" value="Will be restored" />
302
+          <option name="mySupportsDeletion" value="false" />
303
+          <option name="myCanBeAbsent" value="false" />
304
+          <option name="myId" value="RESTORED" />
305
+        </FILE-GROUP>
306
+      </FILE-GROUP>
307
+      <FILE-GROUP>
308
+        <option name="myUpdateName" value="Modified" />
309
+        <option name="myStatusName" value="Modified" />
310
+        <option name="mySupportsDeletion" value="false" />
311
+        <option name="myCanBeAbsent" value="false" />
312
+        <option name="myId" value="MODIFIED" />
313
+      </FILE-GROUP>
314
+      <FILE-GROUP>
315
+        <option name="myUpdateName" value="Skipped" />
316
+        <option name="myStatusName" value="Skipped" />
317
+        <option name="mySupportsDeletion" value="false" />
318
+        <option name="myCanBeAbsent" value="false" />
319
+        <option name="myId" value="SKIPPED" />
320
+      </FILE-GROUP>
321
+      <FILE-GROUP>
322
+        <option name="myUpdateName" value="Merged with conflicts" />
323
+        <option name="myStatusName" value="Will be merged with conflicts" />
324
+        <option name="mySupportsDeletion" value="false" />
325
+        <option name="myCanBeAbsent" value="false" />
326
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
327
+      </FILE-GROUP>
328
+      <FILE-GROUP>
329
+        <option name="myUpdateName" value="Merged with tree conflicts" />
330
+        <option name="myStatusName" value="Merged with tree conflicts" />
331
+        <option name="mySupportsDeletion" value="false" />
332
+        <option name="myCanBeAbsent" value="false" />
333
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
334
+      </FILE-GROUP>
335
+      <FILE-GROUP>
336
+        <option name="myUpdateName" value="Merged with property conflicts" />
337
+        <option name="myStatusName" value="Will be merged with property conflicts" />
338
+        <option name="mySupportsDeletion" value="false" />
339
+        <option name="myCanBeAbsent" value="false" />
340
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
341
+      </FILE-GROUP>
342
+      <FILE-GROUP>
343
+        <option name="myUpdateName" value="Merged" />
344
+        <option name="myStatusName" value="Will be merged" />
345
+        <option name="mySupportsDeletion" value="false" />
346
+        <option name="myCanBeAbsent" value="false" />
347
+        <option name="myId" value="MERGED" />
348
+      </FILE-GROUP>
349
+      <FILE-GROUP>
350
+        <option name="myUpdateName" value="Not in repository" />
351
+        <option name="myStatusName" value="Not in repository" />
352
+        <option name="mySupportsDeletion" value="true" />
353
+        <option name="myCanBeAbsent" value="false" />
354
+        <option name="myId" value="UNKNOWN" />
355
+      </FILE-GROUP>
356
+      <FILE-GROUP>
357
+        <option name="myUpdateName" value="Locally added" />
358
+        <option name="myStatusName" value="Locally added" />
359
+        <option name="mySupportsDeletion" value="false" />
360
+        <option name="myCanBeAbsent" value="false" />
361
+        <option name="myId" value="LOCALLY_ADDED" />
362
+      </FILE-GROUP>
363
+      <FILE-GROUP>
364
+        <option name="myUpdateName" value="Locally removed" />
365
+        <option name="myStatusName" value="Locally removed" />
366
+        <option name="mySupportsDeletion" value="false" />
367
+        <option name="myCanBeAbsent" value="false" />
368
+        <option name="myId" value="LOCALLY_REMOVED" />
369
+      </FILE-GROUP>
370
+      <FILE-GROUP>
371
+        <option name="myUpdateName" value="Switched" />
372
+        <option name="myStatusName" value="Switched" />
373
+        <option name="mySupportsDeletion" value="false" />
374
+        <option name="myCanBeAbsent" value="false" />
375
+        <option name="myId" value="SWITCHED" />
376
+      </FILE-GROUP>
377
+    </UpdatedFiles>
378
+  </component>
255
   <component name="RunManager" selected="Application.Main">
379
   <component name="RunManager" selected="Application.Main">
256
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
380
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
257
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
381
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
434
       <option name="project" value="LOCAL" />
558
       <option name="project" value="LOCAL" />
435
       <updated>1432628811750</updated>
559
       <updated>1432628811750</updated>
436
     </task>
560
     </task>
437
-    <option name="localTasksCounter" value="4" />
561
+    <task id="LOCAL-00004" summary="evolution (pikachu evolue en raichu)">
562
+      <created>1432635393109</created>
563
+      <option name="number" value="00004" />
564
+      <option name="project" value="LOCAL" />
565
+      <updated>1432635393109</updated>
566
+    </task>
567
+    <option name="localTasksCounter" value="5" />
438
     <servers />
568
     <servers />
439
   </component>
569
   </component>
440
   <component name="ToolWindowManager">
570
   <component name="ToolWindowManager">
441
     <frame x="0" y="27" width="1366" height="711" extended-state="0" />
571
     <frame x="0" y="27" width="1366" height="711" extended-state="0" />
442
-    <editor active="true" />
572
+    <editor active="false" />
443
     <layout>
573
     <layout>
444
       <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" />
574
       <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" />
445
       <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" />
575
       <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" />
447
       <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" />
577
       <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" />
448
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
578
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
449
       <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" />
579
       <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" />
450
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
580
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
451
       <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" />
581
       <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" />
452
       <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" />
582
       <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" />
453
-      <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" />
583
+      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32922536" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
454
       <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" />
584
       <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" />
455
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
585
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
456
       <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" />
586
       <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" />
457
       <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" />
587
       <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" />
458
       <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" />
588
       <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" />
459
       <window_info id="Project" active="false" 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" />
589
       <window_info id="Project" active="false" 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" />
460
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
590
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37323943" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
461
       <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" />
591
       <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" />
462
       <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" />
592
       <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" />
463
       <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" />
593
       <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" />
464
       <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" />
594
       <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" />
465
-      <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" />
466
       <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" />
595
       <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" />
596
+      <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" />
467
     </layout>
597
     </layout>
468
   </component>
598
   </component>
469
   <component name="Vcs.Log.UiProperties">
599
   <component name="Vcs.Log.UiProperties">
481
     <MESSAGE value="test" />
611
     <MESSAGE value="test" />
482
     <MESSAGE value="creation classe de base" />
612
     <MESSAGE value="creation classe de base" />
483
     <MESSAGE value="evolution" />
613
     <MESSAGE value="evolution" />
484
-    <option name="LAST_COMMIT_MESSAGE" value="evolution" />
614
+    <MESSAGE value="evolution (pikachu evolue en raichu)" />
615
+    <option name="LAST_COMMIT_MESSAGE" value="evolution (pikachu evolue en raichu)" />
485
   </component>
616
   </component>
486
   <component name="XDebuggerManager">
617
   <component name="XDebuggerManager">
487
     <breakpoint-manager />
618
     <breakpoint-manager />
502
         <state />
633
         <state />
503
       </provider>
634
       </provider>
504
     </entry>
635
     </entry>
636
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
637
+      <provider selected="true" editor-type-id="text-editor">
638
+        <state vertical-scroll-proportion="0.0">
639
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
640
+          <folding>
641
+            <element signature="imports" expanded="true" />
642
+          </folding>
643
+        </state>
644
+      </provider>
645
+    </entry>
646
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
647
+      <provider selected="true" editor-type-id="text-editor">
648
+        <state vertical-scroll-proportion="0.0">
649
+          <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
650
+          <folding>
651
+            <element signature="e#80#81#0" expanded="true" />
652
+            <element signature="e#147#148#0" expanded="true" />
653
+          </folding>
654
+        </state>
655
+      </provider>
656
+    </entry>
657
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
658
+      <provider selected="true" editor-type-id="text-editor">
659
+        <state vertical-scroll-proportion="0.0">
660
+          <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
661
+          <folding>
662
+            <element signature="imports" expanded="true" />
663
+          </folding>
664
+        </state>
665
+      </provider>
666
+    </entry>
667
+    <entry file="file://$PROJECT_DIR$/mcd.png">
668
+      <provider selected="true" editor-type-id="images">
669
+        <state />
670
+      </provider>
671
+    </entry>
672
+    <entry file="file://$PROJECT_DIR$/java.png">
673
+      <provider selected="true" editor-type-id="images">
674
+        <state />
675
+      </provider>
676
+    </entry>
505
     <entry file="file://$PROJECT_DIR$/src/Categorie.java">
677
     <entry file="file://$PROJECT_DIR$/src/Categorie.java">
506
       <provider selected="true" editor-type-id="text-editor">
678
       <provider selected="true" editor-type-id="text-editor">
507
         <state vertical-scroll-proportion="0.0">
679
         <state vertical-scroll-proportion="0.0">
629
         <state />
801
         <state />
630
       </provider>
802
       </provider>
631
     </entry>
803
     </entry>
632
-    <entry file="file://$PROJECT_DIR$/java.png">
633
-      <provider selected="true" editor-type-id="images">
634
-        <state />
635
-      </provider>
636
-    </entry>
637
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
804
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
638
       <provider selected="true" editor-type-id="text-editor">
805
       <provider selected="true" editor-type-id="text-editor">
639
         <state vertical-scroll-proportion="0.0">
806
         <state vertical-scroll-proportion="0.0">
645
         </state>
812
         </state>
646
       </provider>
813
       </provider>
647
     </entry>
814
     </entry>
815
+    <entry file="file://$PROJECT_DIR$/java.png">
816
+      <provider selected="true" editor-type-id="images">
817
+        <state />
818
+      </provider>
819
+    </entry>
648
     <entry file="file://$PROJECT_DIR$/src/Bouton.java">
820
     <entry file="file://$PROJECT_DIR$/src/Bouton.java">
649
       <provider selected="true" editor-type-id="text-editor">
821
       <provider selected="true" editor-type-id="text-editor">
650
         <state vertical-scroll-proportion="0.0">
822
         <state vertical-scroll-proportion="0.0">
651
-          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
823
+          <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
652
           <folding>
824
           <folding>
653
-            <element signature="e#125#126#0" expanded="true" />
825
+            <element signature="imports" expanded="true" />
654
           </folding>
826
           </folding>
655
         </state>
827
         </state>
656
       </provider>
828
       </provider>
657
     </entry>
829
     </entry>
658
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
830
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
659
       <provider selected="true" editor-type-id="text-editor">
831
       <provider selected="true" editor-type-id="text-editor">
660
-        <state vertical-scroll-proportion="0.76448596">
661
-          <caret line="35" column="40" selection-start-line="35" selection-start-column="40" selection-end-line="35" selection-end-column="40" />
832
+        <state vertical-scroll-proportion="0.74712646">
833
+          <caret line="51" column="10" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="10" />
662
           <folding>
834
           <folding>
663
             <element signature="imports" expanded="true" />
835
             <element signature="imports" expanded="true" />
664
           </folding>
836
           </folding>

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


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


BIN
java/rsc/burgerquizz.png View File


BIN
java/rsc/del.png View File


BIN
java/rsc/edit.png View File


BIN
java/rsc/plus.png View File


+ 35
- 2
java/src/InterfacePrincipale.java View File

1
 import javax.swing.*;
1
 import javax.swing.*;
2
 import java.awt.*;
2
 import java.awt.*;
3
 
3
 
4
+import static java.lang.Thread.sleep;
4
 import static javax.swing.BoxLayout.*;
5
 import static javax.swing.BoxLayout.*;
5
 
6
 
6
 public class InterfacePrincipale extends JFrame
7
 public class InterfacePrincipale extends JFrame
37
 	{
38
 	{
38
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
39
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
39
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
40
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
41
+		setLayout(new BorderLayout(10,10));
40
 
42
 
41
 		loadImgBouton();
43
 		loadImgBouton();
42
 		createPanelCategories();
44
 		createPanelCategories();
47
 		pack();
49
 		pack();
48
 		setLocationRelativeTo(null);
50
 		setLocationRelativeTo(null);
49
 		setVisible(true);
51
 		setVisible(true);
52
+		//modem56k();
53
+	}
54
+
55
+	private void modem56k()
56
+	{
57
+		int i =0;
58
+		while(i != 500)
59
+		{
60
+			this.setSize(1000, i);
61
+			try
62
+			{
63
+				sleep(100);
64
+			}
65
+			catch(InterruptedException e)
66
+			{}
67
+			i++;
68
+		}
50
 	}
69
 	}
51
 
70
 
52
 	private void loadImgBouton()
71
 	private void loadImgBouton()
71
 
90
 
72
 
91
 
73
 		panCategories.setLayout(new BoxLayout(panCategories,Y_AXIS));
92
 		panCategories.setLayout(new BoxLayout(panCategories,Y_AXIS));
93
+		panCategories.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
74
 		addC.setAlignmentX(CENTER_ALIGNMENT);
94
 		addC.setAlignmentX(CENTER_ALIGNMENT);
75
 		delC.setAlignmentX(CENTER_ALIGNMENT);
95
 		delC.setAlignmentX(CENTER_ALIGNMENT);
76
 		editC.setAlignmentX(CENTER_ALIGNMENT);
96
 		editC.setAlignmentX(CENTER_ALIGNMENT);
97
+		addC.setMaximumSize(new Dimension(208,34));
98
+		delC.setMaximumSize(new Dimension(208,34));
99
+		editC.setMaximumSize(new Dimension(208,34));
77
 
100
 
78
 		panCategories.add(addC);
101
 		panCategories.add(addC);
79
 		panCategories.add(delC);
102
 		panCategories.add(delC);
80
 		panCategories.add(sp);
103
 		panCategories.add(sp);
81
 		panCategories.add(editC);
104
 		panCategories.add(editC);
105
+
82
 		getContentPane().add(panCategories, BorderLayout.WEST);
106
 		getContentPane().add(panCategories, BorderLayout.WEST);
83
 	}
107
 	}
84
 
108
 
98
 
122
 
99
 
123
 
100
 		panReponses.setLayout(new BoxLayout(panReponses,Y_AXIS));
124
 		panReponses.setLayout(new BoxLayout(panReponses,Y_AXIS));
125
+		panReponses.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
101
 		addR.setAlignmentX(CENTER_ALIGNMENT);
126
 		addR.setAlignmentX(CENTER_ALIGNMENT);
102
 		delR.setAlignmentX(CENTER_ALIGNMENT);
127
 		delR.setAlignmentX(CENTER_ALIGNMENT);
103
 		editR.setAlignmentX(CENTER_ALIGNMENT);
128
 		editR.setAlignmentX(CENTER_ALIGNMENT);
129
+		addR.setMaximumSize(new Dimension(300,34));
130
+		delR.setMaximumSize(new Dimension(300,34));
131
+		editR.setMaximumSize(new Dimension(300,34));
104
 
132
 
105
 		panReponses.add(addR);
133
 		panReponses.add(addR);
106
 		panReponses.add(delR);
134
 		panReponses.add(delR);
107
 		panReponses.add(sp);
135
 		panReponses.add(sp);
108
-		panReponses.add(editR);
109
 		panReponses.add(comboRepCat);
136
 		panReponses.add(comboRepCat);
137
+		panReponses.add(editR);
138
+
110
 		getContentPane().add(panReponses, BorderLayout.CENTER);
139
 		getContentPane().add(panReponses, BorderLayout.CENTER);
111
 	}
140
 	}
112
 
141
 
126
 
155
 
127
 
156
 
128
 		panQuestions.setLayout(new BoxLayout(panQuestions,Y_AXIS));
157
 		panQuestions.setLayout(new BoxLayout(panQuestions,Y_AXIS));
158
+		panQuestions.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
129
 		addQ.setAlignmentX(CENTER_ALIGNMENT);
159
 		addQ.setAlignmentX(CENTER_ALIGNMENT);
130
 		delQ.setAlignmentX(CENTER_ALIGNMENT);
160
 		delQ.setAlignmentX(CENTER_ALIGNMENT);
131
 		editQ.setAlignmentX(CENTER_ALIGNMENT);
161
 		editQ.setAlignmentX(CENTER_ALIGNMENT);
162
+		addQ.setMaximumSize(new Dimension(208,34));
163
+		delQ.setMaximumSize(new Dimension(208,34));
164
+		editQ.setMaximumSize(new Dimension(208,34));
132
 
165
 
133
 		panQuestions.add(addQ);
166
 		panQuestions.add(addQ);
134
 		panQuestions.add(delQ);
167
 		panQuestions.add(delQ);
135
 		panQuestions.add(sp);
168
 		panQuestions.add(sp);
136
-		panQuestions.add(editQ);
137
 		panQuestions.add(comboQueRep);
169
 		panQuestions.add(comboQueRep);
170
+		panQuestions.add(editQ);
138
 		getContentPane().add(panQuestions, BorderLayout.EAST);
171
 		getContentPane().add(panQuestions, BorderLayout.EAST);
139
 	}
172
 	}
140
 }
173
 }