PCYoshi преди 9 години
родител
ревизия
1422986420

+ 139
- 97
java/.idea/workspace.xml Целия файл

@@ -7,74 +7,10 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/package-info.java" />
11
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionErreurs/package-info.java" />
12
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/BDDException.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/BDDException.html" />
13
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" afterPath="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" />
14
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/Bouton.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/Bouton.html" />
15
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Categorie.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Categorie.html" />
16
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConfigBDD.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConfigBDD.html" />
17
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConnexionBDD.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/ConnexionBDD.html" />
18
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.html" />
19
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionCategories.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionCategories.html" />
20
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionQuestions.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionQuestions.html" />
21
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionReponses.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/GestionReponses.html" />
22
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanCategoriesListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanCategoriesListener.html" />
23
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanQuestionsListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanQuestionsListener.html" />
24
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanReponsesListener.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.PanReponsesListener.html" />
25
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/InterfacePrincipale.html" />
26
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/MainAdminBddBurgerQuizz.html" afterPath="$PROJECT_DIR$/javadoc/MainAdminBddBurgerQuizz.html" />
27
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.html" />
28
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.html" />
29
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Question.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Question.html" />
30
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/Reponses.html" afterPath="$PROJECT_DIR$/javadoc/Modele/Reponses.html" />
31
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/SplashScreen.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/SplashScreen.html" />
32
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/allclasses-frame.html" afterPath="$PROJECT_DIR$/javadoc/allclasses-frame.html" />
33
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/allclasses-noframe.html" afterPath="$PROJECT_DIR$/javadoc/allclasses-noframe.html" />
34
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/constant-values.html" afterPath="$PROJECT_DIR$/javadoc/constant-values.html" />
35
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/deprecated-list.html" afterPath="$PROJECT_DIR$/javadoc/deprecated-list.html" />
36
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/help-doc.html" afterPath="$PROJECT_DIR$/javadoc/help-doc.html" />
37
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-1.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-1.html" />
38
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-10.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-10.html" />
39
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-11.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-11.html" />
40
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-12.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-12.html" />
41
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-13.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-13.html" />
42
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-14.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-14.html" />
43
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-15.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-15.html" />
44
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-16.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-16.html" />
45
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-17.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-17.html" />
46
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-18.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-18.html" />
47
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-2.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-2.html" />
48
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-3.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-3.html" />
49
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-4.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-4.html" />
50
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-5.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-5.html" />
51
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-6.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-6.html" />
52
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-7.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-7.html" />
53
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-8.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-8.html" />
54
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index-files/index-9.html" afterPath="$PROJECT_DIR$/javadoc/index-files/index-9.html" />
55
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/index.html" afterPath="$PROJECT_DIR$/javadoc/index.html" />
56
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-frame.html" afterPath="$PROJECT_DIR$/javadoc/overview-frame.html" />
57
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-summary.html" afterPath="$PROJECT_DIR$/javadoc/overview-summary.html" />
58
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/overview-tree.html" afterPath="$PROJECT_DIR$/javadoc/overview-tree.html" />
59
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/package-frame.html" />
60
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-frame.html" />
61
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-frame.html" />
62
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-frame.html" />
63
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-frame.html" />
64
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-frame.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-frame.html" />
65
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/package-summary.html" />
66
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-summary.html" />
67
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-summary.html" />
68
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-summary.html" />
69
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-summary.html" />
70
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-summary.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-summary.html" />
71
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/package-tree.html" />
72
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/GestionBddDAO/package-tree.html" />
73
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/GestionErreurs/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/GestionErreurs/package-tree.html" />
74
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/package-tree.html" />
75
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/InterfaceGraphique/DialogBoxes/package-tree.html" />
76
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/Modele/package-tree.html" afterPath="$PROJECT_DIR$/javadoc/Modele/package-tree.html" />
77
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/javadoc/serialized-form.html" afterPath="$PROJECT_DIR$/javadoc/serialized-form.html" />
10
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/package-info.java" />
11
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
12
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java" />
13
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java" />
78 14
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
79 15
     </list>
80 16
     <ignored path="java.iws" />
@@ -96,7 +32,71 @@
96 32
     <favorites_list name="java" />
97 33
   </component>
98 34
   <component name="FileEditorManager">
99
-    <leaf />
35
+    <leaf>
36
+      <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="false">
37
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
38
+          <provider selected="true" editor-type-id="text-editor">
39
+            <state vertical-scroll-proportion="0.0">
40
+              <caret line="168" column="89" selection-start-line="168" selection-start-column="89" selection-end-line="168" selection-end-column="89" />
41
+              <folding>
42
+                <element signature="e#5485#5486#0" expanded="true" />
43
+                <element signature="e#5515#5516#0" expanded="true" />
44
+                <element signature="e#5622#5623#0" expanded="true" />
45
+                <element signature="e#5685#5686#0" expanded="true" />
46
+                <element signature="e#5792#5793#0" expanded="true" />
47
+                <element signature="e#5818#5819#0" expanded="true" />
48
+                <element signature="e#5965#5966#0" expanded="true" />
49
+                <element signature="e#5994#5995#0" expanded="true" />
50
+                <element signature="e#6155#6156#0" expanded="true" />
51
+                <element signature="e#6207#6208#0" expanded="true" />
52
+              </folding>
53
+            </state>
54
+          </provider>
55
+        </entry>
56
+      </file>
57
+      <file leaf-file-name="NouvelleQuestionDialog.java" pinned="false" current-in-tab="false">
58
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
59
+          <provider selected="true" editor-type-id="text-editor">
60
+            <state vertical-scroll-proportion="0.0">
61
+              <caret line="118" column="81" selection-start-line="118" selection-start-column="81" selection-end-line="118" selection-end-column="81" />
62
+              <folding>
63
+                <element signature="e#3434#3435#0" expanded="true" />
64
+                <element signature="e#3466#3467#0" expanded="true" />
65
+                <element signature="e#3618#3619#0" expanded="true" />
66
+                <element signature="e#3658#3659#0" expanded="true" />
67
+              </folding>
68
+            </state>
69
+          </provider>
70
+        </entry>
71
+      </file>
72
+      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="false">
73
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
74
+          <provider selected="true" editor-type-id="text-editor">
75
+            <state vertical-scroll-proportion="0.0">
76
+              <caret line="162" column="28" selection-start-line="162" selection-start-column="28" selection-end-line="162" selection-end-column="28" />
77
+              <folding>
78
+                <element signature="e#3868#3869#0" expanded="true" />
79
+                <element signature="e#3896#3897#0" expanded="true" />
80
+                <element signature="e#3992#3993#0" expanded="true" />
81
+                <element signature="e#4020#4021#0" expanded="true" />
82
+                <element signature="e#4109#4110#0" expanded="true" />
83
+                <element signature="e#4160#4161#0" expanded="true" />
84
+              </folding>
85
+            </state>
86
+          </provider>
87
+        </entry>
88
+      </file>
89
+      <file leaf-file-name="package-info.java" pinned="false" current-in-tab="true">
90
+        <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/package-info.java">
91
+          <provider selected="true" editor-type-id="text-editor">
92
+            <state vertical-scroll-proportion="0.09392265">
93
+              <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
94
+              <folding />
95
+            </state>
96
+          </provider>
97
+        </entry>
98
+      </file>
99
+    </leaf>
100 100
   </component>
101 101
   <component name="FileTemplateManagerImpl">
102 102
     <option name="RECENT_TEMPLATES">
@@ -137,7 +137,6 @@
137 137
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
138 138
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
139 139
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
140
-        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java" />
141 140
         <option value="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
142 141
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
143 142
         <option value="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
@@ -146,6 +145,10 @@
146 145
         <option value="$PROJECT_DIR$/src/GestionBddDAO/package-info.java" />
147 146
         <option value="$PROJECT_DIR$/src/GestionErreurs/BDDException.java" />
148 147
         <option value="$PROJECT_DIR$/src/GestionErreurs/package-info.java" />
148
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
149
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java" />
150
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java" />
151
+        <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/package-info.java" />
149 152
       </list>
150 153
     </option>
151 154
   </component>
@@ -761,7 +764,13 @@
761 764
       <option name="project" value="LOCAL" />
762 765
       <updated>1433970507511</updated>
763 766
     </task>
764
-    <option name="localTasksCounter" value="30" />
767
+    <task id="LOCAL-00030" summary="avancées javadoc3">
768
+      <created>1433971052047</created>
769
+      <option name="number" value="00030" />
770
+      <option name="project" value="LOCAL" />
771
+      <updated>1433971052047</updated>
772
+    </task>
773
+    <option name="localTasksCounter" value="31" />
765 774
     <servers />
766 775
   </component>
767 776
   <component name="TodoView">
@@ -775,7 +784,7 @@
775 784
   </component>
776 785
   <component name="ToolWindowManager">
777 786
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
778
-    <editor active="false" />
787
+    <editor active="true" />
779 788
     <layout>
780 789
       <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" />
781 790
       <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" />
@@ -793,7 +802,7 @@
793 802
       <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" />
794 803
       <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" />
795 804
       <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" />
796
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2636778" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
805
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2636778" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
797 806
       <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" />
798 807
       <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" />
799 808
       <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" />
@@ -838,7 +847,8 @@
838 847
     <MESSAGE value="corrections diverses" />
839 848
     <MESSAGE value="avancées javadoc" />
840 849
     <MESSAGE value="avancées javadoc2" />
841
-    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc2" />
850
+    <MESSAGE value="avancées javadoc3" />
851
+    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc3" />
842 852
   </component>
843 853
   <component name="XDebuggerManager">
844 854
     <breakpoint-manager>
@@ -1000,21 +1010,6 @@
1000 1010
         </state>
1001 1011
       </provider>
1002 1012
     </entry>
1003
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1004
-      <provider selected="true" editor-type-id="text-editor">
1005
-        <state vertical-scroll-proportion="0.0">
1006
-          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
1007
-        </state>
1008
-      </provider>
1009
-    </entry>
1010
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1011
-      <provider selected="true" editor-type-id="text-editor">
1012
-        <state vertical-scroll-proportion="-0.5391791">
1013
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
1014
-          <folding />
1015
-        </state>
1016
-      </provider>
1017
-    </entry>
1018 1013
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java">
1019 1014
       <provider selected="true" editor-type-id="text-editor">
1020 1015
         <state vertical-scroll-proportion="0.47574627">
@@ -1023,14 +1018,6 @@
1023 1018
         </state>
1024 1019
       </provider>
1025 1020
     </entry>
1026
-    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
1027
-      <provider selected="true" editor-type-id="text-editor">
1028
-        <state vertical-scroll-proportion="0.31716418">
1029
-          <caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
1030
-          <folding />
1031
-        </state>
1032
-      </provider>
1033
-    </entry>
1034 1021
     <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
1035 1022
       <provider selected="true" editor-type-id="text-editor">
1036 1023
         <state vertical-scroll-proportion="0.0">
@@ -1147,6 +1134,61 @@
1147 1134
         </state>
1148 1135
       </provider>
1149 1136
     </entry>
1137
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
1138
+      <provider selected="true" editor-type-id="text-editor">
1139
+        <state vertical-scroll-proportion="0.0">
1140
+          <caret line="118" column="81" selection-start-line="118" selection-start-column="81" selection-end-line="118" selection-end-column="81" />
1141
+          <folding>
1142
+            <element signature="e#3434#3435#0" expanded="true" />
1143
+            <element signature="e#3466#3467#0" expanded="true" />
1144
+            <element signature="e#3618#3619#0" expanded="true" />
1145
+            <element signature="e#3658#3659#0" expanded="true" />
1146
+          </folding>
1147
+        </state>
1148
+      </provider>
1149
+    </entry>
1150
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
1151
+      <provider selected="true" editor-type-id="text-editor">
1152
+        <state vertical-scroll-proportion="0.0">
1153
+          <caret line="168" column="89" selection-start-line="168" selection-start-column="89" selection-end-line="168" selection-end-column="89" />
1154
+          <folding>
1155
+            <element signature="e#5485#5486#0" expanded="true" />
1156
+            <element signature="e#5515#5516#0" expanded="true" />
1157
+            <element signature="e#5622#5623#0" expanded="true" />
1158
+            <element signature="e#5685#5686#0" expanded="true" />
1159
+            <element signature="e#5792#5793#0" expanded="true" />
1160
+            <element signature="e#5818#5819#0" expanded="true" />
1161
+            <element signature="e#5965#5966#0" expanded="true" />
1162
+            <element signature="e#5994#5995#0" expanded="true" />
1163
+            <element signature="e#6155#6156#0" expanded="true" />
1164
+            <element signature="e#6207#6208#0" expanded="true" />
1165
+          </folding>
1166
+        </state>
1167
+      </provider>
1168
+    </entry>
1169
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java">
1170
+      <provider selected="true" editor-type-id="text-editor">
1171
+        <state vertical-scroll-proportion="0.0">
1172
+          <caret line="162" column="28" selection-start-line="162" selection-start-column="28" selection-end-line="162" selection-end-column="28" />
1173
+          <folding>
1174
+            <element signature="e#3868#3869#0" expanded="true" />
1175
+            <element signature="e#3896#3897#0" expanded="true" />
1176
+            <element signature="e#3992#3993#0" expanded="true" />
1177
+            <element signature="e#4020#4021#0" expanded="true" />
1178
+            <element signature="e#4109#4110#0" expanded="true" />
1179
+            <element signature="e#4160#4161#0" expanded="true" />
1180
+          </folding>
1181
+        </state>
1182
+      </provider>
1183
+    </entry>
1184
+    <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/package-info.java">
1185
+      <provider selected="true" editor-type-id="text-editor">
1186
+        <state vertical-scroll-proportion="0.09392265">
1187
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
1188
+          <folding />
1189
+        </state>
1190
+      </provider>
1191
+    </entry>
1150 1192
   </component>
1151 1193
   <component name="masterDetails">
1152 1194
     <states>

+ 82
- 1
java/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java Целия файл

@@ -6,19 +6,63 @@ import java.awt.event.ActionEvent;
6 6
 import java.awt.event.ActionListener;
7 7
 import java.text.NumberFormat;
8 8
 
9
+/**
10
+ * Boite de dialogue modale permettant de renseigner une configuration de connexion à la base de données.
11
+ * @author joseph
12
+ */
9 13
 public class ConnexionBddDialog extends JDialog implements ActionListener
10 14
 {
15
+	/**
16
+	 * Champ pour le nom de la base de données.
17
+	 */
11 18
 	private JTextField nomBdd;
19
+	/**
20
+	 * Champ pour le numéro de port du serveur hebergeant la base de données.
21
+	 */
12 22
 	private JFormattedTextField port;
23
+	/**
24
+	 * Champ pour l'IP du serveur hebergeant la base de données.
25
+	 */
13 26
 	private JTextField ip;
27
+	/**
28
+	 * Champ pour le login utilisateur.
29
+	 */
14 30
 	private JTextField login;
31
+	/**
32
+	 * Champ pur le mot de passe utilisateur.
33
+	 */
15 34
 	private JPasswordField password;
35
+	/**
36
+	 * Bouton de validation.
37
+	 */
16 38
 	private JButton ok;
39
+	/**
40
+	 * Bouton d'annulation.
41
+	 */
17 42
 	private JButton annuler;
43
+	/**
44
+	 * Bouton pour mettre en place les paramétre de connexion par defaut.
45
+	 */
18 46
 	private JButton defParams;
47
+	/**
48
+	 * Bouton pour quitter l'aplication.
49
+	 */
19 50
 	private JButton quitter;
51
+	/**
52
+	 * Booléen determinant si les paramétre ont été modifié ou non.
53
+	 */
20 54
 	private boolean modifEffectuees;
21 55
 
56
+	/**
57
+	 * Constructeur préremplissant les champs de la boite de dialogue.
58
+	 * @param nomBdd Nom base de données.
59
+	 * @param port Port serveur base de données.
60
+	 * @param ip Adresse ip serveur base de données.
61
+	 * @param login Login utilisateur base de données.
62
+	 * @param password Mot de passe utilisateur base de données.
63
+	 * @param parent Parent
64
+	 * @param showExitButton Afficher on non un bouton pour quitter l'aplication.
65
+	 */
22 66
 	public ConnexionBddDialog(String nomBdd, int port, String ip, String login, String password, JFrame parent, boolean showExitButton)
23 67
 	{
24 68
 		super(parent, "Paramètres de connexion à la base de données", true);
@@ -29,6 +73,15 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
29 73
 		setResizable(false);
30 74
 	}
31 75
 
76
+	/**
77
+	 * Construit l'interface de la boite de dialogue.
78
+	 * @param defNomBdd Nom base de données.
79
+	 * @param defPort Port serveur base de données.
80
+	 * @param defIP Adresse ip serveur base de données.
81
+	 * @param defLogin Login utilisateur base de données.
82
+	 * @param defPassword Mot de passe utilisateur base de données.
83
+	 * @param showExitButton Afficher on non un bouton pour quitter l'aplication, remplaçant le bouton annuler.
84
+	 */
32 85
 	private void createInterface(String defNomBdd, int defPort, String defIP, String defLogin, String defPassword, boolean showExitButton)
33 86
 	{
34 87
 		nomBdd = new JTextField(defNomBdd, 30);
@@ -80,12 +133,20 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
80 133
 		getContentPane().add(boutons, BorderLayout.SOUTH);
81 134
 	}
82 135
 
136
+	/**
137
+	 * Affiche la boite de dialogue.
138
+	 * @return Un booléen indiquant si la configuration à été modifié ou non (clic sur le bouton OK ou annuler).
139
+	 */
83 140
 	public boolean afficher()
84 141
 	{
85 142
 		setVisible(true);
86 143
 		return modifEffectuees;
87 144
 	}
88 145
 
146
+	/**
147
+	 * Répond au clic sur les bouton: restaure la configuration par défault des champs, ou confirme/infirme que des changements on eu lieu, aprés vérification de la conformité des valeurs rentrées dans les champs.
148
+	 * @param e Un ActionEvent au clic sur un bouton.
149
+	 */
89 150
 	public void actionPerformed(ActionEvent e)
90 151
 	{
91 152
 		if(e.getSource() == defParams)
@@ -105,7 +166,7 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
105 166
 		{
106 167
 			if(getNomBdd().isEmpty() || getIp().isEmpty() || getLogin().isEmpty())
107 168
 			{
108
-				JOptionPane.showMessageDialog(this, "Les champs ne doivent pas être vide.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
169
+				JOptionPane.showMessageDialog(this, "Les champs ne doivent pas être vides.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
109 170
 				return;
110 171
 			}
111 172
 			modifEffectuees = true;
@@ -117,22 +178,42 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
117 178
 		}
118 179
 	}
119 180
 
181
+	/**
182
+	 * Renvoie le nom de la bdd.
183
+	 * @return nom de la bdd.
184
+	 */
120 185
 	public String getNomBdd() {
121 186
 		return nomBdd.getText();
122 187
 	}
123 188
 
189
+	/**
190
+	 * Renvoie le port du serveur bdd.
191
+	 * @return le port du serveur bdd.
192
+	 */
124 193
 	public int getPort() {
125 194
 		return Integer.parseInt(String.valueOf(port.getValue()));
126 195
 	}
127 196
 
197
+	/**
198
+	 * Renvoie l'ip du serveur bdd.
199
+	 * @return l'ip port du serveur bdd.
200
+	 */
128 201
 	public String getIp() {
129 202
 		return ip.getText();
130 203
 	}
131 204
 
205
+	/**
206
+	 * Renvoie le login de l'utilisateur du serveur bdd.
207
+	 * @return le login de l'utilisateur du serveur bdd.
208
+	 */
132 209
 	public String getLogin() {
133 210
 		return login.getText();
134 211
 	}
135 212
 
213
+	/**
214
+	 * Renvoie le mot de passe de l'utilisateur du serveur bdd.
215
+	 * @return le mot de passe l'utilisateur du serveur bdd.
216
+	 */
136 217
 	public String getPassword() {
137 218
 		return String.valueOf(password.getPassword());
138 219
 	}

+ 52
- 1
java/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java Целия файл

@@ -5,14 +5,42 @@ import java.awt.*;
5 5
 import java.awt.event.ActionEvent;
6 6
 import java.awt.event.ActionListener;
7 7
 
8
+/**
9
+ * Boite de dialogue modale pour renseigner une nouvelle question.
10
+ * @author joseph
11
+ */
8 12
 public class NouvelleQuestionDialog extends JDialog implements ActionListener
9 13
 {
14
+	/**
15
+	 * Intitulé de la question.
16
+	 */
10 17
 	private JTextField intitule;
18
+	/**
19
+	 * Validation
20
+	 */
11 21
 	private JButton ok;
22
+	/**
23
+	 * Annulation
24
+	 */
12 25
 	private JButton annuler;
26
+	/**
27
+	 * Modification des valeurs déja présentes ou non
28
+	 */
13 29
 	private boolean mofidEffectues;
30
+	/**
31
+	 * Liste des réponses possible.
32
+	 */
14 33
 	private JComboBox reponse;
15 34
 
35
+	/**
36
+	 * Constructeur préremplissant les champs de la boite de dialogue.
37
+	 * @param title Titre de la boite de dialogue.
38
+	 * @param defIntitule Intitulé question.
39
+	 * @param defReponse Numéro bonne réponse.
40
+	 * @param reponse1 Réponse une.
41
+	 * @param reponse2 Réponse deux.
42
+	 * @param parent Parent.
43
+	 */
16 44
 	public NouvelleQuestionDialog(String title, String defIntitule, int defReponse, String reponse1, String reponse2, JFrame parent)
17 45
 	{
18 46
 		super(parent, title, true);
@@ -23,6 +51,13 @@ public class NouvelleQuestionDialog extends JDialog implements ActionListener
23 51
 		setResizable(false);
24 52
 	}
25 53
 
54
+	/**
55
+	 * Construit l'interface de la boite de dialogue.
56
+	 * @param defIntitule Intitulé question.
57
+	 * @param defReponse Numéro bonne réponse.
58
+	 * @param reponse1 Réponse une.
59
+	 * @param reponse2 Réponse deux.
60
+	 */
26 61
 	private void createInterface(String defIntitule, int defReponse, String reponse1, String reponse2)
27 62
 	{
28 63
 		JPanel champs = new JPanel();
@@ -57,12 +92,20 @@ public class NouvelleQuestionDialog extends JDialog implements ActionListener
57 92
 		getContentPane().add(boutons, BorderLayout.SOUTH);
58 93
 	}
59 94
 
95
+	/**
96
+	 * Affiche la boite de dialogue.
97
+	 * @return Un booléen indiquant si la configuration à été modifié ou non (clic sur le bouton OK ou annuler).
98
+	 */
60 99
 	public boolean afficher()
61 100
 	{
62 101
 		setVisible(true);
63 102
 		return mofidEffectues;
64 103
 	}
65 104
 
105
+	/**
106
+	 * Répond au clic sur les bouton: confirme/infirme que des changements on eu lieu, aprés vérification de la conformité des valeurs rentrées dans les champs.
107
+	 * @param e Un ActionEvent au clic sur un bouton.
108
+	 */
66 109
 	public void actionPerformed(ActionEvent e)
67 110
 	{
68 111
 		if(e.getSource() == annuler)
@@ -73,7 +116,7 @@ public class NouvelleQuestionDialog extends JDialog implements ActionListener
73 116
 		else if(e.getSource() == ok) {
74 117
 			if(intitule.getText().isEmpty())
75 118
 			{
76
-				JOptionPane.showMessageDialog(this, "Les champs ne doivent pas être vide.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
119
+				JOptionPane.showMessageDialog(this, "L'intitulé ne peut être vide.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
77 120
 				return;
78 121
 			}
79 122
 			mofidEffectues = true;
@@ -81,10 +124,18 @@ public class NouvelleQuestionDialog extends JDialog implements ActionListener
81 124
 		}
82 125
 	}
83 126
 
127
+	/**
128
+	 * Renvoie l'intitulé de la question.
129
+	 * @return l'intitulé de la question.
130
+	 */
84 131
 	public String getIntitule() {
85 132
 		return intitule.getText();
86 133
 	}
87 134
 
135
+	/**
136
+	 * Renvoie le numéro de la bonne réponse à la question.
137
+	 * @return le numéro de la bonne réponse à la question.
138
+	 */
88 139
 	public int getReponse() {
89 140
 		return reponse.getSelectedIndex();
90 141
 	}

+ 64
- 6
java/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java Целия файл

@@ -5,15 +5,46 @@ import java.awt.*;
5 5
 import java.awt.event.ActionEvent;
6 6
 import java.awt.event.ActionListener;
7 7
 
8
+/**
9
+ * Boite de dialogue modale pour renseigner un nouveau jeu de réponses.
10
+ * @author joseph
11
+ */
8 12
 public class NouvelleReponseDialog extends JDialog implements ActionListener
9 13
 {
14
+	/**
15
+	 * Réponses une.
16
+	 */
10 17
 	private JTextField rep1;
18
+	/**
19
+	 * Réponse deux.
20
+	 */
11 21
 	private JTextField rep2;
22
+	/**
23
+	 * Validation.
24
+	 */
12 25
 	private JButton ok;
26
+	/**
27
+	 * Annulation.
28
+	 */
13 29
 	private JButton annuler;
30
+	/**
31
+	 * Booléen determinant si les paramétre ont été modifié ou non.
32
+	 */
14 33
 	private boolean mofidEffectues;
34
+	/**
35
+	 * Liste des catégorie
36
+	 */
15 37
 	private JComboBox comboCat;
16 38
 
39
+	/**
40
+	 * Constructeur préremplissant les champs de la boite de dialogue.
41
+	 * @param title Titre
42
+	 * @param defRep1 Réponse une par défaut.
43
+	 * @param defRep2 Réponse deux par défaut.
44
+	 * @param defCategorie Catégorie par défaut
45
+	 * @param tabCategorie Tableau des catégories existantes.
46
+	 * @param parent Parent.
47
+	 */
17 48
 	public NouvelleReponseDialog(String title, String defRep1, String defRep2, String defCategorie, String[] tabCategorie,JFrame parent)
18 49
 	{
19 50
 		super(parent, title, true);
@@ -24,6 +55,13 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
24 55
 		setResizable(false);
25 56
 	}
26 57
 
58
+	/**
59
+	 * Construit l'interface de la boite de dialogue.
60
+	 * @param defRep1 Réponse une par défaut.
61
+	 * @param defRep2 Réponse deux par défaut.
62
+	 * @param defCategorie Catégorie par défaut
63
+	 * @param tabCategorie Tableau des catégories existantes.
64
+	 */
27 65
 	private void createInterface(String defRep1, String defRep2, String defCategorie, String[] tabCategorie)
28 66
 	{
29 67
 		JPanel champs = new JPanel();
@@ -72,12 +110,20 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
72 110
 		getContentPane().add(boutons, BorderLayout.SOUTH);
73 111
 	}
74 112
 
113
+	/**
114
+	 * Affiche la boite de dialogue.
115
+	 * @return Un booléen indiquant si la configuration à été modifié ou non (clic sur le bouton OK ou annuler).
116
+	 */
75 117
 	public boolean afficher()
76 118
 	{
77 119
 		setVisible(true);
78 120
 		return mofidEffectues;
79 121
 	}
80 122
 
123
+	/**
124
+	 * Répond au clic sur les bouton: confirme/infirme que des changements on eu lieu, aprés vérification de la conformité des valeurs rentrées dans les champs.
125
+	 * @param e Un ActionEvent au clic sur un bouton.
126
+	 */
81 127
 	public void actionPerformed(ActionEvent e)
82 128
 	{
83 129
 		if(e.getSource() == annuler)
@@ -86,9 +132,9 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
86 132
 			setVisible(false);
87 133
 		}
88 134
 		else if(e.getSource() == ok) {
89
-			if(rep1.getText().isEmpty() || rep2.getText().isEmpty())
135
+			if(rep1.getText().isEmpty() || rep2.getText().isEmpty() || rep1.getText().equals(rep2.getText()))
90 136
 			{
91
-				JOptionPane.showMessageDialog(this, "Les champs ne doivent pas être vide.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
137
+				JOptionPane.showMessageDialog(this, "Les champs ne doivent être ni vides, ni égaux.", "Champs non remplis", JOptionPane.WARNING_MESSAGE);
92 138
 				return;
93 139
 			}
94 140
 			mofidEffectues = true;
@@ -96,14 +142,26 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
96 142
 		}
97 143
 	}
98 144
 
99
-	public String getRep2() {
100
-		return rep2.getText();
101
-	}
102
-
145
+	/**
146
+	 * Renvoie la réponse une.
147
+	 * @return la réponse une.
148
+	 */
103 149
 	public String getRep1() {
104 150
 		return rep1.getText();
105 151
 	}
106 152
 
153
+	/**
154
+	 * Renvoie la réponse deux.
155
+	 * @return la réponse deux.
156
+	 */
157
+	public String getRep2() {
158
+		return rep2.getText();
159
+	}
160
+
161
+	/**
162
+	 * Renvoie la catégorie.
163
+	 * @return la catégorie.
164
+	 */
107 165
 	public String getCat() {
108 166
 		return comboCat.getSelectedItem().toString();
109 167
 	}

+ 5
- 0
java/src/InterfaceGraphique/DialogBoxes/package-info.java Целия файл

@@ -0,0 +1,5 @@
1
+/**
2
+ * Contient les boites de dialogues utilisées par l'aplication.
3
+ * @author joseph
4
+ */
5
+package InterfaceGraphique.DialogBoxes;