babolivier
/
burger-quizz
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

++mieux

PCYoshi 9 vuotta sitten
vanhempi
8945f31438
commit
efc684d9a3
10 muutettua tiedostoa jossa 112 lisäystä ja 181 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 85
    142
      java/.idea/workspace.xml
  2. 2
    2
      java/src/GestionBddDAO/ConfigBDD.java
  3. 2
    3
      java/src/GestionBddDAO/ConnexionBDD.java
  4. 4
    4
      java/src/GestionBddDAO/GestionCategories.java
  5. 4
    4
      java/src/GestionBddDAO/GestionQuestions.java
  6. 4
    4
      java/src/GestionBddDAO/GestionReponses.java
  7. 0
    6
      java/src/InterfaceGraphique/Bouton.java
  8. 4
    2
      java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java
  9. 0
    4
      java/src/InterfaceGraphique/InterfacePrincipale.java
  10. 7
    10
      java/src/MainAdminBddBurgerQuizz.java

+ 85
- 142
java/.idea/workspace.xml Näytä tiedosto 

@@ -7,8 +7,15 @@
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$/rsc/burgerquizz.png" afterPath="$PROJECT_DIR$/rsc/burgerquizz.png" />
10 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
11 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
12 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
11 13 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
14 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
15 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
16 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
17 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
18 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
12 19 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
13 20 
     </list>
14 21 
     <ignored path="java.iws" />
 
@@ -31,88 +38,16 @@
31 38 
   </component>
32 39 
   <component name="FileEditorManager">
33 40 
     <leaf>
34 
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
35 
-        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
41 
+      <file leaf-file-name="Bouton.java" pinned="false" current-in-tab="true">
42 
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
36 43 
           <provider selected="true" editor-type-id="text-editor">
37 
-            <state vertical-scroll-proportion="0.0">
38 
-              <caret line="86" column="31" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
39 
-              <folding>
40 
-                <element signature="imports" expanded="true" />
41 
-              </folding>
42 
-            </state>
43 
-          </provider>
44 
-        </entry>
45 
-      </file>
46 
-      <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="true">
47 
-        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
48 
-          <provider selected="true" editor-type-id="text-editor">
49 
-            <state vertical-scroll-proportion="0.44751382">
50 
-              <caret line="23" column="51" selection-start-line="23" selection-start-column="51" selection-end-line="23" selection-end-column="51" />
51 
-              <folding>
52 
-                <element signature="imports" expanded="true" />
53 
-              </folding>
54 
-            </state>
55 
-          </provider>
56 
-        </entry>
57 
-      </file>
58 
-      <file leaf-file-name="ConfigBDD.java" pinned="false" current-in-tab="false">
59 
-        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
60 
-          <provider selected="true" editor-type-id="text-editor">
61 
-            <state vertical-scroll-proportion="0.0">
62 
-              <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
63 
-              <folding>
64 
-                <element signature="method#loadConf#0;class#ConfigBDD#0" expanded="false" />
65 
-                <element signature="method#saveConf#0;class#ConfigBDD#0" expanded="false" />
66 
-                <element signature="method#loadDefaultConf#0;class#ConfigBDD#0" expanded="false" />
67 
-              </folding>
68 
-            </state>
69 
-          </provider>
70 
-        </entry>
71 
-      </file>
72 
-      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
73 
-        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java">
74 
-          <provider selected="true" editor-type-id="text-editor">
75 
-            <state vertical-scroll-proportion="0.0">
76 
-              <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
44 
+            <state vertical-scroll-proportion="0.19428572">
45 
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="19" />
77 46 
               <folding />
78 47 
             </state>
79 48 
           </provider>
80 49 
         </entry>
81 50 
       </file>
82 
-      <file leaf-file-name="ConnexionBDD.java" pinned="false" current-in-tab="false">
83 
-        <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
84 
-          <provider selected="true" editor-type-id="text-editor">
85 
-            <state vertical-scroll-proportion="0.0">
86 
-              <caret line="42" column="32" selection-start-line="42" selection-start-column="32" selection-end-line="42" selection-end-column="32" />
87 
-              <folding>
88 
-                <element signature="imports" expanded="true" />
89 
-              </folding>
90 
-            </state>
91 
-          </provider>
92 
-        </entry>
93 
-      </file>
94 
-      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="false">
95 
-        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
96 
-          <provider selected="true" editor-type-id="text-editor">
97 
-            <state vertical-scroll-proportion="0.0">
98 
-              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
99 
-              <folding />
100 
-            </state>
101 
-          </provider>
102 
-        </entry>
103 
-      </file>
104 
-      <file leaf-file-name="MainAdminBddBurgerQuizz.java" pinned="false" current-in-tab="false">
105 
-        <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
106 
-          <provider selected="true" editor-type-id="text-editor">
107 
-            <state vertical-scroll-proportion="0.0">
108 
-              <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
109 
-              <folding>
110 
-                <element signature="imports" expanded="true" />
111 
-              </folding>
112 
-            </state>
113 
-          </provider>
114 
-        </entry>
115 
-      </file>
116 51 
     </leaf>
117 52 
   </component>
118 53 
   <component name="FileTemplateManagerImpl">
 
@@ -152,14 +87,18 @@
152 87 
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
153 88 
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
154 89 
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
155 
-        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
156 90 
         <option value="$PROJECT_DIR$/src/DialogBoxes/NouvelleReponseDialog.java" />
157 91 
         <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
158 92 
         <option value="$PROJECT_DIR$/src/Modele/ConfigBDD.java" />
93 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
94 
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
159 95 
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
96 
+        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
97 
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
98 
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
99 
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
100 
+        <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
160 101 
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
161 
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
162 
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
163 102 
       </list>
164 103 
     </option>
165 104 
   </component>
 
@@ -412,6 +351,7 @@
412 351 
     <property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
413 352 
     <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
414 353 
     <property name="GenerateAntBuildDialog.outputFileNameProperty" value="java" />
354 
+    <property name="SearchEverywhereHistoryKey" value="printStack&#9;null&#9;null" />
415 355 
   </component>
416 356 
   <component name="RecentsManager">
417 357 
     <key name="ExtractSuperBase.RECENT_KEYS">
 
@@ -751,7 +691,13 @@
751 691 
       <option name="project" value="LOCAL" />
752 692 
       <updated>1433516680268</updated>
753 693 
     </task>
754 
-    <option name="localTasksCounter" value="28" />
694 
+    <task id="LOCAL-00028" summary="redimensionnement de certains elms">
695 
+      <created>1433522454971</created>
696 
+      <option name="number" value="00028" />
697 
+      <option name="project" value="LOCAL" />
698 
+      <updated>1433522454971</updated>
699 
+    </task>
700 
+    <option name="localTasksCounter" value="29" />
755 701 
     <servers />
756 702 
   </component>
757 703 
   <component name="TodoView">
 
@@ -765,7 +711,7 @@
765 711 
   </component>
766 712 
   <component name="ToolWindowManager">
767 713 
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
768 
-    <editor active="true" />
714 
+    <editor active="false" />
769 715 
     <layout>
770 716 
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
771 717 
       <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" />
 
@@ -777,13 +723,13 @@
777 723 
       <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" />
778 724 
       <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" />
779 725 
       <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" />
780 
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3274648" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
726 
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32688928" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
781 727 
       <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" />
782 728 
       <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" />
783 729 
       <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" />
784 730 
       <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" />
785 731 
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14893617" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
786 
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30579966" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
732 
+      <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" />
787 733 
       <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" />
788 734 
       <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" />
789 735 
       <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" />
 
@@ -804,7 +750,6 @@
804 750 
     <option name="myLimit" value="2678400000" />
805 751 
   </component>
806 752 
   <component name="VcsManagerConfiguration">
807 
-    <MESSAGE value="test" />
808 753 
     <MESSAGE value="creation classe de base" />
809 754 
     <MESSAGE value="evolution" />
810 755 
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
 
@@ -828,7 +773,9 @@
828 773 
     <MESSAGE value="modification parametre operationelle" />
829 774 
     <MESSAGE value="boite de dialogue plus ergonomique" />
830 775 
     <MESSAGE value="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon)&#10;NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)" />
831 
-    <option name="LAST_COMMIT_MESSAGE" value="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon)&#10;NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)" />
776 
+    <MESSAGE value="redimensionnement de certains elms" />
777 
+    <MESSAGE value="++mieux" />
778 
+    <option name="LAST_COMMIT_MESSAGE" value="++mieux" />
832 779 
   </component>
833 780 
   <component name="XDebuggerManager">
834 781 
     <breakpoint-manager>
 
@@ -1082,13 +1029,6 @@
1082 1029 
         <state />
1083 1030 
       </provider>
1084 1031 
     </entry>
1085 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java">
1086 
-      <provider selected="true" editor-type-id="text-editor">
1087 
-        <state vertical-scroll-proportion="2.4738805">
1088 
-          <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
1089 
-        </state>
1090 
-      </provider>
1091 
-    </entry>
1092 1032 
     <entry file="file://$PROJECT_DIR$/mcd.png">
1093 1033 
       <provider selected="true" editor-type-id="images">
1094 1034 
         <state />
 
@@ -1102,123 +1042,126 @@
1102 1042 
         </state>
1103 1043 
       </provider>
1104 1044 
     </entry>
1105 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java">
1045 
+    <entry file="file://$PROJECT_DIR$/conf.xml">
1106 1046 
       <provider selected="true" editor-type-id="text-editor">
1107 1047 
         <state vertical-scroll-proportion="0.0">
1108 
-          <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="36" />
1048 
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1049 
+          <folding />
1109 1050 
         </state>
1110 1051 
       </provider>
1111 1052 
     </entry>
1112 
-    <entry file="file://$PROJECT_DIR$/conf.xml">
1053 
+    <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
1113 1054 
       <provider selected="true" editor-type-id="text-editor">
1114 1055 
         <state vertical-scroll-proportion="0.0">
1115 
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1116 
-          <folding />
1056 
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
1057 
+          <folding>
1058 
+            <element signature="e#97#98#0" expanded="true" />
1059 
+            <element signature="e#118#119#0" expanded="true" />
1060 
+          </folding>
1117 1061 
         </state>
1118 1062 
       </provider>
1119 1063 
     </entry>
1120 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1064 
+    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
1121 1065 
       <provider selected="true" editor-type-id="text-editor">
1122 1066 
         <state vertical-scroll-proportion="0.0">
1123 
-          <caret line="75" column="143" selection-start-line="75" selection-start-column="143" selection-end-line="75" selection-end-column="143" />
1067 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1124 1068 
           <folding />
1125 1069 
         </state>
1126 1070 
       </provider>
1127 1071 
     </entry>
1128 1072 
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1129 1073 
       <provider selected="true" editor-type-id="text-editor">
1130 
-        <state vertical-scroll-proportion="0.0">
1131 
-          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
1074 
+        <state vertical-scroll-proportion="0.7044199">
1075 
+          <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />
1132 1076 
           <folding>
1133 1077 
             <element signature="imports" expanded="true" />
1134 1078 
           </folding>
1135 1079 
         </state>
1136 1080 
       </provider>
1137 1081 
     </entry>
1138 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
1082 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1139 1083 
       <provider selected="true" editor-type-id="text-editor">
1140 
-        <state vertical-scroll-proportion="0.0">
1141 
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
1084 
+        <state vertical-scroll-proportion="-2.3283582">
1085 
+          <caret line="38" column="47" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="47" />
1142 1086 
           <folding />
1143 1087 
         </state>
1144 1088 
       </provider>
1145 1089 
     </entry>
1146 
-    <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
1090 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1147 1091 
       <provider selected="true" editor-type-id="text-editor">
1148 
-        <state vertical-scroll-proportion="0.0">
1149 
-          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
1092 
+        <state vertical-scroll-proportion="-7.402985">
1093 
+          <caret line="49" column="47" selection-start-line="49" selection-start-column="47" selection-end-line="49" selection-end-column="47" />
1150 1094 
           <folding>
1151 
-            <element signature="e#97#98#0" expanded="true" />
1152 
-            <element signature="e#118#119#0" expanded="true" />
1095 
+            <element signature="imports" expanded="true" />
1153 1096 
           </folding>
1154 1097 
         </state>
1155 1098 
       </provider>
1156 1099 
     </entry>
1157 
-    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
1100 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java">
1158 1101 
       <provider selected="true" editor-type-id="text-editor">
1159 
-        <state vertical-scroll-proportion="0.0">
1160 
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1102 
+        <state vertical-scroll-proportion="0.6012793">
1103 
+          <caret line="100" column="47" selection-start-line="100" selection-start-column="47" selection-end-line="100" selection-end-column="47" />
1161 1104 
           <folding />
1162 1105 
         </state>
1163 1106 
       </provider>
1164 1107 
     </entry>
1165 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
1108 
+    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java">
1166 1109 
       <provider selected="true" editor-type-id="text-editor">
1167 
-        <state vertical-scroll-proportion="0.0">
1168 
-          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
1169 
-          <folding>
1170 
-            <element signature="imports" expanded="true" />
1171 
-          </folding>
1110 
+        <state vertical-scroll-proportion="0.6012793">
1111 
+          <caret line="110" column="47" selection-start-line="110" selection-start-column="47" selection-end-line="110" selection-end-column="47" />
1112 
+          <folding />
1172 1113 
         </state>
1173 1114 
       </provider>
1174 1115 
     </entry>
1175 1116 
     <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java">
1176 1117 
       <provider selected="true" editor-type-id="text-editor">
1177 
-        <state vertical-scroll-proportion="0.0">
1178 
-          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
1118 
+        <state vertical-scroll-proportion="1.8550106">
1119 
+          <caret line="107" column="47" selection-start-line="107" selection-start-column="47" selection-end-line="107" selection-end-column="47" />
1179 1120 
           <folding />
1180 1121 
         </state>
1181 1122 
       </provider>
1182 1123 
     </entry>
1183 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java">
1124 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1184 1125 
       <provider selected="true" editor-type-id="text-editor">
1185 
-        <state vertical-scroll-proportion="0.0">
1186 
-          <caret line="42" column="32" selection-start-line="42" selection-start-column="32" selection-end-line="42" selection-end-column="32" />
1126 
+        <state vertical-scroll-proportion="0.9872068">
1127 
+          <caret line="577" column="110" selection-start-line="577" selection-start-column="110" selection-end-line="577" selection-end-column="110" />
1187 1128 
           <folding>
1188 1129 
             <element signature="imports" expanded="true" />
1189 1130 
           </folding>
1190 1131 
         </state>
1191 1132 
       </provider>
1192 1133 
     </entry>
1193 
-    <entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
1134 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1194 1135 
       <provider selected="true" editor-type-id="text-editor">
1195 
-        <state vertical-scroll-proportion="0.0">
1196 
-          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
1136 
+        <state vertical-scroll-proportion="2.2111554">
1137 
+          <caret line="72" column="13" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
1197 1138 
           <folding>
1198 
-            <element signature="method#loadConf#0;class#ConfigBDD#0" expanded="false" />
1199 
-            <element signature="method#saveConf#0;class#ConfigBDD#0" expanded="false" />
1200 
-            <element signature="method#loadDefaultConf#0;class#ConfigBDD#0" expanded="false" />
1139 
+            <element signature="imports" expanded="true" />
1201 1140 
           </folding>
1202 1141 
         </state>
1203 1142 
       </provider>
1204 1143 
     </entry>
1205 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1144 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1206 1145 
       <provider selected="true" editor-type-id="text-editor">
1207 
-        <state vertical-scroll-proportion="0.0">
1208 
-          <caret line="86" column="31" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
1209 
-          <folding>
1210 
-            <element signature="imports" expanded="true" />
1211 
-          </folding>
1146 
+        <state vertical-scroll-proportion="0.45816734">
1147 
+          <caret line="75" column="143" selection-start-line="75" selection-start-column="143" selection-end-line="75" selection-end-column="143" />
1148 
+          <folding />
1212 1149 
         </state>
1213 1150 
       </provider>
1214 1151 
     </entry>
1215 
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1152 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
1216 1153 
       <provider selected="true" editor-type-id="text-editor">
1217 
-        <state vertical-scroll-proportion="0.44751382">
1218 
-          <caret line="23" column="51" selection-start-line="23" selection-start-column="51" selection-end-line="23" selection-end-column="51" />
1219 
-          <folding>
1220 
-            <element signature="imports" expanded="true" />
1221 
-          </folding>
1154 
+        <state vertical-scroll-proportion="-0.033864543">
1155 
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
1156 
+          <folding />
1157 
+        </state>
1158 
+      </provider>
1159 
+    </entry>
1160 
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
1161 
+      <provider selected="true" editor-type-id="text-editor">
1162 
+        <state vertical-scroll-proportion="0.19428572">
1163 
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="19" />
1164 
+          <folding />
1222 1165 
         </state>
1223 1166 
       </provider>
1224 1167 
     </entry>

+ 2
- 2
java/src/GestionBddDAO/ConfigBDD.java Näytä tiedosto 

@@ -22,7 +22,7 @@ public class ConfigBDD
22 22 
 		{
23 23 
 			loadDefaultConf();
24 24 
 			saveConf();
25 
-			e.printStackTrace();
25 
+			System.out.println(e.getMessage());
26 26 
 			return false;
27 27 
 		}
28 28 
 	}
 
@@ -36,7 +36,7 @@ public class ConfigBDD
36 36 
 		}
37 37 
 		catch (IOException e)
38 38 
 		{
39 
-			e.printStackTrace();
39 
+			System.out.println(e.getMessage());
40 40 
 			return false;
41 41 
 		}
42 42 
 	}

+ 2
- 3
java/src/GestionBddDAO/ConnexionBDD.java Näytä tiedosto 

@@ -27,7 +27,7 @@ public class ConnexionBDD
27 27 
 		}
28 28 
 		catch(ClassNotFoundException e)
29 29 
 		{
30 
-			e.printStackTrace();
30 
+			System.out.println(e.getMessage());
31 31 
 			System.exit(1);
32 32 
 		}
33 33 
 	}
 
@@ -47,10 +47,9 @@ public class ConnexionBDD
47 47 
 		}
48 48 
 		catch(SQLException e)
49 49 
 		{
50 
-			e.printStackTrace();
50 
+			System.out.println(e.getMessage());
51 51 
 			System.out.println("Erreur de conexion à la base de données: " + e.getMessage());
52 52 
 			return false;
53 
-			//System.exit(1);
54 53 
 		}
55 54 
 	}
56 55

+ 4
- 4
java/src/GestionBddDAO/GestionCategories.java Näytä tiedosto 

@@ -41,7 +41,7 @@ public class GestionCategories
41 41 
 		}
42 42 
 		catch (SQLException e)
43 43 
 		{
44 
-			e.printStackTrace();
44 
+			System.out.println(e.getMessage());
45 45 
 		}
46 46 
 	}
47 47 
 
@@ -59,7 +59,7 @@ public class GestionCategories
59 59 
 		}
60 60 
 		catch (SQLException e)
61 61 
 		{
62 
-			e.printStackTrace();
62 
+			System.out.println(e.getMessage());
63 63 
 		}
64 64 
 	}
65 65 
 
@@ -77,7 +77,7 @@ public class GestionCategories
77 77 
 		}
78 78 
 		catch (SQLException e)
79 79 
 		{
80 
-			e.printStackTrace();
80 
+			System.out.println(e.getMessage());
81 81 
 		}
82 82 
 	}
83 83 
 
@@ -98,7 +98,7 @@ public class GestionCategories
98 98 
 		}
99 99 
 		catch (SQLException e)
100 100 
 		{
101 
-			e.printStackTrace();
101 
+			System.out.println(e.getMessage());
102 102 
 		}
103 103 
 	}
104 104

+ 4
- 4
java/src/GestionBddDAO/GestionQuestions.java Näytä tiedosto 

@@ -45,7 +45,7 @@ public class GestionQuestions
45 45 
 		}
46 46 
 		catch (SQLException e)
47 47 
 		{
48 
-			e.printStackTrace();
48 
+			System.out.println(e.getMessage());
49 49 
 		}
50 50 
 	}
51 51 
 
@@ -65,7 +65,7 @@ public class GestionQuestions
65 65 
 			preparedStatement.close();
66 66 
 		}
67 67 
 		catch (SQLException e) {
68 
-			e.printStackTrace();
68 
+			System.out.println(e.getMessage());
69 69 
 		}
70 70 
 	}
71 71 
 
@@ -85,7 +85,7 @@ public class GestionQuestions
85 85 
 		}
86 86 
 		catch (SQLException e)
87 87 
 		{
88 
-			e.printStackTrace();
88 
+			System.out.println(e.getMessage());
89 89 
 		}
90 90 
 	}
91 91 
 
@@ -108,7 +108,7 @@ public class GestionQuestions
108 108 
 		}
109 109 
 		catch (SQLException e)
110 110 
 		{
111 
-			e.printStackTrace();
111 
+			System.out.println(e.getMessage());
112 112 
 		}
113 113 
 	}
114 114

+ 4
- 4
java/src/GestionBddDAO/GestionReponses.java Näytä tiedosto 

@@ -44,7 +44,7 @@ public class GestionReponses
44 44 
 		}
45 45 
 		catch (SQLException e)
46 46 
 		{
47 
-			e.printStackTrace();
47 
+			System.out.println(e.getMessage());
48 48 
 		}
49 49 
 	}
50 50 
 
@@ -63,7 +63,7 @@ public class GestionReponses
63 63 
 			preparedStatement.close();
64 64 
 		}
65 65 
 		catch (SQLException e) {
66 
-			e.printStackTrace();
66 
+			System.out.println(e.getMessage());
67 67 
 		}
68 68 
 	}
69 69 
 
@@ -82,7 +82,7 @@ public class GestionReponses
82 82 
 		}
83 83 
 		catch (SQLException e)
84 84 
 		{
85 
-			e.printStackTrace();
85 
+			System.out.println(e.getMessage());
86 86 
 		}
87 87 
 	}
88 88 
 
@@ -105,7 +105,7 @@ public class GestionReponses
105 105 
 		}
106 106 
 		catch (SQLException e)
107 107 
 		{
108 
-			e.printStackTrace();
108 
+			System.out.println(e.getMessage());
109 109 
 		}
110 110 
 	}
111 111

+ 0
- 6
java/src/InterfaceGraphique/Bouton.java Näytä tiedosto 

@@ -1,19 +1,13 @@
1 1 
 package InterfaceGraphique;
2 2
3 3 
 import javax.swing.*;
4 
-import javax.swing.border.Border;
5 
-import java.awt.*;
6 4
7 5 
 public class Bouton extends JButton
8 6 
 {
9 7 
 	public Bouton(String text, Icon icon)
10 8 
 	{
11 9 
 		super(text, icon);
12 
-		//setBackground(Color.WHITE);
13 10 
 		setFocusPainted(false);
14 
-		//Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
15 
-		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
16 
-		//setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
17 11 
 		setIconTextGap(10);
18 12 
 	}
19 13 
 }

+ 4
- 2
java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java Näytä tiedosto 

@@ -69,10 +69,12 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
69 69 
 		fieldPanel.add(new JLabel("Mot de passe utilisateur:"));
70 70 
 		fieldPanel.add(password);
71 71
72 
-		if(!showExitButton)boutons.add(annuler);
72 
+		if(!showExitButton)
73 
+			{boutons.add(annuler);}
73 74 
 		boutons.add(defParams);
74 75 
 		boutons.add(ok);
75 
-		if(showExitButton)boutons.add(quitter);
76 
+		if(showExitButton)
77 
+			{boutons.add(quitter);}
76 78
77 79 
 		getContentPane().add(fieldPanel, BorderLayout.CENTER);
78 80 
 		getContentPane().add(boutons, BorderLayout.SOUTH);

+ 0
- 4
java/src/InterfaceGraphique/InterfacePrincipale.java Näytä tiedosto 

@@ -418,7 +418,6 @@ public class InterfacePrincipale extends JFrame
418 418 
 				}
419 419
420 420 
 				bdd.createCategorie(catName);
421 
-				//listC.setListData(bdd.getListeCategorie().toArray());
422 421 
 				reSelectCategorie(catName);
423 422 
 				listQ.setListData(new Vector(0));
424 423 
 			}
 
@@ -501,7 +500,6 @@ public class InterfacePrincipale extends JFrame
501 500 
 				{
502 501 
 					String catName = listC.getSelectedValue().toString();
503 502 
 					bdd.createReponses(catName, nrd.getRep1(), nrd.getRep2());
504 
-					//listR.setListData(bdd.getListeReponses(catName).toArray());
505 503 
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
506 504 
 				}
507 505 
 			}
 
@@ -543,7 +541,6 @@ public class InterfacePrincipale extends JFrame
543 541 
 				if(nrd.afficher() == true)
544 542 
 				{
545 543 
 					bdd.modifyReponses(nrd.getCat(), reponse1, reponse2, nrd.getRep1(), nrd.getRep2());
546 
-					//listR.setListData(bdd.getListeReponses(catName).toArray());
547 544 
 					reSelectCategorie(nrd.getCat());
548 545 
 					reSelectReponses(nrd.getRep1(), nrd.getRep2());
549 546 
 				}
 
@@ -579,7 +576,6 @@ public class InterfacePrincipale extends JFrame
579 576 
 				if(nqd.afficher() == true)
580 577 
 				{
581 578 
 					bdd.createQuestion(nqd.getIntitule(), r.getReponse1(), r.getReponse2(), nqd.getReponse());
582 
-					//listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()));
583 579 
 					reSelectQuestion(nqd.getIntitule());
584 580 
 				}
585 581 
 			}

+ 7
- 10
java/src/MainAdminBddBurgerQuizz.java Näytä tiedosto 

@@ -4,20 +4,17 @@ import javax.swing.*;
4 4
5 5 
 public class MainAdminBddBurgerQuizz
6 6 
 {
7 
-	public static void main(String args[])
7 
+	public static void main(String[] args)
8 8 
 	{
9 9 
 		//https://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
10 
-		try {
10 
+		try
11 
+		{
11 12 
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
12 
-		} catch (ClassNotFoundException e) {
13 
-			e.printStackTrace();
14 
-		} catch (InstantiationException e) {
15 
-			e.printStackTrace();
16 
-		} catch (IllegalAccessException e) {
17 
-			e.printStackTrace();
18 
-		} catch (UnsupportedLookAndFeelException e) {
19 
-			e.printStackTrace();
20 13 
 		}
14 
+		catch (ClassNotFoundException e) {}
15 
+		catch (InstantiationException e) {}
16 
+		catch (IllegalAccessException e) {}
17 
+		catch (UnsupportedLookAndFeelException e) {}
21 18
22 19 
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
23 20