ソースを参照

grisgae panneaux opérationel

PCYoshi 9 年 前
コミット
f80e1a153a
共有3 個のファイルを変更した225 個の追加63 個の削除を含む
  1. 180
    50
      java/.idea/workspace.xml
  2. 44
    12
      java/src/InterfaceGraphique/InterfacePrincipale.java
  3. 1
    1
      java/src/Modele/Question.java

+ 180
- 50
java/.idea/workspace.xml ファイルの表示

@@ -6,9 +6,9 @@
6 6
     </artifacts-to-build>
7 7
   </component>
8 8
   <component name="ChangeListManager">
9
-    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" afterPath="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" />
9
+    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="barre de statut opérationelle">
11 10
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
11
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Modele/Question.java" afterPath="$PROJECT_DIR$/src/Modele/Question.java" />
12 12
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
13 13
     </list>
14 14
     <ignored path="java.iws" />
@@ -31,11 +31,34 @@
31 31
   </component>
32 32
   <component name="FileEditorManager">
33 33
     <leaf>
34
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
34
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
35 35
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
36 36
           <provider selected="true" editor-type-id="text-editor">
37
-            <state vertical-scroll-proportion="0.33266932">
38
-              <caret line="361" column="26" selection-start-line="361" selection-start-column="19" selection-end-line="361" selection-end-column="26" />
37
+            <state vertical-scroll-proportion="-4.9117646">
38
+              <caret line="479" column="24" selection-start-line="479" selection-start-column="20" selection-end-line="479" selection-end-column="24" />
39
+              <folding>
40
+                <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
41
+                <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
42
+                <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
43
+                <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
44
+                <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
45
+                <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
46
+                <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
47
+                <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
48
+                <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
49
+                <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
50
+                <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
51
+                <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
52
+              </folding>
53
+            </state>
54
+          </provider>
55
+        </entry>
56
+      </file>
57
+      <file leaf-file-name="Question.java" pinned="false" current-in-tab="true">
58
+        <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
59
+          <provider selected="true" editor-type-id="text-editor">
60
+            <state vertical-scroll-proportion="0.6243094">
61
+              <caret line="63" column="30" selection-start-line="63" selection-start-column="30" selection-end-line="63" selection-end-column="30" />
39 62
               <folding />
40 63
             </state>
41 64
           </provider>
@@ -58,7 +81,7 @@
58 81
         <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
59 82
           <provider selected="true" editor-type-id="text-editor">
60 83
             <state vertical-scroll-proportion="0.0">
61
-              <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
84
+              <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
62 85
               <folding />
63 86
             </state>
64 87
           </provider>
@@ -128,9 +151,10 @@
128 151
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
129 152
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
130 153
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
131
-        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
132 154
         <option value="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" />
155
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
133 156
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
157
+        <option value="$PROJECT_DIR$/src/Modele/Question.java" />
134 158
       </list>
135 159
     </option>
136 160
   </component>
@@ -249,6 +273,9 @@
249 273
       <sortByType />
250 274
     </navigator>
251 275
     <panes>
276
+      <pane id="Scope" />
277
+      <pane id="Scratches" />
278
+      <pane id="PackagesPane" />
252 279
       <pane id="ProjectPane">
253 280
         <subPane>
254 281
           <PATH>
@@ -377,9 +404,6 @@
377 404
           </PATH>
378 405
         </subPane>
379 406
       </pane>
380
-      <pane id="PackagesPane" />
381
-      <pane id="Scope" />
382
-      <pane id="Scratches" />
383 407
     </panes>
384 408
   </component>
385 409
   <component name="PropertiesComponent">
@@ -433,7 +457,7 @@
433 457
           <option name="myId" value="UPDATED" />
434 458
           <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/css/main.css</PATH>
435 459
           <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/index.htm</PATH>
436
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/game.js</PATH>
460
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/play.htm</PATH>
437 461
         </FILE-GROUP>
438 462
         <FILE-GROUP>
439 463
           <option name="myUpdateName" value="Created" />
@@ -441,6 +465,9 @@
441 465
           <option name="mySupportsDeletion" value="false" />
442 466
           <option name="myCanBeAbsent" value="false" />
443 467
           <option name="myId" value="CREATED" />
468
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/assets/burger-menu.png</PATH>
469
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/jquery-2.1.4.min.js</PATH>
470
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/responsive.js</PATH>
444 471
         </FILE-GROUP>
445 472
         <FILE-GROUP>
446 473
           <option name="myUpdateName" value="Deleted" />
@@ -448,6 +475,7 @@
448 475
           <option name="mySupportsDeletion" value="false" />
449 476
           <option name="myCanBeAbsent" value="true" />
450 477
           <option name="myId" value="REMOVED_FROM_REPOSITORY" />
478
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/jquery-2.1.4.min.js</PATH>
451 479
         </FILE-GROUP>
452 480
         <FILE-GROUP>
453 481
           <option name="myUpdateName" value="Restored" />
@@ -880,7 +908,13 @@
880 908
       <option name="project" value="LOCAL" />
881 909
       <updated>1433765542215</updated>
882 910
     </task>
883
-    <option name="localTasksCounter" value="32" />
911
+    <task id="LOCAL-00032" summary="barre de statut opérationelle">
912
+      <created>1433777166215</created>
913
+      <option name="number" value="00032" />
914
+      <option name="project" value="LOCAL" />
915
+      <updated>1433777166215</updated>
916
+    </task>
917
+    <option name="localTasksCounter" value="33" />
884 918
     <servers />
885 919
   </component>
886 920
   <component name="TodoView">
@@ -900,25 +934,25 @@
900 934
       <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" />
901 935
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
902 936
       <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" />
903
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
937
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
904 938
       <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" />
939
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.427065" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
905 940
       <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" />
906 941
       <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" />
907 942
       <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" />
908
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32688928" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
943
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32688928" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
909 944
       <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" />
910 945
       <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" />
911 946
       <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" />
912 947
       <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" />
913 948
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2006079" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
914
-      <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" />
949
+      <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="6" side_tool="false" content_ui="tabs" />
950
+      <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="2" side_tool="false" content_ui="tabs" />
915 951
       <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" />
916 952
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
917
-      <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 953
       <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" />
954
+      <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="3" side_tool="false" content_ui="tabs" />
919 955
       <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" />
920
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
921
-      <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" />
922 956
     </layout>
923 957
   </component>
924 958
   <component name="Vcs.Log.UiProperties">
@@ -933,7 +967,6 @@
933 967
     <option name="myLimit" value="2678400000" />
934 968
   </component>
935 969
   <component name="VcsManagerConfiguration">
936
-    <MESSAGE value="evolution (pikachu evolue en raichu)" />
937 970
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
938 971
     <MESSAGE value="fin de journé" />
939 972
     <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
@@ -958,11 +991,15 @@
958 991
     <MESSAGE value="++mieux" />
959 992
     <MESSAGE value="Si tu lis ce message, c'est que tu sait lire." />
960 993
     <MESSAGE value="f,ekgfnje" />
961
-    <option name="LAST_COMMIT_MESSAGE" value="f,ekgfnje" />
994
+    <MESSAGE value="barre de statut opérationelle" />
995
+    <option name="LAST_COMMIT_MESSAGE" value="barre de statut opérationelle" />
962 996
   </component>
963 997
   <component name="XDebuggerManager">
964 998
     <breakpoint-manager>
965
-      <option name="time" value="8" />
999
+      <breakpoints-dialog>
1000
+        <breakpoints-dialog />
1001
+      </breakpoints-dialog>
1002
+      <option name="time" value="35" />
966 1003
     </breakpoint-manager>
967 1004
     <watches-manager />
968 1005
   </component>
@@ -992,7 +1029,20 @@
992 1029
       <provider selected="true" editor-type-id="text-editor">
993 1030
         <state vertical-scroll-proportion="0.0">
994 1031
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
995
-          <folding />
1032
+          <folding>
1033
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1034
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1035
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1036
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1037
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1038
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1039
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1040
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1041
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1042
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1043
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1044
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1045
+          </folding>
996 1046
         </state>
997 1047
       </provider>
998 1048
     </entry>
@@ -1024,7 +1074,20 @@
1024 1074
       <provider selected="true" editor-type-id="text-editor">
1025 1075
         <state vertical-scroll-proportion="0.0">
1026 1076
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1027
-          <folding />
1077
+          <folding>
1078
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1079
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1080
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1081
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1082
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1083
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1084
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1085
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1086
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1087
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1088
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1089
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1090
+          </folding>
1028 1091
         </state>
1029 1092
       </provider>
1030 1093
     </entry>
@@ -1056,7 +1119,20 @@
1056 1119
       <provider selected="true" editor-type-id="text-editor">
1057 1120
         <state vertical-scroll-proportion="0.0">
1058 1121
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1059
-          <folding />
1122
+          <folding>
1123
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1124
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1125
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1126
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1127
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1128
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1129
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1130
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1131
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1132
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1133
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1134
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1135
+          </folding>
1060 1136
         </state>
1061 1137
       </provider>
1062 1138
     </entry>
@@ -1088,7 +1164,20 @@
1088 1164
       <provider selected="true" editor-type-id="text-editor">
1089 1165
         <state vertical-scroll-proportion="0.0">
1090 1166
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1091
-          <folding />
1167
+          <folding>
1168
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1169
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1170
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1171
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1172
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1173
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1174
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1175
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1176
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1177
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1178
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1179
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1180
+          </folding>
1092 1181
         </state>
1093 1182
       </provider>
1094 1183
     </entry>
@@ -1120,7 +1209,20 @@
1120 1209
       <provider selected="true" editor-type-id="text-editor">
1121 1210
         <state vertical-scroll-proportion="0.0">
1122 1211
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1123
-          <folding />
1212
+          <folding>
1213
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1214
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1215
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1216
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1217
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1218
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1219
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1220
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1221
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1222
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1223
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1224
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1225
+          </folding>
1124 1226
         </state>
1125 1227
       </provider>
1126 1228
     </entry>
@@ -1173,7 +1275,20 @@
1173 1275
       <provider selected="true" editor-type-id="text-editor">
1174 1276
         <state vertical-scroll-proportion="0.0">
1175 1277
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1176
-          <folding />
1278
+          <folding>
1279
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1280
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1281
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1282
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1283
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1284
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1285
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1286
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1287
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1288
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1289
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1290
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1291
+          </folding>
1177 1292
         </state>
1178 1293
       </provider>
1179 1294
     </entry>
@@ -1194,13 +1309,6 @@
1194 1309
         <state />
1195 1310
       </provider>
1196 1311
     </entry>
1197
-    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
1198
-      <provider selected="true" editor-type-id="text-editor">
1199
-        <state vertical-scroll-proportion="0.46082088">
1200
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
1201
-        </state>
1202
-      </provider>
1203
-    </entry>
1204 1312
     <entry file="file://$PROJECT_DIR$/conf.xml">
1205 1313
       <provider selected="true" editor-type-id="text-editor">
1206 1314
         <state vertical-scroll-proportion="0.0">
@@ -1216,13 +1324,6 @@
1216 1324
         </state>
1217 1325
       </provider>
1218 1326
     </entry>
1219
-    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
1220
-      <provider selected="true" editor-type-id="text-editor">
1221
-        <state vertical-scroll-proportion="0.0">
1222
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1223
-        </state>
1224
-      </provider>
1225
-    </entry>
1226 1327
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1227 1328
       <provider selected="true" editor-type-id="text-editor">
1228 1329
         <state vertical-scroll-proportion="0.7044199">
@@ -1292,29 +1393,58 @@
1292 1393
         </state>
1293 1394
       </provider>
1294 1395
     </entry>
1396
+    <entry file="file://$PROJECT_DIR$/src/GestionErreurs/BDDException.java">
1397
+      <provider selected="true" editor-type-id="text-editor">
1398
+        <state vertical-scroll-proportion="0.0">
1399
+          <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
1400
+          <folding>
1401
+            <element signature="e#109#110#0" expanded="true" />
1402
+            <element signature="e#130#131#0" expanded="true" />
1403
+          </folding>
1404
+        </state>
1405
+      </provider>
1406
+    </entry>
1295 1407
     <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1296 1408
       <provider selected="true" editor-type-id="text-editor">
1297 1409
         <state vertical-scroll-proportion="0.0">
1298
-          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
1410
+          <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
1299 1411
           <folding />
1300 1412
         </state>
1301 1413
       </provider>
1302 1414
     </entry>
1303
-    <entry file="file://$PROJECT_DIR$/src/GestionErreurs/BDDException.java">
1415
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1304 1416
       <provider selected="true" editor-type-id="text-editor">
1305
-        <state vertical-scroll-proportion="0.0">
1306
-          <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
1417
+        <state vertical-scroll-proportion="-4.9117646">
1418
+          <caret line="479" column="24" selection-start-line="479" selection-start-column="20" selection-end-line="479" selection-end-column="24" />
1307 1419
           <folding>
1308
-            <element signature="e#109#110#0" expanded="true" />
1309
-            <element signature="e#130#131#0" expanded="true" />
1420
+            <element signature="method#InterfacePrincipale#0;class#InterfacePrincipale#0" expanded="false" />
1421
+            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1422
+            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1423
+            <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1424
+            <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1425
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1426
+            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1427
+            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1428
+            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1429
+            <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1430
+            <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1431
+            <element signature="method#getCategorieList#0;class#InterfacePrincipale#0" expanded="false" />
1310 1432
           </folding>
1311 1433
         </state>
1312 1434
       </provider>
1313 1435
     </entry>
1314
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1436
+    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
1437
+      <provider selected="true" editor-type-id="text-editor">
1438
+        <state vertical-scroll-proportion="0.0">
1439
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1440
+          <folding />
1441
+        </state>
1442
+      </provider>
1443
+    </entry>
1444
+    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
1315 1445
       <provider selected="true" editor-type-id="text-editor">
1316
-        <state vertical-scroll-proportion="0.33266932">
1317
-          <caret line="361" column="26" selection-start-line="361" selection-start-column="19" selection-end-line="361" selection-end-column="26" />
1446
+        <state vertical-scroll-proportion="0.6243094">
1447
+          <caret line="63" column="30" selection-start-line="63" selection-start-column="30" selection-end-line="63" selection-end-column="30" />
1318 1448
           <folding />
1319 1449
         </state>
1320 1450
       </provider>

+ 44
- 12
java/src/InterfaceGraphique/InterfacePrincipale.java ファイルの表示

@@ -63,8 +63,8 @@ public class InterfacePrincipale extends JFrame
63 63
 
64 64
 	//cst couleur
65 65
 	private static final Color ERROR_COLOR = Color.RED;
66
-	private static final Color INFO_COLOR = Color.CYAN;
67
-	private static final Color NORMAL_COLOR = Color.BLACK;
66
+	private static final Color INFO_COLOR = new Color(50,50,255);
67
+	private static final Color NORMAL_COLOR = new Color(50,50,50);
68 68
 
69 69
 	public InterfacePrincipale()
70 70
 	{
@@ -130,6 +130,7 @@ public class InterfacePrincipale extends JFrame
130 130
 		Border border = BorderFactory.createMatteBorder(3,0,0,0, new Color(220,220,220));
131 131
 		statusBar.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,70,5,70),border));
132 132
 
133
+		statusText = new JLabel();
133 134
 		statusText.setHorizontalAlignment(SwingConstants.CENTER);
134 135
 
135 136
 		config = new Bouton("Configuration", setupImg);
@@ -149,8 +150,8 @@ public class InterfacePrincipale extends JFrame
149 150
 				try
150 151
 				{
151 152
 					listC.setListData(bdd.getListeCategorie().toArray());
152
-					listR.setListData(new Vector(0));
153
-					listQ.setListData(new Vector(0));
153
+					setQuestionsPanelEnabled(false);
154
+					setReponsesPanelEnabled(false);
154 155
 					setStatusText("Connexion à la base de données établie.");
155 156
 				}
156 157
 				catch (BDDException e)
@@ -255,6 +256,8 @@ public class InterfacePrincipale extends JFrame
255 256
 		delR.addActionListener(prl);
256 257
 		editR.addActionListener(prl);
257 258
 		listR.addListSelectionListener(prl);
259
+
260
+		setReponsesPanelEnabled(false);
258 261
 	}
259 262
 
260 263
 	private void createPanelQuestion()
@@ -298,6 +301,8 @@ public class InterfacePrincipale extends JFrame
298 301
 		addQ.addActionListener(pql);
299 302
 		delQ.addActionListener(pql);
300 303
 		editQ.addActionListener(pql);
304
+
305
+		setQuestionsPanelEnabled(false);
301 306
 	}
302 307
 
303 308
 	public void modem56k()
@@ -368,6 +373,24 @@ public class InterfacePrincipale extends JFrame
368 373
 		statusText.setText(message);
369 374
 	}
370 375
 
376
+	private void setReponsesPanelEnabled(boolean active)
377
+	{
378
+		addR.setEnabled(active);
379
+		delR.setEnabled(active);
380
+		editR.setEnabled(active);
381
+		listR.setEnabled(active);
382
+		listR.setListData(new Vector(0));
383
+	}
384
+
385
+	private void setQuestionsPanelEnabled(boolean active)
386
+	{
387
+		addQ.setEnabled(active);
388
+		delQ.setEnabled(active);
389
+		editQ.setEnabled(active);
390
+		listQ.setEnabled(active);
391
+		listQ.setListData(new Vector(0));
392
+	}
393
+
371 394
 	private void reSelectCategorie(String newCatName) throws BDDException
372 395
 	{
373 396
 		Object[] tabObject = bdd.getListeCategorie().toArray();
@@ -455,7 +478,7 @@ public class InterfacePrincipale extends JFrame
455 478
 				{
456 479
 					bdd.createCategorie(catName);
457 480
 					reSelectCategorie(catName);
458
-					listQ.setListData(new Vector(0));
481
+					setQuestionsPanelEnabled(false);
459 482
 					setStatusText("La catégorie " + catName + " à bien été créée.");
460 483
 				}
461 484
 				catch (BDDException ex)
@@ -481,8 +504,8 @@ public class InterfacePrincipale extends JFrame
481 504
 					{
482 505
 						bdd.deleteCategorie(categorieName);
483 506
 						listC.setListData(bdd.getListeCategorie().toArray());
484
-						listR.setListData(new Vector(0));
485
-						listQ.setListData(new Vector(0));
507
+						setQuestionsPanelEnabled(false);
508
+						setReponsesPanelEnabled(false);
486 509
 						setStatusText("La catégorie " + categorieName + "à bien été suprimée.");
487 510
 					}
488 511
 					catch (BDDException ex)
@@ -537,8 +560,11 @@ public class InterfacePrincipale extends JFrame
537 560
 			{
538 561
 				try
539 562
 				{
540
-					listR.setListData(bdd.getListeReponses(listC.getSelectedValue().toString()).toArray());
541
-					listQ.setListData(new Vector(0));
563
+					Object[] tabRep = bdd.getListeReponses(listC.getSelectedValue().toString()).toArray();
564
+					setReponsesPanelEnabled(true);
565
+					listR.setListData(tabRep);
566
+					setQuestionsPanelEnabled(false);
567
+					setStatusText("Récupération des jeux de questions effectuée");
542 568
 				}
543 569
 				catch (BDDException ex)
544 570
 				{
@@ -594,8 +620,10 @@ public class InterfacePrincipale extends JFrame
594 620
 					try
595 621
 					{
596 622
 						bdd.deleteReponses(reponse1, reponse2);
597
-						listR.setListData(bdd.getListeReponses(listC.getSelectedValue().toString()).toArray());
598
-						listQ.setListData(new Vector(0));
623
+						Object[] tabRep = bdd.getListeReponses(listC.getSelectedValue().toString()).toArray();
624
+						setReponsesPanelEnabled(true);
625
+						listR.setListData(tabRep);
626
+						setQuestionsPanelEnabled(false);
599 627
 						setStatusText("Le jeu de réponse à bien été suprimé.");
600 628
 					}
601 629
 					catch (BDDException ex)
@@ -643,7 +671,10 @@ public class InterfacePrincipale extends JFrame
643 671
 				Reponses r = (Reponses) listR.getSelectedValue();
644 672
 				try
645 673
 				{
646
-					listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()).toArray());
674
+					Object[] tabQue = bdd.getListeQuestions(r.getReponse1(), r.getReponse2()).toArray();
675
+					setQuestionsPanelEnabled(true);
676
+					listQ.setListData(tabQue);
677
+					setStatusText("Récupération des questions effectuée");
647 678
 				}
648 679
 				catch (BDDException e)
649 680
 				{
@@ -699,6 +730,7 @@ public class InterfacePrincipale extends JFrame
699 730
 					{
700 731
 						bdd.deleteQuestion(q.getIntitule(), q.getReponse1(), q.getReponse2());
701 732
 						listQ.setListData(bdd.getListeQuestions(q.getReponse1(), q.getReponse2()).toArray());
733
+						setQuestionsPanelEnabled(true);
702 734
 						setStatusText("La question à bien été suprimée.");
703 735
 					}
704 736
 					catch (BDDException ex)

+ 1
- 1
java/src/Modele/Question.java ファイルの表示

@@ -61,6 +61,6 @@ public class Question
61 61
 			bonneReponse = reponse2;
62 62
 		}
63 63
 
64
-		return intitule + " " + bonneReponse;
64
+		return intitule + " | " + bonneReponse;
65 65
 	}
66 66
 }