Browse Source

ajout readme

PCYoshi 9 years ago
parent
commit
96935ba49f
4 changed files with 164 additions and 115 deletions
  1. 159
    107
      java/.idea/workspace.xml
  2. BIN
      java/java.jar
  3. 0
    3
      java/lisezmoi.txt
  4. 5
    5
      java/src/GestionBddDAO/ConfigBDD.java

+ 159
- 107
java/.idea/workspace.xml View File

6
     </artifacts-to-build>
6
     </artifacts-to-build>
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="avancées javadoc6">
10
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/BDDException.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/BDDException.html" />
11
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/Bouton.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/Bouton.html" />
12
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Categorie.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Categorie.html" />
13
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConfigBDD.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConfigBDD.html" />
14
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConnexionBDD.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConnexionBDD.html" />
15
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.html" />
16
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionCategories.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionCategories.html" />
17
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionQuestions.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionQuestions.html" />
18
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionReponses.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionReponses.html" />
19
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanCategoriesListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanCategoriesListener.html" />
20
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanQuestionsListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanQuestionsListener.html" />
21
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanReponsesListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanReponsesListener.html" />
22
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.html" />
23
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/MainAdminBddBurgerQuizz.html" afterPath="$PROJECT_DIR$/javadoc/MainAdminBddBurgerQuizz.html" />
24
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.html" />
25
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.html" />
26
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Question.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Question.html" />
27
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Reponses.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Reponses.html" />
28
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/SplashScreen.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/SplashScreen.html" />
29
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/allclasses-frame.html" afterPath="$PROJECT_DIR$/javadoc/allclasses-frame.html" />
30
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/allclasses-noframe.html" afterPath="$PROJECT_DIR$/javadoc/allclasses-noframe.html" />
31
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/constant-values.html" afterPath="$PROJECT_DIR$/javadoc/constant-values.html" />
32
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/deprecated-list.html" afterPath="$PROJECT_DIR$/javadoc/deprecated-list.html" />
33
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/help-doc.html" afterPath="$PROJECT_DIR$/javadoc/help-doc.html" />
34
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-1.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-1.html" />
35
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-10.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-10.html" />
36
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-11.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-11.html" />
37
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-12.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-12.html" />
38
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-13.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-13.html" />
39
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-14.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-14.html" />
40
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-15.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-15.html" />
41
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-16.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-16.html" />
42
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-17.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-17.html" />
43
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-18.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-18.html" />
44
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-2.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-2.html" />
45
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-3.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-3.html" />
46
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-4.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-4.html" />
47
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-5.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-5.html" />
48
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-6.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-6.html" />
49
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-7.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-7.html" />
50
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-8.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-8.html" />
51
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-9.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-9.html" />
52
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index.html" afterPath="$PROJECT_DIR$/javadoc/index.html" />
53
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lisezmoi.txt" afterPath="$PROJECT_DIR$/lisezmoi.txt" />
54
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-frame.html" afterPath="$PROJECT_DIR$/javadoc/overview-frame.html" />
55
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-summary.html" afterPath="$PROJECT_DIR$/javadoc/overview-summary.html" />
56
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-tree.html" afterPath="$PROJECT_DIR$/javadoc/overview-tree.html" />
57
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/package-frame.html" />
58
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-frame.html" />
59
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-frame.html" />
60
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-frame.html" />
61
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-frame.html" />
62
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-frame.html" />
63
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/package-summary.html" />
64
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-summary.html" />
65
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-summary.html" />
66
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-summary.html" />
67
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-summary.html" />
68
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-summary.html" />
69
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/package-tree.html" />
70
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-tree.html" />
71
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-tree.html" />
72
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-tree.html" />
73
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-tree.html" />
74
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-tree.html" />
75
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/serialized-form.html" afterPath="$PROJECT_DIR$/javadoc/serialized-form.html" />
9
+    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10
+      <change type="DELETED" beforePath="$PROJECT_DIR$/java.jar" afterPath="" />
11
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lisezmoi.txt" afterPath="" />
12
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
76
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
13
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
77
     </list>
14
     </list>
78
     <ignored path="java.iws" />
15
     <ignored path="java.iws" />
95
   </component>
32
   </component>
96
   <component name="FileEditorManager">
33
   <component name="FileEditorManager">
97
     <leaf>
34
     <leaf>
98
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
35
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
99
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
36
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
100
           <provider selected="true" editor-type-id="text-editor">
37
           <provider selected="true" editor-type-id="text-editor">
101
-            <state vertical-scroll-proportion="-0.44475138">
38
+            <state vertical-scroll-proportion="0.0">
102
               <caret line="778" column="36" selection-start-line="778" selection-start-column="36" selection-end-line="778" selection-end-column="36" />
39
               <caret line="778" column="36" selection-start-line="778" selection-start-column="36" selection-end-line="778" selection-end-column="36" />
103
               <folding>
40
               <folding>
104
                 <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
41
                 <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
128
           </provider>
65
           </provider>
129
         </entry>
66
         </entry>
130
       </file>
67
       </file>
68
+      <file leaf-file-name="ConfigBDD.java" pinned="false" current-in-tab="true">
69
+        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
70
+          <provider selected="true" editor-type-id="text-editor">
71
+            <state vertical-scroll-proportion="0.26934096">
72
+              <caret line="114" column="7" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
73
+              <folding />
74
+            </state>
75
+          </provider>
76
+        </entry>
77
+      </file>
131
     </leaf>
78
     </leaf>
132
   </component>
79
   </component>
133
   <component name="FileTemplateManagerImpl">
80
   <component name="FileTemplateManagerImpl">
166
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
113
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
167
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
114
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
168
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
115
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
169
-        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
170
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
116
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
171
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
117
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
172
         <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
118
         <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
187
         <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
133
         <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
188
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
134
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
189
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
135
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
136
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
190
       </list>
137
       </list>
191
     </option>
138
     </option>
192
   </component>
139
   </component>
463
       <recent name="" />
410
       <recent name="" />
464
     </key>
411
     </key>
465
   </component>
412
   </component>
413
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
414
+    <UpdatedFiles>
415
+      <FILE-GROUP>
416
+        <option name="myUpdateName" value="Updated from server" />
417
+        <option name="myStatusName" value="Changed on server" />
418
+        <option name="mySupportsDeletion" value="false" />
419
+        <option name="myCanBeAbsent" value="false" />
420
+        <option name="myId" value="CHANGED_ON_SERVER" />
421
+        <FILE-GROUP>
422
+          <option name="myUpdateName" value="Updated" />
423
+          <option name="myStatusName" value="Changed" />
424
+          <option name="mySupportsDeletion" value="false" />
425
+          <option name="myCanBeAbsent" value="false" />
426
+          <option name="myId" value="UPDATED" />
427
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/css/game.css</PATH>
428
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/css/main.css</PATH>
429
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/game.js</PATH>
430
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/multi.js</PATH>
431
+        </FILE-GROUP>
432
+        <FILE-GROUP>
433
+          <option name="myUpdateName" value="Created" />
434
+          <option name="myStatusName" value="Created" />
435
+          <option name="mySupportsDeletion" value="false" />
436
+          <option name="myCanBeAbsent" value="false" />
437
+          <option name="myId" value="CREATED" />
438
+        </FILE-GROUP>
439
+        <FILE-GROUP>
440
+          <option name="myUpdateName" value="Deleted" />
441
+          <option name="myStatusName" value="Deleted" />
442
+          <option name="mySupportsDeletion" value="false" />
443
+          <option name="myCanBeAbsent" value="true" />
444
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
445
+        </FILE-GROUP>
446
+        <FILE-GROUP>
447
+          <option name="myUpdateName" value="Restored" />
448
+          <option name="myStatusName" value="Will be restored" />
449
+          <option name="mySupportsDeletion" value="false" />
450
+          <option name="myCanBeAbsent" value="false" />
451
+          <option name="myId" value="RESTORED" />
452
+        </FILE-GROUP>
453
+      </FILE-GROUP>
454
+      <FILE-GROUP>
455
+        <option name="myUpdateName" value="Modified" />
456
+        <option name="myStatusName" value="Modified" />
457
+        <option name="mySupportsDeletion" value="false" />
458
+        <option name="myCanBeAbsent" value="false" />
459
+        <option name="myId" value="MODIFIED" />
460
+      </FILE-GROUP>
461
+      <FILE-GROUP>
462
+        <option name="myUpdateName" value="Skipped" />
463
+        <option name="myStatusName" value="Skipped" />
464
+        <option name="mySupportsDeletion" value="false" />
465
+        <option name="myCanBeAbsent" value="false" />
466
+        <option name="myId" value="SKIPPED" />
467
+      </FILE-GROUP>
468
+      <FILE-GROUP>
469
+        <option name="myUpdateName" value="Merged with conflicts" />
470
+        <option name="myStatusName" value="Will be merged with conflicts" />
471
+        <option name="mySupportsDeletion" value="false" />
472
+        <option name="myCanBeAbsent" value="false" />
473
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
474
+      </FILE-GROUP>
475
+      <FILE-GROUP>
476
+        <option name="myUpdateName" value="Merged with tree conflicts" />
477
+        <option name="myStatusName" value="Merged with tree conflicts" />
478
+        <option name="mySupportsDeletion" value="false" />
479
+        <option name="myCanBeAbsent" value="false" />
480
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
481
+      </FILE-GROUP>
482
+      <FILE-GROUP>
483
+        <option name="myUpdateName" value="Merged with property conflicts" />
484
+        <option name="myStatusName" value="Will be merged with property conflicts" />
485
+        <option name="mySupportsDeletion" value="false" />
486
+        <option name="myCanBeAbsent" value="false" />
487
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
488
+      </FILE-GROUP>
489
+      <FILE-GROUP>
490
+        <option name="myUpdateName" value="Merged" />
491
+        <option name="myStatusName" value="Will be merged" />
492
+        <option name="mySupportsDeletion" value="false" />
493
+        <option name="myCanBeAbsent" value="false" />
494
+        <option name="myId" value="MERGED" />
495
+      </FILE-GROUP>
496
+      <FILE-GROUP>
497
+        <option name="myUpdateName" value="Not in repository" />
498
+        <option name="myStatusName" value="Not in repository" />
499
+        <option name="mySupportsDeletion" value="true" />
500
+        <option name="myCanBeAbsent" value="false" />
501
+        <option name="myId" value="UNKNOWN" />
502
+      </FILE-GROUP>
503
+      <FILE-GROUP>
504
+        <option name="myUpdateName" value="Locally added" />
505
+        <option name="myStatusName" value="Locally added" />
506
+        <option name="mySupportsDeletion" value="false" />
507
+        <option name="myCanBeAbsent" value="false" />
508
+        <option name="myId" value="LOCALLY_ADDED" />
509
+      </FILE-GROUP>
510
+      <FILE-GROUP>
511
+        <option name="myUpdateName" value="Locally removed" />
512
+        <option name="myStatusName" value="Locally removed" />
513
+        <option name="mySupportsDeletion" value="false" />
514
+        <option name="myCanBeAbsent" value="false" />
515
+        <option name="myId" value="LOCALLY_REMOVED" />
516
+      </FILE-GROUP>
517
+      <FILE-GROUP>
518
+        <option name="myUpdateName" value="Switched" />
519
+        <option name="myStatusName" value="Switched" />
520
+        <option name="mySupportsDeletion" value="false" />
521
+        <option name="myCanBeAbsent" value="false" />
522
+        <option name="myId" value="SWITCHED" />
523
+      </FILE-GROUP>
524
+    </UpdatedFiles>
525
+  </component>
466
   <component name="RunManager" selected="Application.Main">
526
   <component name="RunManager" selected="Application.Main">
467
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
527
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
468
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
528
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
826
       <option name="project" value="LOCAL" />
886
       <option name="project" value="LOCAL" />
827
       <updated>1433976167488</updated>
887
       <updated>1433976167488</updated>
828
     </task>
888
     </task>
829
-    <option name="localTasksCounter" value="34" />
889
+    <task id="LOCAL-00034" summary="avancées javadoc7">
890
+      <created>1434007023637</created>
891
+      <option name="number" value="00034" />
892
+      <option name="project" value="LOCAL" />
893
+      <updated>1434007023637</updated>
894
+    </task>
895
+    <option name="localTasksCounter" value="35" />
830
     <servers />
896
     <servers />
831
   </component>
897
   </component>
832
   <component name="TodoView">
898
   <component name="TodoView">
840
   </component>
906
   </component>
841
   <component name="ToolWindowManager">
907
   <component name="ToolWindowManager">
842
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
908
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
843
-    <editor active="true" />
909
+    <editor active="false" />
844
     <layout>
910
     <layout>
845
       <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" />
911
       <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" />
846
       <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" />
912
       <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" />
852
       <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" />
918
       <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" />
853
       <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" />
919
       <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" />
854
       <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" />
920
       <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" />
855
-      <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" />
921
+      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32864675" sideWeight="0.49695587" order="10" side_tool="false" content_ui="tabs" />
856
       <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" />
922
       <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" />
857
       <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" />
923
       <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" />
858
       <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" />
924
       <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" />
859
       <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" />
925
       <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" />
860
       <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" />
926
       <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" />
861
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2636778" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
927
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2636778" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
862
-      <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" />
928
+      <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" />
863
       <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" />
929
       <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" />
864
       <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" />
930
       <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" />
865
       <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" />
931
       <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" />
879
     <option name="myLimit" value="2678400000" />
945
     <option name="myLimit" value="2678400000" />
880
   </component>
946
   </component>
881
   <component name="VcsManagerConfiguration">
947
   <component name="VcsManagerConfiguration">
882
-    <MESSAGE value="evolution (pikachu evolue en raichu)" />
883
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
948
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
884
     <MESSAGE value="fin de journé" />
949
     <MESSAGE value="fin de journé" />
885
     <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
950
     <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
904
     <MESSAGE value="avancées javadoc4" />
969
     <MESSAGE value="avancées javadoc4" />
905
     <MESSAGE value="avancées javadoc5" />
970
     <MESSAGE value="avancées javadoc5" />
906
     <MESSAGE value="avancées javadoc6" />
971
     <MESSAGE value="avancées javadoc6" />
907
-    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc6" />
972
+    <MESSAGE value="avancées javadoc7" />
973
+    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc7" />
908
   </component>
974
   </component>
909
   <component name="XDebuggerManager">
975
   <component name="XDebuggerManager">
910
     <breakpoint-manager>
976
     <breakpoint-manager>
980
         </state>
1046
         </state>
981
       </provider>
1047
       </provider>
982
     </entry>
1048
     </entry>
983
-    <entry file="file://$PROJECT_DIR$/lisezmoi.txt">
984
-      <provider selected="true" editor-type-id="text-editor">
985
-        <state vertical-scroll-proportion="0.0">
986
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
987
-        </state>
988
-      </provider>
989
-    </entry>
990
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1049
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
991
       <provider selected="true" editor-type-id="text-editor">
1050
       <provider selected="true" editor-type-id="text-editor">
992
         <state vertical-scroll-proportion="0.0">
1051
         <state vertical-scroll-proportion="0.0">
1099
         <state />
1158
         <state />
1100
       </provider>
1159
       </provider>
1101
     </entry>
1160
     </entry>
1102
-    <entry file="file://$PROJECT_DIR$/lisezmoi.txt">
1103
-      <provider selected="true" editor-type-id="text-editor">
1104
-        <state vertical-scroll-proportion="0.0">
1105
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1106
-        </state>
1107
-      </provider>
1108
-    </entry>
1109
     <entry file="file://$PROJECT_DIR$/src/META-INF/MANIFEST.MF">
1161
     <entry file="file://$PROJECT_DIR$/src/META-INF/MANIFEST.MF">
1110
       <provider selected="true" editor-type-id="text-editor">
1162
       <provider selected="true" editor-type-id="text-editor">
1111
         <state vertical-scroll-proportion="0.0">
1163
         <state vertical-scroll-proportion="0.0">
1141
         </state>
1193
         </state>
1142
       </provider>
1194
       </provider>
1143
     </entry>
1195
     </entry>
1144
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1145
-      <provider selected="true" editor-type-id="text-editor">
1146
-        <state vertical-scroll-proportion="0.031716418">
1147
-          <caret line="26" column="15" selection-start-line="26" selection-start-column="15" selection-end-line="26" selection-end-column="15" />
1148
-          <folding />
1149
-        </state>
1150
-      </provider>
1151
-    </entry>
1152
     <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1196
     <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1153
       <provider selected="true" editor-type-id="text-editor">
1197
       <provider selected="true" editor-type-id="text-editor">
1154
         <state vertical-scroll-proportion="7.9364643">
1198
         <state vertical-scroll-proportion="7.9364643">
1261
         <state vertical-scroll-proportion="0.1436464">
1305
         <state vertical-scroll-proportion="0.1436464">
1262
           <caret line="78" column="31" selection-start-line="78" selection-start-column="31" selection-end-line="78" selection-end-column="31" />
1306
           <caret line="78" column="31" selection-start-line="78" selection-start-column="31" selection-end-line="78" selection-end-column="31" />
1263
           <folding>
1307
           <folding>
1264
-            <element signature="e#989#990#0" expanded="true" />
1265
-            <element signature="e#1020#1021#0" expanded="true" />
1266
-            <element signature="e#1223#1224#0" expanded="true" />
1267
-            <element signature="e#1254#1255#0" expanded="true" />
1268
-            <element signature="e#1460#1461#0" expanded="true" />
1269
-            <element signature="e#1491#1492#0" expanded="true" />
1270
-            <element signature="e#1729#1730#0" expanded="true" />
1271
-            <element signature="e#1758#1759#0" expanded="true" />
1308
+            <element signature="e#989#990#0" expanded="false" />
1309
+            <element signature="e#1020#1021#0" expanded="false" />
1310
+            <element signature="e#1223#1224#0" expanded="false" />
1311
+            <element signature="e#1254#1255#0" expanded="false" />
1312
+            <element signature="e#1460#1461#0" expanded="false" />
1313
+            <element signature="e#1491#1492#0" expanded="false" />
1314
+            <element signature="e#1729#1730#0" expanded="false" />
1315
+            <element signature="e#1758#1759#0" expanded="false" />
1272
           </folding>
1316
           </folding>
1273
         </state>
1317
         </state>
1274
       </provider>
1318
       </provider>
1299
     </entry>
1343
     </entry>
1300
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1344
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1301
       <provider selected="true" editor-type-id="text-editor">
1345
       <provider selected="true" editor-type-id="text-editor">
1302
-        <state vertical-scroll-proportion="-0.44475138">
1346
+        <state vertical-scroll-proportion="0.0">
1303
           <caret line="778" column="36" selection-start-line="778" selection-start-column="36" selection-end-line="778" selection-end-column="36" />
1347
           <caret line="778" column="36" selection-start-line="778" selection-start-column="36" selection-end-line="778" selection-end-column="36" />
1304
           <folding>
1348
           <folding>
1305
             <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1349
             <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1328
         </state>
1372
         </state>
1329
       </provider>
1373
       </provider>
1330
     </entry>
1374
     </entry>
1375
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1376
+      <provider selected="true" editor-type-id="text-editor">
1377
+        <state vertical-scroll-proportion="0.26934096">
1378
+          <caret line="114" column="7" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
1379
+          <folding />
1380
+        </state>
1381
+      </provider>
1382
+    </entry>
1331
   </component>
1383
   </component>
1332
   <component name="masterDetails">
1384
   <component name="masterDetails">
1333
     <states>
1385
     <states>

BIN
java/java.jar View File


+ 0
- 3
java/lisezmoi.txt View File

1
-javac MainAdminBddBurgerQuizz.java
2
-java -cp mysql-connector-java-5.1.35-bin.jar:. MainAdminBddBurgerQuizz
3
--encoding "utf8" -docencoding "utf8" -charset utf8

+ 5
- 5
java/src/GestionBddDAO/ConfigBDD.java View File

77
 	 * @return Le nom de la base de données.
77
 	 * @return Le nom de la base de données.
78
 	 */
78
 	 */
79
 	public String getNomBdd() {
79
 	public String getNomBdd() {
80
-		return conf.getProperty("nomBdd");
80
+		return conf.getProperty("nomBdd", "burgerquizz");
81
 	}
81
 	}
82
 
82
 
83
 	/**
83
 	/**
93
 	 * @return Le port de connexion à la base de données.
93
 	 * @return Le port de connexion à la base de données.
94
 	 */
94
 	 */
95
 	public int getPort() {
95
 	public int getPort() {
96
-		return Integer.parseInt(conf.getProperty("port"));
96
+		return Integer.parseInt(conf.getProperty("port", "3306"));
97
 	}
97
 	}
98
 
98
 
99
 	/**
99
 	/**
109
 	 * @return L'adresse IP du serveur de la base de données.
109
 	 * @return L'adresse IP du serveur de la base de données.
110
 	 */
110
 	 */
111
 	public String getIp() {
111
 	public String getIp() {
112
-		return conf.getProperty("ip");
112
+		return conf.getProperty("ip", "localhost");
113
 	}
113
 	}
114
 
114
 
115
 	/**
115
 	/**
125
 	 * @return Login de l'utilisateur pour la base de données.
125
 	 * @return Login de l'utilisateur pour la base de données.
126
 	 */
126
 	 */
127
 	public String getLogin() {
127
 	public String getLogin() {
128
-		return conf.getProperty("login");
128
+		return conf.getProperty("login", "alain");
129
 	}
129
 	}
130
 
130
 
131
 	/**
131
 	/**
141
 	 * @return Mot de passe de l'utilisateur pour la base de données.
141
 	 * @return Mot de passe de l'utilisateur pour la base de données.
142
 	 */
142
 	 */
143
 	public String getPassword() {
143
 	public String getPassword() {
144
-		return conf.getProperty("password");
144
+		return conf.getProperty("password", "chabat");
145
 	}
145
 	}
146
 
146
 
147
 	/**
147
 	/**