babolivier
/
burger-quizz
Volgen 1
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

splashscreen créé + .jar compilé

PCYoshi 9 jaren geleden
bovenliggende
06049d0ede
commit
8ae7056032
6 gewijzigde bestanden met toevoegingen van 218 en 214 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 168
    195
      java/.idea/workspace.xml
  2. 1
    1
      java/src/GestionBddDAO/ConfigBDD.java
  3. 2
    1
      java/src/GestionBddDAO/ConnexionBDD.java
  4. 2
    2
      java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java
  5. 43
    14
      java/src/InterfaceGraphique/InterfacePrincipale.java
  6. 2
    1
      java/src/InterfaceGraphique/SplashScreen.java

+ 168
- 195
java/.idea/workspace.xml Bestand weergeven 

@@ -7,6 +7,11 @@
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 
+      <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" />
10 15 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
11 16 
     </list>
12 17 
     <ignored path="java.iws" />
 
@@ -29,20 +34,20 @@
29 34 
   </component>
30 35 
   <component name="FileEditorManager">
31 36 
     <leaf>
32 
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
37 
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
33 38 
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
34 39 
           <provider selected="true" editor-type-id="text-editor">
35 
-            <state vertical-scroll-proportion="-4.5882354">
36 
-              <caret line="81" column="8" selection-start-line="81" selection-start-column="8" selection-end-line="81" selection-end-column="8" />
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 42 
               <folding>
38 43 
                 <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
39 
-                <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
44 
+                <element signature="e#4910#5380#0" expanded="true" />
45 
+                <element signature="e#5379#5380#0" expanded="true" />
40 46 
                 <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
41 47 
                 <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
42 48 
                 <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
49 
+                <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
43 50 
                 <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
44 
-                <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
45 
-                <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
46 51 
                 <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
47 52 
                 <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
48 53 
                 <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -64,11 +69,68 @@
64 69 
           </provider>
65 70 
         </entry>
66 71 
       </file>
67 
-      <file leaf-file-name="SplashScreen.java" pinned="false" current-in-tab="true">
72 
+      <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="false">
73 
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
74 
+          <provider selected="true" editor-type-id="text-editor">
75 
+            <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" />
77 
+              <folding>
78 
+                <element signature="e#3462#3463#0" expanded="true" />
79 
+                <element signature="e#3525#3526#0" expanded="true" />
80 
+              </folding>
81 
+            </state>
82 
+          </provider>
83 
+        </entry>
84 
+      </file>
85 
+      <file leaf-file-name="ConfigBDD.java" pinned="false" current-in-tab="false">
86 
+        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
87 
+          <provider selected="true" editor-type-id="text-editor">
88 
+            <state vertical-scroll-proportion="0.0">
89 
+              <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
90 
+              <folding>
91 
+                <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 
+              </folding>
115 
+            </state>
116 
+          </provider>
117 
+        </entry>
118 
+      </file>
119 
+      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
120 
+        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
121 
+          <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" />
124 
+              <folding />
125 
+            </state>
126 
+          </provider>
127 
+        </entry>
128 
+      </file>
129 
+      <file leaf-file-name="SplashScreen.java" pinned="false" current-in-tab="false">
68 130 
         <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java">
69 131 
           <provider selected="true" editor-type-id="text-editor">
70 
-            <state vertical-scroll-proportion="0.08563536">
71 
-              <caret line="32" column="67" selection-start-line="32" selection-start-column="67" selection-end-line="32" selection-end-column="67" />
132 
+            <state vertical-scroll-proportion="0.0">
133 
+              <caret line="44" column="34" selection-start-line="44" selection-start-column="34" selection-end-line="44" selection-end-column="34" />
72 134 
               <folding>
73 135 
                 <element signature="imports" expanded="true" />
74 136 
               </folding>
 
@@ -118,9 +180,7 @@
118 180 
         <option value="$PROJECT_DIR$/src/DialogBoxes/NouvelleReponseDialog.java" />
119 181 
         <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
120 182 
         <option value="$PROJECT_DIR$/src/Modele/ConfigBDD.java" />
121 
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
122 183 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
123 
-        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
124 184 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/BDDException.java" />
125 185 
         <option value="$PROJECT_DIR$/src/BDDException.java" />
126 186 
         <option value="$PROJECT_DIR$/src/TOTo.java" />
 
@@ -128,11 +188,13 @@
128 188 
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
129 189 
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
130 190 
         <option value="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" />
131 
-        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
132 191 
         <option value="$PROJECT_DIR$/src/Modele/Question.java" />
133 192 
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
134 
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
135 193 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
194 
+        <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" />
197 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
136 198 
       </list>
137 199 
     </option>
138 200 
   </component>
 
@@ -251,7 +313,6 @@
251 313 
       <sortByType />
252 314 
     </navigator>
253 315 
     <panes>
254 
-      <pane id="Scope" />
255 316 
       <pane id="Scratches" />
256 317 
       <pane id="PackagesPane" />
257 318 
       <pane id="ProjectPane">
 
@@ -382,6 +443,7 @@
382 443 
           </PATH>
383 444 
         </subPane>
384 445 
       </pane>
446 
+      <pane id="Scope" />
385 447 
     </panes>
386 448 
   </component>
387 449 
   <component name="PropertiesComponent">
 
@@ -419,122 +481,6 @@
419 481 
       <recent name="DialogBoxes" />
420 482 
     </key>
421 483 
   </component>
422 
-  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
423 
-    <UpdatedFiles>
424 
-      <FILE-GROUP>
425 
-        <option name="myUpdateName" value="Updated from server" />
426 
-        <option name="myStatusName" value="Changed on server" />
427 
-        <option name="mySupportsDeletion" value="false" />
428 
-        <option name="myCanBeAbsent" value="false" />
429 
-        <option name="myId" value="CHANGED_ON_SERVER" />
430 
-        <FILE-GROUP>
431 
-          <option name="myUpdateName" value="Updated" />
432 
-          <option name="myStatusName" value="Changed" />
433 
-          <option name="mySupportsDeletion" value="false" />
434 
-          <option name="myCanBeAbsent" value="false" />
435 
-          <option name="myId" value="UPDATED" />
436 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/css/main.css</PATH>
437 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/index.htm</PATH>
438 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/play.htm</PATH>
439 
-        </FILE-GROUP>
440 
-        <FILE-GROUP>
441 
-          <option name="myUpdateName" value="Created" />
442 
-          <option name="myStatusName" value="Created" />
443 
-          <option name="mySupportsDeletion" value="false" />
444 
-          <option name="myCanBeAbsent" value="false" />
445 
-          <option name="myId" value="CREATED" />
446 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/assets/burger-menu.png</PATH>
447 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/jquery-2.1.4.min.js</PATH>
448 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/responsive.js</PATH>
449 
-        </FILE-GROUP>
450 
-        <FILE-GROUP>
451 
-          <option name="myUpdateName" value="Deleted" />
452 
-          <option name="myStatusName" value="Deleted" />
453 
-          <option name="mySupportsDeletion" value="false" />
454 
-          <option name="myCanBeAbsent" value="true" />
455 
-          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
456 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/jquery-2.1.4.min.js</PATH>
457 
-        </FILE-GROUP>
458 
-        <FILE-GROUP>
459 
-          <option name="myUpdateName" value="Restored" />
460 
-          <option name="myStatusName" value="Will be restored" />
461 
-          <option name="mySupportsDeletion" value="false" />
462 
-          <option name="myCanBeAbsent" value="false" />
463 
-          <option name="myId" value="RESTORED" />
464 
-        </FILE-GROUP>
465 
-      </FILE-GROUP>
466 
-      <FILE-GROUP>
467 
-        <option name="myUpdateName" value="Modified" />
468 
-        <option name="myStatusName" value="Modified" />
469 
-        <option name="mySupportsDeletion" value="false" />
470 
-        <option name="myCanBeAbsent" value="false" />
471 
-        <option name="myId" value="MODIFIED" />
472 
-      </FILE-GROUP>
473 
-      <FILE-GROUP>
474 
-        <option name="myUpdateName" value="Skipped" />
475 
-        <option name="myStatusName" value="Skipped" />
476 
-        <option name="mySupportsDeletion" value="false" />
477 
-        <option name="myCanBeAbsent" value="false" />
478 
-        <option name="myId" value="SKIPPED" />
479 
-      </FILE-GROUP>
480 
-      <FILE-GROUP>
481 
-        <option name="myUpdateName" value="Merged with conflicts" />
482 
-        <option name="myStatusName" value="Will be merged with conflicts" />
483 
-        <option name="mySupportsDeletion" value="false" />
484 
-        <option name="myCanBeAbsent" value="false" />
485 
-        <option name="myId" value="MERGED_WITH_CONFLICTS" />
486 
-      </FILE-GROUP>
487 
-      <FILE-GROUP>
488 
-        <option name="myUpdateName" value="Merged with tree conflicts" />
489 
-        <option name="myStatusName" value="Merged with tree conflicts" />
490 
-        <option name="mySupportsDeletion" value="false" />
491 
-        <option name="myCanBeAbsent" value="false" />
492 
-        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
493 
-      </FILE-GROUP>
494 
-      <FILE-GROUP>
495 
-        <option name="myUpdateName" value="Merged with property conflicts" />
496 
-        <option name="myStatusName" value="Will be merged with property conflicts" />
497 
-        <option name="mySupportsDeletion" value="false" />
498 
-        <option name="myCanBeAbsent" value="false" />
499 
-        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
500 
-      </FILE-GROUP>
501 
-      <FILE-GROUP>
502 
-        <option name="myUpdateName" value="Merged" />
503 
-        <option name="myStatusName" value="Will be merged" />
504 
-        <option name="mySupportsDeletion" value="false" />
505 
-        <option name="myCanBeAbsent" value="false" />
506 
-        <option name="myId" value="MERGED" />
507 
-      </FILE-GROUP>
508 
-      <FILE-GROUP>
509 
-        <option name="myUpdateName" value="Not in repository" />
510 
-        <option name="myStatusName" value="Not in repository" />
511 
-        <option name="mySupportsDeletion" value="true" />
512 
-        <option name="myCanBeAbsent" value="false" />
513 
-        <option name="myId" value="UNKNOWN" />
514 
-      </FILE-GROUP>
515 
-      <FILE-GROUP>
516 
-        <option name="myUpdateName" value="Locally added" />
517 
-        <option name="myStatusName" value="Locally added" />
518 
-        <option name="mySupportsDeletion" value="false" />
519 
-        <option name="myCanBeAbsent" value="false" />
520 
-        <option name="myId" value="LOCALLY_ADDED" />
521 
-      </FILE-GROUP>
522 
-      <FILE-GROUP>
523 
-        <option name="myUpdateName" value="Locally removed" />
524 
-        <option name="myStatusName" value="Locally removed" />
525 
-        <option name="mySupportsDeletion" value="false" />
526 
-        <option name="myCanBeAbsent" value="false" />
527 
-        <option name="myId" value="LOCALLY_REMOVED" />
528 
-      </FILE-GROUP>
529 
-      <FILE-GROUP>
530 
-        <option name="myUpdateName" value="Switched" />
531 
-        <option name="myStatusName" value="Switched" />
532 
-        <option name="mySupportsDeletion" value="false" />
533 
-        <option name="myCanBeAbsent" value="false" />
534 
-        <option name="myId" value="SWITCHED" />
535 
-      </FILE-GROUP>
536 
-    </UpdatedFiles>
537 
-  </component>
538 484 
   <component name="RunManager" selected="Application.Main">
539 485 
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
540 486 
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 
@@ -910,7 +856,13 @@
910 856 
       <option name="project" value="LOCAL" />
911 857 
       <updated>1433798659423</updated>
912 858 
     </task>
913 
-    <option name="localTasksCounter" value="36" />
859 
+    <task id="LOCAL-00036" summary="splashscreen créé + .jar compilé">
860 
+      <created>1433798842364</created>
861 
+      <option name="number" value="00036" />
862 
+      <option name="project" value="LOCAL" />
863 
+      <updated>1433798842364</updated>
864 
+    </task>
865 
+    <option name="localTasksCounter" value="37" />
914 866 
     <servers />
915 867 
   </component>
916 868 
   <component name="TodoView">
 
@@ -943,7 +895,7 @@
943 895 
       <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" />
944 896 
       <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="10" side_tool="false" content_ui="tabs" />
945 897 
       <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" />
946 
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30579966" sideWeight="0.49544072" order="6" side_tool="false" content_ui="tabs" />
898 
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30579966" sideWeight="0.49544072" order="6" side_tool="false" content_ui="tabs" />
947 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" />
948 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" />
949 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" />
 
@@ -963,7 +915,6 @@
963 915 
     <option name="myLimit" value="2678400000" />
964 916 
   </component>
965 917 
   <component name="VcsManagerConfiguration">
966 
-    <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
967 918 
     <MESSAGE value="les boutons ecoutent" />
968 919 
     <MESSAGE value="conexion bdd operationelle et avance classe de base" />
969 920 
     <MESSAGE value="selection categorie fonctionelle" />
 
@@ -988,14 +939,15 @@
988 939 
     <MESSAGE value="barre de statut opérationelle" />
989 940 
     <MESSAGE value="grisgae panneaux opérationel" />
990 941 
     <MESSAGE value="splashscreen créé" />
991 
-    <option name="LAST_COMMIT_MESSAGE" value="splashscreen créé" />
942 
+    <MESSAGE value="splashscreen créé + .jar compilé" />
943 
+    <option name="LAST_COMMIT_MESSAGE" value="splashscreen créé + .jar compilé" />
992 944 
   </component>
993 945 
   <component name="XDebuggerManager">
994 946 
     <breakpoint-manager>
995 947 
       <breakpoints-dialog>
996 948 
         <breakpoints-dialog />
997 949 
       </breakpoints-dialog>
998 
-      <option name="time" value="36" />
950 
+      <option name="time" value="38" />
999 951 
     </breakpoint-manager>
1000 952 
     <watches-manager />
1001 953 
   </component>
 
@@ -1020,13 +972,13 @@
1020 972 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1021 973 
           <folding>
1022 974 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1023 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
975 
+            <element signature="e#4910#5380#0" expanded="true" />
976 
+            <element signature="e#5379#5380#0" expanded="true" />
1024 977 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1025 978 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1026 979 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
980 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1027 981 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1028 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1029 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1030 982 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1031 983 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1032 984 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1077,13 +1029,13 @@
1077 1029 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1078 1030 
           <folding>
1079 1031 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1080 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1032 
+            <element signature="e#4910#5380#0" expanded="true" />
1033 
+            <element signature="e#5379#5380#0" expanded="true" />
1081 1034 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1082 1035 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1083 1036 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1037 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1084 1038 
             <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 1039 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1088 1040 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1089 1041 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1134,13 +1086,13 @@
1134 1086 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1135 1087 
           <folding>
1136 1088 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1137 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1089 
+            <element signature="e#4910#5380#0" expanded="true" />
1090 
+            <element signature="e#5379#5380#0" expanded="true" />
1138 1091 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1139 1092 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1140 1093 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1094 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1141 1095 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1142 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1143 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1144 1096 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1145 1097 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1146 1098 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1191,13 +1143,13 @@
1191 1143 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1192 1144 
           <folding>
1193 1145 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1194 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1146 
+            <element signature="e#4910#5380#0" expanded="true" />
1147 
+            <element signature="e#5379#5380#0" expanded="true" />
1195 1148 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1196 1149 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1197 1150 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1151 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1198 1152 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1199 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1200 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1201 1153 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1202 1154 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1203 1155 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1248,13 +1200,13 @@
1248 1200 
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1249 1201 
           <folding>
1250 1202 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1251 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1203 
+            <element signature="e#4910#5380#0" expanded="true" />
1204 
+            <element signature="e#5379#5380#0" expanded="true" />
1252 1205 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1253 1206 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1254 1207 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1208 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1255 1209 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1256 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1257 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1258 1210 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1259 1211 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1260 1212 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1326,13 +1278,13 @@
1326 1278 
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1327 1279 
           <folding>
1328 1280 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1329 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1281 
+            <element signature="e#4910#5380#0" expanded="true" />
1282 
+            <element signature="e#5379#5380#0" expanded="true" />
1330 1283 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1331 1284 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1332 1285 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1286 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1333 1287 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1334 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1335 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1336 1288 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1337 1289 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1338 1290 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1385,20 +1337,6 @@
1385 1337 
         </state>
1386 1338 
       </provider>
1387 1339 
     </entry>
1388 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1389 
-      <provider selected="true" editor-type-id="text-editor">
1390 
-        <state vertical-scroll-proportion="-2.3283582">
1391 
-          <caret line="38" column="47" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="47" />
1392 
-        </state>
1393 
-      </provider>
1394 
-    </entry>
1395 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1396 
-      <provider selected="true" editor-type-id="text-editor">
1397 
-        <state vertical-scroll-proportion="2.2111554">
1398 
-          <caret line="72" column="13" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
1399 
-        </state>
1400 
-      </provider>
1401 
-    </entry>
1402 1340 
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1403 1341 
       <provider selected="true" editor-type-id="text-editor">
1404 1342 
         <state vertical-scroll-proportion="0.45816734">
 
@@ -1417,7 +1355,6 @@
1417 1355 
       <provider selected="true" editor-type-id="text-editor">
1418 1356 
         <state vertical-scroll-proportion="0.41231343">
1419 1357 
           <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1420 
-          <folding />
1421 1358 
         </state>
1422 1359 
       </provider>
1423 1360 
     </entry>
 
@@ -1425,7 +1362,6 @@
1425 1362 
       <provider selected="true" editor-type-id="text-editor">
1426 1363 
         <state vertical-scroll-proportion="1.4757463">
1427 1364 
           <caret line="112" column="144" selection-start-line="112" selection-start-column="144" selection-end-line="112" selection-end-column="144" />
1428 
-          <folding />
1429 1365 
         </state>
1430 1366 
       </provider>
1431 1367 
     </entry>
 
@@ -1433,7 +1369,6 @@
1433 1369 
       <provider selected="true" editor-type-id="text-editor">
1434 1370 
         <state vertical-scroll-proportion="0.5242537">
1435 1371 
           <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
1436 
-          <folding />
1437 1372 
         </state>
1438 1373 
       </provider>
1439 1374 
     </entry>
 
@@ -1441,9 +1376,6 @@
1441 1376 
       <provider selected="true" editor-type-id="text-editor">
1442 1377 
         <state vertical-scroll-proportion="0.0">
1443 1378 
           <caret line="83" column="44" selection-start-line="83" selection-start-column="44" selection-end-line="83" selection-end-column="44" />
1444 
-          <folding>
1445 
-            <element signature="imports" expanded="true" />
1446 
-          </folding>
1447 1379 
         </state>
1448 1380 
       </provider>
1449 1381 
     </entry>
 
@@ -1451,7 +1383,6 @@
1451 1383 
       <provider selected="true" editor-type-id="text-editor">
1452 1384 
         <state vertical-scroll-proportion="0.0">
1453 1385 
           <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1454 
-          <folding />
1455 1386 
         </state>
1456 1387 
       </provider>
1457 1388 
     </entry>
 
@@ -1469,39 +1400,91 @@
1469 1400 
       <provider selected="true" editor-type-id="text-editor">
1470 1401 
         <state vertical-scroll-proportion="0.15858209">
1471 1402 
           <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
1403 
+        </state>
1404 
+      </provider>
1405 
+    </entry>
1406 
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1407 
+      <provider selected="true" editor-type-id="text-editor">
1408 
+        <state vertical-scroll-proportion="0.42265195">
1409 
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
1472 1410 
           <folding />
1473 1411 
         </state>
1474 1412 
       </provider>
1475 1413 
     </entry>
1414 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java">
1415 
+      <provider selected="true" editor-type-id="text-editor">
1416 
+        <state vertical-scroll-proportion="0.0">
1417 
+          <caret line="44" column="34" selection-start-line="44" selection-start-column="34" selection-end-line="44" selection-end-column="34" />
1418 
+          <folding>
1419 
+            <element signature="imports" expanded="true" />
1420 
+          </folding>
1421 
+        </state>
1422 
+      </provider>
1423 
+    </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>
1476 1456 
     <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1477 1457 
       <provider selected="true" editor-type-id="text-editor">
1478 
-        <state vertical-scroll-proportion="0.5391791">
1479 
-          <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
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" />
1480 1460 
           <folding />
1481 1461 
         </state>
1482 1462 
       </provider>
1483 1463 
     </entry>
1484 
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1464 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1485 1465 
       <provider selected="true" editor-type-id="text-editor">
1486 
-        <state vertical-scroll-proportion="0.65745854">
1487 
-          <caret line="16" column="52" selection-start-line="9" selection-start-column="8" selection-end-line="16" selection-end-column="52" />
1488 
-          <folding />
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>
1489 1472 
         </state>
1490 1473 
       </provider>
1491 1474 
     </entry>
1492 1475 
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1493 1476 
       <provider selected="true" editor-type-id="text-editor">
1494 
-        <state vertical-scroll-proportion="-4.5882354">
1495 
-          <caret line="81" column="8" selection-start-line="81" selection-start-column="8" selection-end-line="81" selection-end-column="8" />
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" />
1496 1479 
           <folding>
1497 1480 
             <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1498 
-            <element signature="method#createStatusBar#0;class#InterfacePrincipale#0" expanded="false" />
1481 
+            <element signature="e#4910#5380#0" expanded="true" />
1482 
+            <element signature="e#5379#5380#0" expanded="true" />
1499 1483 
             <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1500 1484 
             <element signature="method#createPanelReponses#0;class#InterfacePrincipale#0" expanded="false" />
1501 1485 
             <element signature="method#createPanelQuestion#0;class#InterfacePrincipale#0" expanded="false" />
1486 
+            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1502 1487 
             <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1503 
-            <element signature="method#configureBDD#0;class#InterfacePrincipale#0" expanded="false" />
1504 
-            <element signature="method#tryToConnect#0;class#InterfacePrincipale#0" expanded="false" />
1505 1488 
             <element signature="method#setStatusText#0;class#InterfacePrincipale#0" expanded="false" />
1506 1489 
             <element signature="method#setStatusText#1;class#InterfacePrincipale#0" expanded="false" />
1507 1490 
             <element signature="method#setReponsesPanelEnabled#0;class#InterfacePrincipale#0" expanded="false" />
 
@@ -1522,16 +1505,6 @@
1522 1505 
         </state>
1523 1506 
       </provider>
1524 1507 
     </entry>
1525 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java">
1526 
-      <provider selected="true" editor-type-id="text-editor">
1527 
-        <state vertical-scroll-proportion="0.08563536">
1528 
-          <caret line="32" column="67" selection-start-line="32" selection-start-column="67" selection-end-line="32" selection-end-column="67" />
1529 
-          <folding>
1530 
-            <element signature="imports" expanded="true" />
1531 
-          </folding>
1532 
-        </state>
1533 
-      </provider>
1534 
-    </entry>
1535 1508 
   </component>
1536 1509 
   <component name="masterDetails">
1537 1510 
     <states>

+ 1
- 1
java/src/GestionBddDAO/ConfigBDD.java Bestand weergeven 

@@ -62,7 +62,7 @@ public class ConfigBDD
62 62 
 		return Integer.parseInt(conf.getProperty("port"));
63 63 
 	}
64 64
65 
-	public void setPort(int port) {
65 
+	public void setPort(long port) {
66 66 
 		conf.setProperty("port", String.valueOf(port));
67 67 
 	}
68 68

+ 2
- 1
java/src/GestionBddDAO/ConnexionBDD.java Bestand weergeven 

@@ -33,11 +33,12 @@ public class ConnexionBDD
33 33 
 		}
34 34 
 	}
35 35
36 
-	public boolean connect(String nomBdd, int port, String ip, String login, String password)
36 
+	public boolean connect(String nomBdd, long port, String ip, String login, String password)
37 37 
 	{
38 38 
 		try
39 39 
 		{
40 40 
 			String url = "jdbc:mysql://" + ip + ":" + port + "/" + nomBdd;
41 
+			DriverManager.setLoginTimeout(5);
41 42 
 			connexionbdd = DriverManager.getConnection(url, login, password);
42 43
43 44 
 			gestionCategories = new GestionCategories(connexionbdd);

+ 2
- 2
java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java Bestand weergeven 

@@ -32,7 +32,7 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
32 32 
 	private void createInterface(String defNomBdd, int defPort, String defIP, String defLogin, String defPassword, boolean showExitButton)
33 33 
 	{
34 34 
 		nomBdd = new JTextField(defNomBdd, 30);
35 
-		port = new JFormattedTextField(NumberFormat.getInstance());
35 
+		port = new JFormattedTextField(NumberFormat.getIntegerInstance());
36 36 
 		port.setValue(defPort);
37 37 
 		ip = new JTextField(defIP, 30);
38 38 
 		login = new JTextField(defLogin, 30);
 
@@ -122,7 +122,7 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
122 122 
 	}
123 123
124 124 
 	public int getPort() {
125 
-		return (int) port.getValue();
125 
+		return Integer.parseInt(String.valueOf(port.getValue()));
126 126 
 	}
127 127
128 128 
 	public String getIp() {

+ 43
- 14
java/src/InterfaceGraphique/InterfacePrincipale.java Bestand weergeven 

@@ -64,6 +64,7 @@ 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;
67 68
68 69 
 	public InterfacePrincipale()
69 70 
 	{
 
@@ -75,7 +76,7 @@ public class InterfacePrincipale extends JFrame
75 76 
 		bdd = new ConnexionBDD();
76 77
77 78 
 		splashScreen.setLoadingProgress(SplashScreen.LOADING_BDD_CONNECT);
78 
-		tryToConnect();
79 
+		tryToConnect(false);
79 80
80 81 
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
81 82 
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -155,18 +156,20 @@ public class InterfacePrincipale extends JFrame
155 156
156 157 
 		config.addActionListener(new ActionListener() {
157 158 
 			public void actionPerformed(ActionEvent actionEvent) {
158 
-				configureBDD(false);
159 
-				tryToConnect();
160 
-				try
161 
-				{
162 
-					listC.setListData(bdd.getListeCategorie().toArray());
163 
-					setQuestionsPanelEnabled(false);
164 
-					setReponsesPanelEnabled(false);
165 
-					setStatusText("Connexion à la base de données établie.");
166 
-				}
167 
-				catch (BDDException e)
159 
+				if(configureBDD(false))
168 160 
 				{
169 
-					setStatusText(e.getMessage(), ERROR_COLOR);
161 
+					tryToConnect(true);
162 
+					try
163 
+					{
164 
+						listC.setListData(bdd.getListeCategorie().toArray());
165 
+						setQuestionsPanelEnabled(false);
166 
+						setReponsesPanelEnabled(false);
167 
+						setStatusText("Connexion à la base de données établie.");
168 
+					}
169 
+					catch (BDDException e)
170 
+					{
171 
+						setStatusText(e.getMessage(), ERROR_COLOR);
172 
+					}
170 173 
 				}
171 174 
 			}
172 175 
 		});
 
@@ -340,7 +343,7 @@ public class InterfacePrincipale extends JFrame
340 343 
 		pack();
341 344 
 	}
342 345
343 
-	public void configureBDD(boolean showExitButton)
346 
+	public boolean configureBDD(boolean showExitButton)
344 347 
 	{
345 348 
 		ConnexionBddDialog cbddd = new ConnexionBddDialog(configBDD.getNomBdd(), configBDD.getPort(),
346 349 
 				configBDD.getIp(), configBDD.getLogin(),
 
@@ -354,15 +357,41 @@ public class InterfacePrincipale extends JFrame
354 357 
 			configBDD.setPassword(cbddd.getPassword());
355 358
356 359 
 			configBDD.saveConf();
360 
+			return true;
361 
+		}
362 
+		else
363 
+		{
364 
+			return false;
357 365 
 		}
358 366 
 	}
359 367
360 
-	private void tryToConnect()
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)
361 384 
 	{
362 385 
 		boolean conOK = false;
363 386 
 		do
364 387 
 		{
388 
+			if(showInStatusBar)
389 
+			{
390 
+				//setStatusText("Tentative de connexion à la base de données...", WAITING_COLOR);
391 
+			}
392 
+			W  w = new W(this);
365 393 
 			conOK = bdd.connect(configBDD.getNomBdd(), configBDD.getPort(), configBDD.getIp(), configBDD.getLogin(), configBDD.getPassword());
394 
+			w.dispose();
366 395 
 			if(conOK == false)
367 396 
 			{
368 397 
 				JOptionPane.showMessageDialog(this, "Impossible d'établir la connexion à la base de données.", "Erreur conexion base de données", JOptionPane.ERROR_MESSAGE);

+ 2
- 1
java/src/InterfaceGraphique/SplashScreen.java Bestand weergeven 

@@ -72,9 +72,10 @@ public class SplashScreen extends JWindow
72 72 
 		}
73 73
74 74 
 		progressBar.setValue(status+1);
75 
+
75 76 
 		try
76 77 
 		{
77 
-			Thread.sleep(1000);
78 
+			Thread.sleep(250);
78 79 
 		}
79 80 
 		catch (InterruptedException e)
80 81 
 		{}