Bläddra i källkod

conexion bdd operationelle et avance classe de base

PCYoshi 9 år sedan
förälder
incheckning
77f795d400

+ 9
- 0
java/.idea/libraries/mysql_connector_java_5_1_35_bin.xml Visa fil

@@ -0,0 +1,9 @@
1
+<component name="libraryTable">
2
+  <library name="mysql-connector-java-5.1.35-bin">
3
+    <CLASSES>
4
+      <root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-5.1.35-bin.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC />
7
+    <SOURCES />
8
+  </library>
9
+</component>

+ 320
- 90
java/.idea/workspace.xml Visa fil

@@ -2,10 +2,27 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
5
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/mysql_connector_java_5_1_35_bin.xml" />
6
+      <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="" />
7
+      <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionQuestions.class" afterPath="" />
8
+      <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionReponses.class" afterPath="" />
5 9
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Bouton.class" afterPath="$PROJECT_DIR$/out/production/java/Bouton.class" />
10
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Categorie.class" afterPath="$PROJECT_DIR$/out/production/java/Categorie.class" />
11
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
12
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
13
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" afterPath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" />
14
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Question.class" afterPath="$PROJECT_DIR$/out/production/java/Question.class" />
15
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Reponses.class" afterPath="$PROJECT_DIR$/out/production/java/Reponses.class" />
6 16
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Bouton.java" afterPath="$PROJECT_DIR$/src/Bouton.java" />
17
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Categorie.java" afterPath="$PROJECT_DIR$/src/Categorie.java" />
18
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/ConnexionBDD.java" />
19
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionCategories.java" />
20
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionQuestions.java" afterPath="$PROJECT_DIR$/src/GestionQuestions.java" />
21
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionReponses.java" />
7 22
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
8
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
23
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Question.java" afterPath="$PROJECT_DIR$/src/Question.java" />
24
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Reponses.java" afterPath="$PROJECT_DIR$/src/Reponses.java" />
25
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/java.iml" afterPath="$PROJECT_DIR$/java.iml" />
9 26
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
10 27
     </list>
11 28
     <ignored path="java.iws" />
@@ -28,25 +45,84 @@
28 45
   </component>
29 46
   <component name="FileEditorManager">
30 47
     <leaf>
31
-      <file leaf-file-name="mcd.png" pinned="false" current-in-tab="false">
32
-        <entry file="file://$PROJECT_DIR$/mcd.png">
33
-          <provider selected="true" editor-type-id="images">
34
-            <state />
48
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
49
+        <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
50
+          <provider selected="true" editor-type-id="text-editor">
51
+            <state vertical-scroll-proportion="0.0">
52
+              <caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
53
+              <folding>
54
+                <element signature="imports" expanded="true" />
55
+              </folding>
56
+            </state>
35 57
           </provider>
36 58
         </entry>
37 59
       </file>
38
-      <file leaf-file-name="java.png" pinned="false" current-in-tab="false">
39
-        <entry file="file://$PROJECT_DIR$/java.png">
40
-          <provider selected="true" editor-type-id="images">
41
-            <state />
60
+      <file leaf-file-name="Categorie.java" pinned="false" current-in-tab="false">
61
+        <entry file="file://$PROJECT_DIR$/src/Categorie.java">
62
+          <provider selected="true" editor-type-id="text-editor">
63
+            <state vertical-scroll-proportion="0.0">
64
+              <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
65
+              <folding>
66
+                <element signature="e#80#81#0" expanded="true" />
67
+                <element signature="e#101#102#0" expanded="true" />
68
+                <element signature="e#128#129#0" expanded="true" />
69
+                <element signature="e#145#146#0" expanded="true" />
70
+                <element signature="e#180#181#0" expanded="true" />
71
+                <element signature="e#201#202#0" expanded="true" />
72
+                <element signature="e#230#231#0" expanded="true" />
73
+                <element signature="e#247#248#0" expanded="true" />
74
+              </folding>
75
+            </state>
42 76
           </provider>
43 77
         </entry>
44 78
       </file>
45
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
46
-        <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
79
+      <file leaf-file-name="Reponses.java" pinned="false" current-in-tab="false">
80
+        <entry file="file://$PROJECT_DIR$/src/Reponses.java">
81
+          <provider selected="true" editor-type-id="text-editor">
82
+            <state vertical-scroll-proportion="0.0">
83
+              <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
84
+              <folding>
85
+                <element signature="e#223#224#0" expanded="true" />
86
+                <element signature="e#245#246#0" expanded="true" />
87
+                <element signature="e#290#291#0" expanded="true" />
88
+                <element signature="e#321#322#0" expanded="true" />
89
+                <element signature="e#353#354#0" expanded="true" />
90
+                <element signature="e#375#376#0" expanded="true" />
91
+                <element signature="e#420#421#0" expanded="true" />
92
+                <element signature="e#451#452#0" expanded="true" />
93
+                <element signature="e#480#481#0" expanded="true" />
94
+                <element signature="e#539#540#0" expanded="true" />
95
+              </folding>
96
+            </state>
97
+          </provider>
98
+        </entry>
99
+      </file>
100
+      <file leaf-file-name="Question.java" pinned="false" current-in-tab="false">
101
+        <entry file="file://$PROJECT_DIR$/src/Question.java">
47 102
           <provider selected="true" editor-type-id="text-editor">
48 103
             <state vertical-scroll-proportion="0.0">
49
-              <caret line="285" column="60" selection-start-line="285" selection-start-column="60" selection-end-line="285" selection-end-column="60" />
104
+              <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
105
+              <folding>
106
+                <element signature="e#240#241#0" expanded="true" />
107
+                <element signature="e#271#272#0" expanded="true" />
108
+                <element signature="e#319#320#0" expanded="true" />
109
+                <element signature="e#359#360#0" expanded="true" />
110
+                <element signature="e#390#391#0" expanded="true" />
111
+                <element signature="e#420#421#0" expanded="true" />
112
+                <element signature="e#463#464#0" expanded="true" />
113
+                <element signature="e#501#502#0" expanded="true" />
114
+                <element signature="e#533#534#0" expanded="true" />
115
+                <element signature="e#582#583#0" expanded="true" />
116
+              </folding>
117
+            </state>
118
+          </provider>
119
+        </entry>
120
+      </file>
121
+      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="true">
122
+        <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
123
+          <provider selected="true" editor-type-id="text-editor">
124
+            <state vertical-scroll-proportion="0.26915887">
125
+              <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
50 126
               <folding>
51 127
                 <element signature="imports" expanded="true" />
52 128
               </folding>
@@ -54,23 +130,40 @@
54 130
           </provider>
55 131
         </entry>
56 132
       </file>
57
-      <file leaf-file-name="MainAdminBddBurgerQuizz.java" pinned="false" current-in-tab="true">
58
-        <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
133
+      <file leaf-file-name="GestionCategories.java" pinned="false" current-in-tab="false">
134
+        <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
59 135
           <provider selected="true" editor-type-id="text-editor">
60
-            <state vertical-scroll-proportion="0.20186916">
61
-              <caret line="6" column="79" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
62
-              <folding />
136
+            <state vertical-scroll-proportion="0.0">
137
+              <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
138
+              <folding>
139
+                <element signature="e#181#182#0" expanded="true" />
140
+                <element signature="e#202#203#0" expanded="true" />
141
+              </folding>
63 142
             </state>
64 143
           </provider>
65 144
         </entry>
66 145
       </file>
67
-      <file leaf-file-name="Bouton.java" pinned="false" current-in-tab="false">
68
-        <entry file="file://$PROJECT_DIR$/src/Bouton.java">
146
+      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
147
+        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
69 148
           <provider selected="true" editor-type-id="text-editor">
70 149
             <state vertical-scroll-proportion="0.0">
71
-              <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
150
+              <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
72 151
               <folding>
73
-                <element signature="imports" expanded="true" />
152
+                <element signature="e#174#175#0" expanded="true" />
153
+                <element signature="e#195#196#0" expanded="true" />
154
+              </folding>
155
+            </state>
156
+          </provider>
157
+        </entry>
158
+      </file>
159
+      <file leaf-file-name="GestionQuestions.java" pinned="false" current-in-tab="false">
160
+        <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
161
+          <provider selected="true" editor-type-id="text-editor">
162
+            <state vertical-scroll-proportion="0.0">
163
+              <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
164
+              <folding>
165
+                <element signature="e#178#179#0" expanded="true" />
166
+                <element signature="e#199#200#0" expanded="true" />
74 167
               </folding>
75 168
             </state>
76 169
           </provider>
@@ -99,18 +192,18 @@
99 192
     <option name="CHANGED_PATHS">
100 193
       <list>
101 194
         <option value="$PROJECT_DIR$/src/Main.java" />
102
-        <option value="$PROJECT_DIR$/src/Categorie.java" />
103
-        <option value="$PROJECT_DIR$/src/Question.java" />
104 195
         <option value="$PROJECT_DIR$/src/Interface.java" />
105
-        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
106 196
         <option value="$PROJECT_DIR$/src/ConnectDialog.java" />
197
+        <option value="$PROJECT_DIR$/src/Bouton.java" />
198
+        <option value="$PROJECT_DIR$/src/Categorie.java" />
107 199
         <option value="$PROJECT_DIR$/src/Reponses.java" />
200
+        <option value="$PROJECT_DIR$/src/Question.java" />
201
+        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
202
+        <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
108 203
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
204
+        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
109 205
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
110
-        <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
111
-        <option value="$PROJECT_DIR$/src/Bouton.java" />
112 206
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
113
-        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
114 207
       </list>
115 208
     </option>
116 209
   </component>
@@ -207,7 +300,8 @@
207 300
       <sortByType />
208 301
     </navigator>
209 302
     <panes>
210
-      <pane id="PackagesPane" />
303
+      <pane id="Scratches" />
304
+      <pane id="Scope" />
211 305
       <pane id="ProjectPane">
212 306
         <subPane>
213 307
           <PATH>
@@ -242,8 +336,7 @@
242 336
           </PATH>
243 337
         </subPane>
244 338
       </pane>
245
-      <pane id="Scope" />
246
-      <pane id="Scratches" />
339
+      <pane id="PackagesPane" />
247 340
     </panes>
248 341
   </component>
249 342
   <component name="PropertiesComponent">
@@ -255,6 +348,14 @@
255 348
     <property name="restartRequiresConfirmation" value="true" />
256 349
     <property name="OverrideImplement.combined" value="true" />
257 350
     <property name="OverrideImplement.overriding.sorted" value="false" />
351
+    <property name="project.structure.last.edited" value="Modules" />
352
+    <property name="project.structure.proportion" value="0.0" />
353
+    <property name="project.structure.side.proportion" value="0.0" />
354
+  </component>
355
+  <component name="RecentsManager">
356
+    <key name="ExtractSuperBase.RECENT_KEYS">
357
+      <recent name="" />
358
+    </key>
258 359
   </component>
259 360
   <component name="RunManager" selected="Application.Main">
260 361
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
@@ -369,6 +470,7 @@
369 470
     </configuration>
370 471
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
371 472
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
473
+      <option name="JAR_PATH" value="$PROJECT_DIR$/lib/mysql-connector-java-5.1.35-bin.jar" />
372 474
       <envs />
373 475
       <method />
374 476
     </configuration>
@@ -462,7 +564,13 @@
462 564
       <option name="project" value="LOCAL" />
463 565
       <updated>1432660200378</updated>
464 566
     </task>
465
-    <option name="localTasksCounter" value="8" />
567
+    <task id="LOCAL-00008" summary="les boutons ecoutent">
568
+      <created>1432717078772</created>
569
+      <option name="number" value="00008" />
570
+      <option name="project" value="LOCAL" />
571
+      <updated>1432717078772</updated>
572
+    </task>
573
+    <option name="localTasksCounter" value="9" />
466 574
     <servers />
467 575
   </component>
468 576
   <component name="TodoView">
@@ -499,8 +607,8 @@
499 607
       <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" />
500 608
       <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" />
501 609
       <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" />
502
-      <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" />
503 610
       <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" />
611
+      <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" />
504 612
     </layout>
505 613
   </component>
506 614
   <component name="Vcs.Log.UiProperties">
@@ -522,7 +630,8 @@
522 630
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
523 631
     <MESSAGE value="fin de journé" />
524 632
     <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
525
-    <option name="LAST_COMMIT_MESSAGE" value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
633
+    <MESSAGE value="les boutons ecoutent" />
634
+    <option name="LAST_COMMIT_MESSAGE" value="les boutons ecoutent" />
526 635
   </component>
527 636
   <component name="XDebuggerManager">
528 637
     <breakpoint-manager>
@@ -535,6 +644,24 @@
535 644
     <option name="FILTER_TARGETS" value="false" />
536 645
   </component>
537 646
   <component name="editorHistoryManager">
647
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
648
+      <provider selected="true" editor-type-id="text-editor">
649
+        <state vertical-scroll-proportion="0.0">
650
+          <caret line="8" column="75" selection-start-line="8" selection-start-column="75" selection-end-line="8" selection-end-column="75" />
651
+          <folding />
652
+        </state>
653
+      </provider>
654
+    </entry>
655
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
656
+      <provider selected="true" editor-type-id="text-editor">
657
+        <state vertical-scroll-proportion="0.0">
658
+          <caret line="11" column="73" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="73" />
659
+          <folding>
660
+            <element signature="imports" expanded="true" />
661
+          </folding>
662
+        </state>
663
+      </provider>
664
+    </entry>
538 665
     <entry file="file://$PROJECT_DIR$/mcd.png">
539 666
       <provider selected="true" editor-type-id="images">
540 667
         <state />
@@ -742,13 +869,6 @@
742 869
         </state>
743 870
       </provider>
744 871
     </entry>
745
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
746
-      <provider selected="true" editor-type-id="text-editor">
747
-        <state vertical-scroll-proportion="0.0">
748
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
749
-        </state>
750
-      </provider>
751
-    </entry>
752 872
     <entry file="file://$PROJECT_DIR$/src/Reponses.java">
753 873
       <provider selected="true" editor-type-id="text-editor">
754 874
         <state vertical-scroll-proportion="0.0">
@@ -756,13 +876,6 @@
756 876
         </state>
757 877
       </provider>
758 878
     </entry>
759
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
760
-      <provider selected="true" editor-type-id="text-editor">
761
-        <state vertical-scroll-proportion="0.0">
762
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
763
-        </state>
764
-      </provider>
765
-    </entry>
766 879
     <entry file="file://$PROJECT_DIR$/src/Question.java">
767 880
       <provider selected="true" editor-type-id="text-editor">
768 881
         <state vertical-scroll-proportion="0.0">
@@ -770,13 +883,6 @@
770 883
         </state>
771 884
       </provider>
772 885
     </entry>
773
-    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
774
-      <provider selected="true" editor-type-id="text-editor">
775
-        <state vertical-scroll-proportion="0.0">
776
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
777
-        </state>
778
-      </provider>
779
-    </entry>
780 886
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
781 887
       <provider selected="true" editor-type-id="text-editor">
782 888
         <state vertical-scroll-proportion="0.0">
@@ -808,92 +914,216 @@
808 914
         </state>
809 915
       </provider>
810 916
     </entry>
811
-    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
917
+    <entry file="file://$PROJECT_DIR$/java.png">
918
+      <provider selected="true" editor-type-id="images">
919
+        <state />
920
+      </provider>
921
+    </entry>
922
+    <entry file="file://$PROJECT_DIR$/mcd.png">
923
+      <provider selected="true" editor-type-id="images">
924
+        <state />
925
+      </provider>
926
+    </entry>
927
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
812 928
       <provider selected="true" editor-type-id="text-editor">
813
-        <state vertical-scroll-proportion="0.0">
814
-          <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
929
+        <state vertical-scroll-proportion="0.5719626">
930
+          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
931
+          <folding>
932
+            <element signature="imports" expanded="true" />
933
+          </folding>
815 934
         </state>
816 935
       </provider>
817 936
     </entry>
818
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
937
+    <entry file="file://$PROJECT_DIR$/src/Question.java">
819 938
       <provider selected="true" editor-type-id="text-editor">
820 939
         <state vertical-scroll-proportion="0.0">
821
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
940
+          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
941
+          <folding>
942
+            <element signature="e#240#241#0" expanded="true" />
943
+            <element signature="e#271#272#0" expanded="true" />
944
+            <element signature="e#319#320#0" expanded="true" />
945
+            <element signature="e#359#360#0" expanded="true" />
946
+            <element signature="e#390#391#0" expanded="true" />
947
+            <element signature="e#420#421#0" expanded="true" />
948
+            <element signature="e#463#464#0" expanded="true" />
949
+            <element signature="e#501#502#0" expanded="true" />
950
+            <element signature="e#533#534#0" expanded="true" />
951
+            <element signature="e#582#583#0" expanded="true" />
952
+          </folding>
822 953
         </state>
823 954
       </provider>
824 955
     </entry>
825
-    <entry file="file://$PROJECT_DIR$/src/Reponses.java">
956
+    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
826 957
       <provider selected="true" editor-type-id="text-editor">
827 958
         <state vertical-scroll-proportion="0.0">
828
-          <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
959
+          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
960
+          <folding>
961
+            <element signature="e#80#81#0" expanded="true" />
962
+            <element signature="e#101#102#0" expanded="true" />
963
+            <element signature="e#128#129#0" expanded="true" />
964
+            <element signature="e#145#146#0" expanded="true" />
965
+            <element signature="e#180#181#0" expanded="true" />
966
+            <element signature="e#201#202#0" expanded="true" />
967
+            <element signature="e#230#231#0" expanded="true" />
968
+            <element signature="e#247#248#0" expanded="true" />
969
+          </folding>
829 970
         </state>
830 971
       </provider>
831 972
     </entry>
832
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
973
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
833 974
       <provider selected="true" editor-type-id="text-editor">
834
-        <state vertical-scroll-proportion="0.0">
835
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
975
+        <state vertical-scroll-proportion="0.6130031">
976
+          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
977
+          <folding />
836 978
         </state>
837 979
       </provider>
838 980
     </entry>
839
-    <entry file="file://$PROJECT_DIR$/src/Question.java">
981
+    <entry file="file://$PROJECT_DIR$/src/Reponses.java">
840 982
       <provider selected="true" editor-type-id="text-editor">
841 983
         <state vertical-scroll-proportion="0.0">
842
-          <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
984
+          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
985
+          <folding>
986
+            <element signature="e#223#224#0" expanded="true" />
987
+            <element signature="e#245#246#0" expanded="true" />
988
+            <element signature="e#290#291#0" expanded="true" />
989
+            <element signature="e#321#322#0" expanded="true" />
990
+            <element signature="e#353#354#0" expanded="true" />
991
+            <element signature="e#375#376#0" expanded="true" />
992
+            <element signature="e#420#421#0" expanded="true" />
993
+            <element signature="e#451#452#0" expanded="true" />
994
+            <element signature="e#480#481#0" expanded="true" />
995
+            <element signature="e#539#540#0" expanded="true" />
996
+          </folding>
843 997
         </state>
844 998
       </provider>
845 999
     </entry>
846 1000
     <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
847 1001
       <provider selected="true" editor-type-id="text-editor">
848 1002
         <state vertical-scroll-proportion="0.0">
849
-          <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
1003
+          <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
1004
+          <folding>
1005
+            <element signature="e#178#179#0" expanded="true" />
1006
+            <element signature="e#199#200#0" expanded="true" />
1007
+          </folding>
850 1008
         </state>
851 1009
       </provider>
852 1010
     </entry>
853
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1011
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
854 1012
       <provider selected="true" editor-type-id="text-editor">
855
-        <state vertical-scroll-proportion="0.06728972">
856
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1013
+        <state vertical-scroll-proportion="0.0">
1014
+          <caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
1015
+          <folding>
1016
+            <element signature="imports" expanded="true" />
1017
+          </folding>
857 1018
         </state>
858 1019
       </provider>
859 1020
     </entry>
860
-    <entry file="file://$PROJECT_DIR$/mcd.png">
861
-      <provider selected="true" editor-type-id="images">
862
-        <state />
863
-      </provider>
864
-    </entry>
865
-    <entry file="file://$PROJECT_DIR$/java.png">
866
-      <provider selected="true" editor-type-id="images">
867
-        <state />
868
-      </provider>
869
-    </entry>
870
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
1021
+    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
871 1022
       <provider selected="true" editor-type-id="text-editor">
872 1023
         <state vertical-scroll-proportion="0.0">
873
-          <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
1024
+          <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
874 1025
           <folding>
875
-            <element signature="imports" expanded="true" />
1026
+            <element signature="e#181#182#0" expanded="true" />
1027
+            <element signature="e#202#203#0" expanded="true" />
876 1028
           </folding>
877 1029
         </state>
878 1030
       </provider>
879 1031
     </entry>
880
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1032
+    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
881 1033
       <provider selected="true" editor-type-id="text-editor">
882 1034
         <state vertical-scroll-proportion="0.0">
883
-          <caret line="285" column="60" selection-start-line="285" selection-start-column="60" selection-end-line="285" selection-end-column="60" />
1035
+          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
884 1036
           <folding>
885
-            <element signature="imports" expanded="true" />
1037
+            <element signature="e#174#175#0" expanded="true" />
1038
+            <element signature="e#195#196#0" expanded="true" />
886 1039
           </folding>
887 1040
         </state>
888 1041
       </provider>
889 1042
     </entry>
890
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1043
+    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
891 1044
       <provider selected="true" editor-type-id="text-editor">
892
-        <state vertical-scroll-proportion="0.20186916">
893
-          <caret line="6" column="79" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
894
-          <folding />
1045
+        <state vertical-scroll-proportion="0.26915887">
1046
+          <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
1047
+          <folding>
1048
+            <element signature="imports" expanded="true" />
1049
+          </folding>
895 1050
         </state>
896 1051
       </provider>
897 1052
     </entry>
898 1053
   </component>
1054
+  <component name="masterDetails">
1055
+    <states>
1056
+      <state key="ArtifactsStructureConfigurable.UI">
1057
+        <settings>
1058
+          <artifact-editor />
1059
+          <splitter-proportions>
1060
+            <option name="proportions">
1061
+              <list>
1062
+                <option value="0.2" />
1063
+              </list>
1064
+            </option>
1065
+          </splitter-proportions>
1066
+        </settings>
1067
+      </state>
1068
+      <state key="FacetStructureConfigurable.UI">
1069
+        <settings>
1070
+          <last-edited>No facets are configured</last-edited>
1071
+          <splitter-proportions>
1072
+            <option name="proportions">
1073
+              <list>
1074
+                <option value="0.2" />
1075
+              </list>
1076
+            </option>
1077
+          </splitter-proportions>
1078
+        </settings>
1079
+      </state>
1080
+      <state key="GlobalLibrariesConfigurable.UI">
1081
+        <settings>
1082
+          <splitter-proportions>
1083
+            <option name="proportions">
1084
+              <list>
1085
+                <option value="0.2" />
1086
+              </list>
1087
+            </option>
1088
+          </splitter-proportions>
1089
+        </settings>
1090
+      </state>
1091
+      <state key="JdkListConfigurable.UI">
1092
+        <settings>
1093
+          <last-edited>1.7</last-edited>
1094
+          <splitter-proportions>
1095
+            <option name="proportions">
1096
+              <list>
1097
+                <option value="0.2" />
1098
+              </list>
1099
+            </option>
1100
+          </splitter-proportions>
1101
+        </settings>
1102
+      </state>
1103
+      <state key="ModuleStructureConfigurable.UI">
1104
+        <settings>
1105
+          <last-edited>java</last-edited>
1106
+          <splitter-proportions>
1107
+            <option name="proportions">
1108
+              <list>
1109
+                <option value="0.2" />
1110
+              </list>
1111
+            </option>
1112
+          </splitter-proportions>
1113
+        </settings>
1114
+      </state>
1115
+      <state key="ProjectLibrariesConfigurable.UI">
1116
+        <settings>
1117
+          <last-edited>mysql-connector-java-5.1.35-bin</last-edited>
1118
+          <splitter-proportions>
1119
+            <option name="proportions">
1120
+              <list>
1121
+                <option value="0.2" />
1122
+              </list>
1123
+            </option>
1124
+          </splitter-proportions>
1125
+        </settings>
1126
+      </state>
1127
+    </states>
1128
+  </component>
899 1129
 </project>

+ 2
- 2
java/java.iml Visa fil

@@ -7,6 +7,6 @@
7 7
     </content>
8 8
     <orderEntry type="inheritedJdk" />
9 9
     <orderEntry type="sourceFolder" forTests="false" />
10
+    <orderEntry type="library" name="mysql-connector-java-5.1.35-bin" level="project" />
10 11
   </component>
11
-</module>
12
-
12
+</module>

Binär
java/out/production/java/Bouton.class Visa fil


Binär
java/out/production/java/Categorie.class Visa fil


Binär
java/out/production/java/ConnexionBDD.class Visa fil


Binär
java/out/production/java/GestionCategories.class Visa fil


Binär
java/out/production/java/GestionQuestions.class Visa fil


Binär
java/out/production/java/GestionReponses.class Visa fil


Binär
java/out/production/java/InterfacePrincipale.class Visa fil


Binär
java/out/production/java/MainAdminBddBurgerQuizz.class Visa fil


Binär
java/out/production/java/Question.class Visa fil


Binär
java/out/production/java/Reponses.class Visa fil


+ 1
- 1
java/src/Bouton.java Visa fil

@@ -9,7 +9,7 @@ public class Bouton extends JButton
9 9
 		super(text, icon);
10 10
 		//setBackground(Color.WHITE);
11 11
 		setFocusPainted(false);
12
-		Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
12
+		//Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
13 13
 		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
14 14
 		//setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
15 15
 		setIconTextGap(10);

+ 18
- 1
java/src/Categorie.java Visa fil

@@ -1,4 +1,21 @@
1 1
 public class Categorie
2 2
 {
3
-    protected String nom;
3
+	protected String nom;
4
+
5
+
6
+	public Categorie(String nom) {
7
+		this.nom = nom;
8
+	}
9
+
10
+	public String getNom() {
11
+		return nom;
12
+	}
13
+
14
+	public void setNom(String nom) {
15
+		this.nom = nom;
16
+	}
17
+
18
+	public String toString() {
19
+		return nom;
20
+	}
4 21
 }

+ 36
- 0
java/src/ConnexionBDD.java Visa fil

@@ -1,4 +1,40 @@
1
+import java.sql.Connection;
2
+import java.sql.DriverManager;
3
+import java.sql.SQLException;
4
+import java.util.ArrayList;
5
+
1 6
 public class ConnexionBDD
2 7
 {
8
+	Connection connexionbdd;
9
+	String nomBdd;
10
+	GestionCategories gestionCategories;
11
+	GestionReponses gestionReponses;
12
+	GestionQuestions gestionQuestions;
13
+
14
+	public ConnexionBDD(String nomBdd, int port, String ip, String login, String password)
15
+	{
16
+		this.nomBdd = nomBdd;
17
+
18
+		try
19
+		{
20
+			Class.forName("com.mysql.jdbc.Driver");
21
+		}
22
+		catch(ClassNotFoundException e)
23
+		{
24
+			e.printStackTrace();
25
+			System.exit(1);
26
+		}
3 27
 
28
+		try
29
+		{
30
+			String url = "jdbc:mysql://" + ip + ":" + port + "/" + nomBdd;
31
+			connexionbdd = DriverManager.getConnection(url, login, password);
32
+		}
33
+		catch(SQLException e)
34
+		{
35
+			e.printStackTrace();
36
+			System.out.println("Erreur de conexion à la base de données");
37
+			System.exit(1);
38
+		}
39
+	}
4 40
 }

+ 8
- 0
java/src/GestionCategories.java Visa fil

@@ -1,4 +1,12 @@
1
+import java.util.ArrayList;
2
+
1 3
 public class GestionCategories
2 4
 {
5
+	private ConnexionBDD bdd;
6
+	private ArrayList<Categorie> listCategories;
3 7
 
8
+	public GestionCategories(ConnexionBDD bdd)
9
+	{
10
+		this.bdd = bdd;
11
+	}
4 12
 }

+ 8
- 0
java/src/GestionQuestions.java Visa fil

@@ -1,4 +1,12 @@
1
+import java.util.ArrayList;
2
+
1 3
 public class GestionQuestions
2 4
 {
5
+	private ConnexionBDD bdd;
6
+	private ArrayList<Question> listeQuestions;
3 7
 
8
+	public GestionQuestions(ConnexionBDD bdd)
9
+	{
10
+		this.bdd = bdd;
11
+	}
4 12
 }

+ 9
- 0
java/src/GestionReponses.java Visa fil

@@ -1,3 +1,12 @@
1
+import java.util.ArrayList;
2
+
1 3
 public class GestionReponses
2 4
 {
5
+	private ConnexionBDD bdd;
6
+	private ArrayList<Reponses> listReponses;
7
+
8
+	public GestionReponses(ConnexionBDD bdd)
9
+	{
10
+		this.bdd = bdd;
11
+	}
3 12
 }

+ 45
- 18
java/src/InterfacePrincipale.java Visa fil

@@ -1,4 +1,6 @@
1 1
 import javax.swing.*;
2
+import javax.swing.border.BevelBorder;
3
+import javax.swing.border.Border;
2 4
 import java.awt.*;
3 5
 import java.awt.event.ActionEvent;
4 6
 import java.awt.event.ActionListener;
@@ -36,39 +38,54 @@ public class InterfacePrincipale extends JFrame
36 38
 	private ImageIcon delImg;
37 39
 	private ImageIcon editImg;
38 40
 
41
+	//barre de statut
42
+	private JPanel statusBar;
43
+	private JLabel statusText;
44
+
45
+	//objet bdd
46
+	private ConnexionBDD bdd;
47
+
39 48
 	public InterfacePrincipale()
40 49
 	{
50
+		ConnexionBDD  bdd = new ConnexionBDD("burgerquizz", 3306, "localhost", "alain", "chabat");
51
+
41 52
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
42 53
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
43
-		setLayout(new BorderLayout(10,10));
54
+		setLayout(new BorderLayout());
44 55
 
45 56
 		loadImgBouton();
46 57
 		createPanelCategories();
47 58
 		createPanelReponses();
48 59
 		createPanelQuestion();
60
+		createStatusBar();
49 61
 
50
-		getContentPane().add(new JLabel(new ImageIcon("rsc/burgerquizz.png")), BorderLayout.NORTH);
51 62
 
52
-		JSplitPane sp1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panReponses,panQuestions);
53
-		JSplitPane sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panCategories,sp1);
54
-		sp1.setBorder(BorderFactory.createEmptyBorder());
55
-		sp2.setBorder(BorderFactory.createLineBorder(new Color(238,238,238),5));
63
+		JSplitPane sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,true,panReponses,panQuestions);
64
+		JSplitPane sp1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,true,panCategories,sp2);
65
+		sp1.setBorder(BorderFactory.createLineBorder(new Color(238,238,238),5));
66
+		sp2.setBorder(BorderFactory.createEmptyBorder());
56 67
 		sp1.setDividerSize(10);
57 68
 		sp2.setDividerSize(10);
58 69
 
59 70
 		JPanel conteneur = new JPanel();
60 71
 		conteneur.setLayout(new BorderLayout());
61
-		conteneur.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
62
-		conteneur.add(sp2, BorderLayout.CENTER);
72
+		conteneur.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
73
+		conteneur.add(sp1, BorderLayout.CENTER);
63 74
 
64 75
 		Color bg = new Color(220,220,220);
65 76
 		panQuestions.setBackground(bg);
66 77
 		panReponses.setBackground(bg);
67 78
 		panCategories.setBackground(bg);
68 79
 
80
+		getContentPane().add(new JLabel(new ImageIcon("rsc/burgerquizz.png")), BorderLayout.NORTH);
69 81
 		getContentPane().add(conteneur, BorderLayout.CENTER);
82
+		getContentPane().add(statusBar, BorderLayout.SOUTH);
70 83
 
71 84
 		pack();
85
+
86
+		sp1.setDividerLocation(0.30);
87
+		sp2.setDividerLocation(0.50);
88
+
72 89
 		setLocationRelativeTo(null);
73 90
 		setVisible(true);
74 91
 	}
@@ -80,6 +97,17 @@ public class InterfacePrincipale extends JFrame
80 97
 		editImg = new ImageIcon("rsc/edit.png");
81 98
 	}
82 99
 
100
+	private void createStatusBar()
101
+	{
102
+		statusBar = new JPanel();
103
+		statusText = new JLabel("La licorne magique mange une tomate");
104
+
105
+		Border border = BorderFactory.createMatteBorder(3,0,0,0, new Color(220,220,220));
106
+		statusBar.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,70,5,70),border));
107
+
108
+		statusBar.add(statusText);
109
+	}
110
+
83 111
 	private void createPanelCategories()
84 112
 	{
85 113
 		panCategories = new JPanel();
@@ -225,7 +253,6 @@ public class InterfacePrincipale extends JFrame
225 253
 		BorderLayout bl = (BorderLayout)getContentPane().getLayout();
226 254
 		JLabel l = (JLabel)bl.getLayoutComponent(BorderLayout.NORTH);
227 255
 		l.setIcon(new ImageIcon("rsc/nyan.gif"));
228
-		//getContentPane().add(new JLabel(new ImageIcon("rsc/nyan.gif")), BorderLayout.SOUTH);
229 256
 		setLocationRelativeTo(null);
230 257
 		pack();
231 258
 	}
@@ -237,15 +264,15 @@ public class InterfacePrincipale extends JFrame
237 264
 		{
238 265
 			if(e.getSource() == addC)
239 266
 			{
240
-				System.out.println("Ajout de catégorie");
267
+				statusText.setText("Ajout de catégorie");
241 268
 			}
242 269
 			else if(e.getSource() == delC)
243 270
 			{
244
-				System.out.println("Supression de catégorie");
271
+				statusText.setText("Supression de catégorie");
245 272
 			}
246 273
 			else if(e.getSource() == editC)
247 274
 			{
248
-				System.out.println("Modification de catégorie");
275
+				statusText.setText("Modification de catégorie");
249 276
 			}
250 277
 		}
251 278
 	}
@@ -256,15 +283,15 @@ public class InterfacePrincipale extends JFrame
256 283
 		{
257 284
 			if(e.getSource() == addR)
258 285
 			{
259
-				System.out.println("Création de réponses");
286
+				statusText.setText("Création de réponses");
260 287
 			}
261 288
 			else if(e.getSource() == delR)
262 289
 			{
263
-				System.out.println("Supression de réponses");
290
+				statusText.setText("Supression de réponses");
264 291
 			}
265 292
 			else if(e.getSource() == editR)
266 293
 			{
267
-				System.out.println("Modification de réponses");
294
+				statusText.setText("Modification de réponses");
268 295
 			}
269 296
 		}
270 297
 	}
@@ -275,15 +302,15 @@ public class InterfacePrincipale extends JFrame
275 302
 		{
276 303
 			if(e.getSource() == addQ)
277 304
 			{
278
-				System.out.println("Création de question");
305
+				statusText.setText("Création de question");
279 306
 			}
280 307
 			else if(e.getSource() == delQ)
281 308
 			{
282
-				System.out.println("Supression de question");
309
+				statusText.setText("Supression de question");
283 310
 			}
284 311
 			else if(e.getSource() == editQ)
285 312
 			{
286
-				System.out.println("Modification de question");
313
+				statusText.setText("Modification de question");
287 314
 			}
288 315
 		}
289 316
 	}

+ 25
- 0
java/src/Question.java Visa fil

@@ -2,4 +2,29 @@ public class Question
2 2
 {
3 3
     protected String intitule;
4 4
     protected int reponse;
5
+
6
+    public Question(String intitule, int reponse) {
7
+        this.intitule = intitule;
8
+        this.reponse = reponse;
9
+    }
10
+
11
+    public String getIntitule() {
12
+        return intitule;
13
+    }
14
+
15
+    public void setIntitule(String intitule) {
16
+        this.intitule = intitule;
17
+    }
18
+
19
+    public int getReponse() {
20
+        return reponse;
21
+    }
22
+
23
+    public void setReponse(int reponse) {
24
+        this.reponse = reponse;
25
+    }
26
+
27
+    public String toString() {
28
+        return intitule + " - " + reponse;
29
+    }
5 30
 }

+ 27
- 2
java/src/Reponses.java Visa fil

@@ -1,5 +1,30 @@
1 1
 public class Reponses
2 2
 {
3
-    protected String reponse1;
4
-    protected String reponse2;
3
+	protected String reponse1;
4
+	protected String reponse2;
5
+
6
+	public Reponses(String reponse1, String reponse2) {
7
+		this.reponse1 = reponse1;
8
+		this.reponse2 = reponse2;
9
+	}
10
+
11
+	public String getReponse1() {
12
+		return reponse1;
13
+	}
14
+
15
+	public void setReponse1(String reponse1) {
16
+		this.reponse1 = reponse1;
17
+	}
18
+
19
+	public String getReponse2() {
20
+		return reponse2;
21
+	}
22
+
23
+	public void setReponse2(String reponse2) {
24
+		this.reponse2 = reponse2;
25
+	}
26
+
27
+	public String toString() {
28
+		return  reponse1 + ", " + reponse2 + " ou les deux?";
29
+	}
5 30
 }