babolivier
/
burger-quizz
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Activity
Bläddra i källkod

java final

PCYoshi 9 år sedan
förälder
8ae7056032
incheckning
18d2416bee
3 ändrade filer med 107 tillägg och 137 borttagningar
Delad Vy Visa Diff Statistik
  1. 18
    0
      java/.idea/misc.xml
  2. 85
    112
      java/.idea/workspace.xml
  3. 4
    25
      java/src/InterfaceGraphique/InterfacePrincipale.java

+ 18
- 0
java/.idea/misc.xml Visa fil 

@@ -41,6 +41,24 @@
41 41 
   <component name="EntryPointsManager">
42 42 
     <entry_points version="2.0" />
43 43 
   </component>
44 
+  <component name="JavadocGenerationManager">
45 
+    <option name="OUTPUT_DIRECTORY" />
46 
+    <option name="OPTION_SCOPE" value="protected" />
47 
+    <option name="OPTION_HIERARCHY" value="true" />
48 
+    <option name="OPTION_NAVIGATOR" value="true" />
49 
+    <option name="OPTION_INDEX" value="true" />
50 
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
51 
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
52 
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
53 
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
54 
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
55 
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
56 
+    <option name="OTHER_OPTIONS" value="" />
57 
+    <option name="HEAP_SIZE" />
58 
+    <option name="LOCALE" />
59 
+    <option name="OPEN_IN_BROWSER" value="true" />
60 
+    <option name="OPTION_INCLUDE_LIBS" value="false" />
61 
+  </component>
44 62 
   <component name="ProjectKey">
45 63 
     <option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />
46 64 
   </component>

+ 85
- 112
java/.idea/workspace.xml Visa fil 

@@ -7,11 +7,8 @@
7 7 
   </component>
8 8 
   <component name="ChangeListManager">
9 9 
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
11 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
12 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
13 10 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
14 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
11 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
15 12 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
16 13 
     </list>
17 14 
     <ignored path="java.iws" />
 
@@ -34,15 +31,15 @@
34 31 
   </component>
35 32 
   <component name="FileEditorManager">
36 33 
     <leaf>
37 
-      <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">
38 35 
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
39 36 
           <provider selected="true" editor-type-id="text-editor">
40 
-            <state vertical-scroll-proportion="-0.15858209">
41 
-              <caret line="367" column="35" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="35" />
37 
+            <state vertical-scroll-proportion="0.0">
38 
+              <caret line="65" column="61" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
42 39 
               <folding>
43 40 
                 <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
44 
-                <element signature="e#4910#5380#0" expanded="true" />
45 
-                <element signature="e#5379#5380#0" expanded="true" />
41 
+                <element signature="e#4847#5313#0" expanded="true" />
42 
+                <element signature="e#5312#5313#0" expanded="true" />
46 43 
                 <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
47 44 
                 <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
48 45 
                 <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -73,7 +70,7 @@
73 70 
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
74 71 
           <provider selected="true" editor-type-id="text-editor">
75 72 
             <state vertical-scroll-proportion="0.0">
76 
-              <caret line="124" column="64" selection-start-line="124" selection-start-column="64" selection-end-line="124" selection-end-column="64" />
73 
+              <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
77 74 
               <folding>
78 75 
                 <element signature="e#3462#3463#0" expanded="true" />
79 76 
                 <element signature="e#3525#3526#0" expanded="true" />
 
@@ -89,38 +86,16 @@
89 86 
               <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
90 87 
               <folding>
91 88 
                 <element signature="imports" expanded="true" />
92 
-                <element signature="e#144#145#0" expanded="true" />
93 
-                <element signature="e#174#175#0" expanded="true" />
94 
-                <element signature="e#954#955#0" expanded="true" />
95 
-                <element signature="e#994#995#0" expanded="true" />
96 
-                <element signature="e#1035#1036#0" expanded="true" />
97 
-                <element signature="e#1076#1077#0" expanded="true" />
98 
-                <element signature="e#1101#1102#0" expanded="true" />
99 
-                <element signature="e#1157#1158#0" expanded="true" />
100 
-                <element signature="e#1192#1193#0" expanded="true" />
101 
-                <element signature="e#1245#1246#0" expanded="true" />
102 
-                <element signature="e#1271#1272#0" expanded="true" />
103 
-                <element signature="e#1307#1308#0" expanded="true" />
104 
-                <element signature="e#1340#1341#0" expanded="true" />
105 
-                <element signature="e#1373#1374#0" expanded="true" />
106 
-                <element signature="e#1402#1403#0" expanded="true" />
107 
-                <element signature="e#1441#1442#0" expanded="true" />
108 
-                <element signature="e#1480#1481#0" expanded="true" />
109 
-                <element signature="e#1519#1520#0" expanded="true" />
110 
-                <element signature="e#1551#1552#0" expanded="true" />
111 
-                <element signature="e#1593#1594#0" expanded="true" />
112 
-                <element signature="e#1638#1639#0" expanded="true" />
113 
-                <element signature="e#1683#1684#0" expanded="true" />
114 89 
               </folding>
115 90 
             </state>
116 91 
           </provider>
117 92 
         </entry>
118 93 
       </file>
119 
-      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
94 
+      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="true">
120 95 
         <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
121 96 
           <provider selected="true" editor-type-id="text-editor">
122 
-            <state vertical-scroll-proportion="0.0">
123 
-              <caret line="40" column="43" selection-start-line="40" selection-start-column="43" selection-end-line="40" selection-end-column="43" />
97 
+            <state vertical-scroll-proportion="0.31716418">
98 
+              <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
124 99 
               <folding />
125 100 
             </state>
126 101 
           </provider>
 
@@ -192,9 +167,11 @@
192 167 
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
193 168 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
194 169 
         <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
195 
-        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
196 
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
170 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/W.java" />
171 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/WaitWindow.java" />
197 172 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
173 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
174 
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
198 175 
       </list>
199 176 
     </option>
200 177 
   </component>
 
@@ -313,7 +290,6 @@
313 290 
       <sortByType />
314 291 
     </navigator>
315 292 
     <panes>
316 
-      <pane id="Scratches" />
317 293 
       <pane id="PackagesPane" />
318 294 
       <pane id="ProjectPane">
319 295 
         <subPane>
 
@@ -443,6 +419,7 @@
443 419 
           </PATH>
444 420 
         </subPane>
445 421 
       </pane>
422 
+      <pane id="Scratches" />
446 423 
       <pane id="Scope" />
447 424 
     </panes>
448 425 
   </component>
 
@@ -466,12 +443,29 @@
466 443 
     <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
467 444 
     <property name="GenerateAntBuildDialog.outputFileNameProperty" value="java" />
468 445 
     <property name="SearchEverywhereHistoryKey" value="printStack&#9;null&#9;null" />
446 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="79" />
447 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
448 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="95" />
449 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
450 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="101" />
451 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
452 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="998" />
453 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
454 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="78" />
455 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
456 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="93" />
457 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
458 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="99" />
459 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
460 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1003" />
461 
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
469 462 
   </component>
470 463 
   <component name="RecentsManager">
471 464 
     <key name="ExtractSuperBase.RECENT_KEYS">
472 465 
       <recent name="" />
473 466 
     </key>
474 467 
     <key name="CreateClassDialog.RecentsKey">
468 
+      <recent name="InterfaceGraphique" />
475 469 
       <recent name="" />
476 470 
     </key>
477 471 
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
 
@@ -862,7 +856,13 @@
862 856 
       <option name="project" value="LOCAL" />
863 857 
       <updated>1433798842364</updated>
864 858 
     </task>
865 
-    <option name="localTasksCounter" value="37" />
859 
+    <task id="LOCAL-00037" summary="splashscreen créé + .jar compilé">
860 
+      <created>1433860709572</created>
861 
+      <option name="number" value="00037" />
862 
+      <option name="project" value="LOCAL" />
863 
+      <updated>1433860709572</updated>
864 
+    </task>
865 
+    <option name="localTasksCounter" value="38" />
866 866 
     <servers />
867 867 
   </component>
868 868 
   <component name="TodoView">
 
@@ -899,8 +899,8 @@
899 899 
       <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" />
900 900 
       <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" />
901 901 
       <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" />
902 
-      <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" />
903 902 
       <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" />
903 
+      <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" />
904 904 
     </layout>
905 905 
   </component>
906 906 
   <component name="Vcs.Log.UiProperties">
 
@@ -956,11 +956,6 @@
956 956 
     <option name="FILTER_TARGETS" value="false" />
957 957 
   </component>
958 958 
   <component name="editorHistoryManager">
959 
-    <entry file="file://$PROJECT_DIR$/mcd.png">
960 
-      <provider selected="true" editor-type-id="images">
961 
-        <state />
962 
-      </provider>
963 
-    </entry>
964 959 
     <entry file="file://$PROJECT_DIR$/java.png">
965 960 
       <provider selected="true" editor-type-id="images">
966 961 
         <state />
 
@@ -972,8 +967,8 @@
972 967 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
973 968 
           <folding>
974 969 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
975 
-            <element signature="e#4910#5380#0" expanded="true" />
976 
-            <element signature="e#5379#5380#0" expanded="true" />
970 
+            <element signature="e#4847#5313#0" expanded="true" />
971 
+            <element signature="e#5312#5313#0" expanded="true" />
977 972 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
978 973 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
979 974 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1029,8 +1024,8 @@
1029 1024 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1030 1025 
           <folding>
1031 1026 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1032 
-            <element signature="e#4910#5380#0" expanded="true" />
1033 
-            <element signature="e#5379#5380#0" expanded="true" />
1027 
+            <element signature="e#4847#5313#0" expanded="true" />
1028 
+            <element signature="e#5312#5313#0" expanded="true" />
1034 1029 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1035 1030 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1036 1031 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1086,8 +1081,8 @@
1086 1081 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1087 1082 
           <folding>
1088 1083 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1089 
-            <element signature="e#4910#5380#0" expanded="true" />
1090 
-            <element signature="e#5379#5380#0" expanded="true" />
1084 
+            <element signature="e#4847#5313#0" expanded="true" />
1085 
+            <element signature="e#5312#5313#0" expanded="true" />
1091 1086 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1092 1087 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1093 1088 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1143,8 +1138,8 @@
1143 1138 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1144 1139 
           <folding>
1145 1140 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1146 
-            <element signature="e#4910#5380#0" expanded="true" />
1147 
-            <element signature="e#5379#5380#0" expanded="true" />
1141 
+            <element signature="e#4847#5313#0" expanded="true" />
1142 
+            <element signature="e#5312#5313#0" expanded="true" />
1148 1143 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1149 1144 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1150 1145 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1200,8 +1195,8 @@
1200 1195 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1201 1196 
           <folding>
1202 1197 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1203 
-            <element signature="e#4910#5380#0" expanded="true" />
1204 
-            <element signature="e#5379#5380#0" expanded="true" />
1198 
+            <element signature="e#4847#5313#0" expanded="true" />
1199 
+            <element signature="e#5312#5313#0" expanded="true" />
1205 1200 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1206 1201 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1207 1202 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1278,8 +1273,8 @@
1278 1273 
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1279 1274 
           <folding>
1280 1275 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1281 
-            <element signature="e#4910#5380#0" expanded="true" />
1282 
-            <element signature="e#5379#5380#0" expanded="true" />
1276 
+            <element signature="e#4847#5313#0" expanded="true" />
1277 
+            <element signature="e#5312#5313#0" expanded="true" />
1283 1278 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1284 1279 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1285 1280 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1421,65 +1416,14 @@
1421 1416 
         </state>
1422 1417 
       </provider>
1423 1418 
     </entry>
1424 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1425 
-      <provider selected="true" editor-type-id="text-editor">
1426 
-        <state vertical-scroll-proportion="0.0">
1427 
-          <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
1428 
-          <folding>
1429 
-            <element signature="imports" expanded="true" />
1430 
-            <element signature="e#144#145#0" expanded="true" />
1431 
-            <element signature="e#174#175#0" expanded="true" />
1432 
-            <element signature="e#954#955#0" expanded="true" />
1433 
-            <element signature="e#994#995#0" expanded="true" />
1434 
-            <element signature="e#1035#1036#0" expanded="true" />
1435 
-            <element signature="e#1076#1077#0" expanded="true" />
1436 
-            <element signature="e#1101#1102#0" expanded="true" />
1437 
-            <element signature="e#1157#1158#0" expanded="true" />
1438 
-            <element signature="e#1192#1193#0" expanded="true" />
1439 
-            <element signature="e#1245#1246#0" expanded="true" />
1440 
-            <element signature="e#1271#1272#0" expanded="true" />
1441 
-            <element signature="e#1307#1308#0" expanded="true" />
1442 
-            <element signature="e#1340#1341#0" expanded="true" />
1443 
-            <element signature="e#1373#1374#0" expanded="true" />
1444 
-            <element signature="e#1402#1403#0" expanded="true" />
1445 
-            <element signature="e#1441#1442#0" expanded="true" />
1446 
-            <element signature="e#1480#1481#0" expanded="true" />
1447 
-            <element signature="e#1519#1520#0" expanded="true" />
1448 
-            <element signature="e#1551#1552#0" expanded="true" />
1449 
-            <element signature="e#1593#1594#0" expanded="true" />
1450 
-            <element signature="e#1638#1639#0" expanded="true" />
1451 
-            <element signature="e#1683#1684#0" expanded="true" />
1452 
-          </folding>
1453 
-        </state>
1454 
-      </provider>
1455 
-    </entry>
1456 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1457 
-      <provider selected="true" editor-type-id="text-editor">
1458 
-        <state vertical-scroll-proportion="0.0">
1459 
-          <caret line="40" column="43" selection-start-line="40" selection-start-column="43" selection-end-line="40" selection-end-column="43" />
1460 
-          <folding />
1461 
-        </state>
1462 
-      </provider>
1463 
-    </entry>
1464 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1465 
-      <provider selected="true" editor-type-id="text-editor">
1466 
-        <state vertical-scroll-proportion="0.0">
1467 
-          <caret line="124" column="64" selection-start-line="124" selection-start-column="64" selection-end-line="124" selection-end-column="64" />
1468 
-          <folding>
1469 
-            <element signature="e#3462#3463#0" expanded="true" />
1470 
-            <element signature="e#3525#3526#0" expanded="true" />
1471 
-          </folding>
1472 
-        </state>
1473 
-      </provider>
1474 
-    </entry>
1475 1419 
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1476 1420 
       <provider selected="true" editor-type-id="text-editor">
1477 
-        <state vertical-scroll-proportion="-0.15858209">
1478 
-          <caret line="367" column="35" selection-start-line="367" selection-start-column="35" selection-end-line="367" selection-end-column="35" />
1421 
+        <state vertical-scroll-proportion="0.0">
1422 
+          <caret line="65" column="61" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
1479 1423 
           <folding>
1480 1424 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1481 
-            <element signature="e#4910#5380#0" expanded="true" />
1482 
-            <element signature="e#5379#5380#0" expanded="true" />
1425 
+            <element signature="e#4847#5313#0" expanded="true" />
1426 
+            <element signature="e#5312#5313#0" expanded="true" />
1483 1427 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1484 1428 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1485 1429 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1505,6 +1449,35 @@
1505 1449 
         </state>
1506 1450 
       </provider>
1507 1451 
     </entry>
1452 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1453 
+      <provider selected="true" editor-type-id="text-editor">
1454 
+        <state vertical-scroll-proportion="0.0">
1455 
+          <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
1456 
+          <folding>
1457 
+            <element signature="e#3462#3463#0" expanded="true" />
1458 
+            <element signature="e#3525#3526#0" expanded="true" />
1459 
+          </folding>
1460 
+        </state>
1461 
+      </provider>
1462 
+    </entry>
1463 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1464 
+      <provider selected="true" editor-type-id="text-editor">
1465 
+        <state vertical-scroll-proportion="0.0">
1466 
+          <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
1467 
+          <folding>
1468 
+            <element signature="imports" expanded="true" />
1469 
+          </folding>
1470 
+        </state>
1471 
+      </provider>
1472 
+    </entry>
1473 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1474 
+      <provider selected="true" editor-type-id="text-editor">
1475 
+        <state vertical-scroll-proportion="0.31716418">
1476 
+          <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
1477 
+          <folding />
1478 
+        </state>
1479 
+      </provider>
1480 
+    </entry>
1508 1481 
   </component>
1509 1482 
   <component name="masterDetails">
1510 1483 
     <states>

+ 4
- 25
java/src/InterfaceGraphique/InterfacePrincipale.java Visa fil 

@@ -64,7 +64,6 @@ public class InterfacePrincipale extends JFrame
64 64 
 	private static final Color ERROR_COLOR = Color.RED;
65 65 
 	private static final Color INFO_COLOR = new Color(50,50,255);
66 66 
 	private static final Color NORMAL_COLOR = new Color(50,50,50);
67 
-	private static final Color WAITING_COLOR = Color.ORANGE;
68 67
69 68 
 	public InterfacePrincipale()
70 69 
 	{
 
@@ -76,7 +75,7 @@ public class InterfacePrincipale extends JFrame
76 75 
 		bdd = new ConnexionBDD();
77 76
78 77 
 		splashScreen.setLoadingProgress(SplashScreen.LOADING_BDD_CONNECT);
79 
-		tryToConnect(false);
78 
+		tryToConnect();
80 79
81 80 
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
82 81 
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -158,7 +157,7 @@ public class InterfacePrincipale extends JFrame
158 157 
 			public void actionPerformed(ActionEvent actionEvent) {
159 158 
 				if(configureBDD(false))
160 159 
 				{
161 
-					tryToConnect(true);
160 
+					tryToConnect();
162 161 
 					try
163 162 
 					{
164 163 
 						listC.setListData(bdd.getListeCategorie().toArray());
 
@@ -365,33 +364,13 @@ public class InterfacePrincipale extends JFrame
365 364 
 		}
366 365 
 	}
367 366
368 
-	private class W extends JWindow
369 
-	{
370 
-		public W(Frame owner) {
371 
-			super(owner);
372 
-			JLabel t = new JLabel("Connexion en cours...", plusImg, SwingConstants.CENTER);
373 
-			JPanel p = new JPanel();
374 
-			p.add(t);
375 
-			p.setBackground(Color.RED);
376 
-			setContentPane(p);
377 
-			pack();
378 
-			setLocationRelativeTo(null);
379 
-			setVisible(true);
380 
-		}
381 
-	}
382 
-
383 
-	private void tryToConnect(boolean showInStatusBar)
367 
+	private void tryToConnect()
384 368 
 	{
385 369 
 		boolean conOK = false;
386 370 
 		do
387 371 
 		{
388 
-			if(showInStatusBar)
389 
-			{
390 
-				//setStatusText("Tentative de connexion à la base de données...", WAITING_COLOR);
391 
-			}
392 
-			W  w = new W(this);
393 372 
 			conOK = bdd.connect(configBDD.getNomBdd(), configBDD.getPort(), configBDD.getIp(), configBDD.getLogin(), configBDD.getPassword());
394 
-			w.dispose();
373 
+
395 374 
 			if(conOK == false)
396 375 
 			{
397 376 
 				JOptionPane.showMessageDialog(this, "Impossible d'établir la connexion à la base de données.", "Erreur conexion base de données", JOptionPane.ERROR_MESSAGE);