|
@@ -7,11 +7,17 @@
|
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$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" />
|
|
10
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
|
|
11
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="$PROJECT_DIR$/out/production/java/GestionCategories.class" />
|
|
12
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionReponses.class" afterPath="$PROJECT_DIR$/out/production/java/GestionReponses.class" />
|
11
|
13
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" />
|
12
|
14
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" />
|
|
15
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/ConnexionBDD.java" />
|
|
16
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionCategories.java" />
|
|
17
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionReponses.java" />
|
13
|
18
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
|
14
|
19
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" afterPath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
|
|
20
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
|
15
|
21
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
16
|
22
|
</list>
|
17
|
23
|
<ignored path="java.iws" />
|
|
@@ -34,11 +40,11 @@
|
34
|
40
|
</component>
|
35
|
41
|
<component name="FileEditorManager">
|
36
|
42
|
<leaf>
|
37
|
|
- <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
|
|
43
|
+ <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
|
38
|
44
|
<entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
|
39
|
45
|
<provider selected="true" editor-type-id="text-editor">
|
40
|
|
- <state vertical-scroll-proportion="0.0">
|
41
|
|
- <caret line="374" column="16" selection-start-line="374" selection-start-column="16" selection-end-line="374" selection-end-column="16" />
|
|
46
|
+ <state vertical-scroll-proportion="3.2033582">
|
|
47
|
+ <caret line="472" column="13" selection-start-line="472" selection-start-column="13" selection-end-line="472" selection-end-column="13" />
|
42
|
48
|
<folding>
|
43
|
49
|
<element signature="imports" expanded="true" />
|
44
|
50
|
</folding>
|
|
@@ -50,13 +56,15 @@
|
50
|
56
|
<entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
|
51
|
57
|
<provider selected="true" editor-type-id="text-editor">
|
52
|
58
|
<state vertical-scroll-proportion="0.0">
|
53
|
|
- <caret line="69" column="44" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="44" />
|
|
59
|
+ <caret line="88" column="94" selection-start-line="88" selection-start-column="94" selection-end-line="88" selection-end-column="94" />
|
54
|
60
|
<folding>
|
55
|
61
|
<element signature="imports" expanded="true" />
|
56
|
62
|
<element signature="e#1239#1240#0" expanded="true" />
|
57
|
63
|
<element signature="e#1294#1295#0" expanded="true" />
|
58
|
64
|
<element signature="e#1349#1350#0" expanded="true" />
|
59
|
65
|
<element signature="e#1404#1405#0" expanded="true" />
|
|
66
|
+ <element signature="e#1960#1961#0" expanded="true" />
|
|
67
|
+ <element signature="e#2017#2018#0" expanded="true" />
|
60
|
68
|
</folding>
|
61
|
69
|
</state>
|
62
|
70
|
</provider>
|
|
@@ -66,7 +74,7 @@
|
66
|
74
|
<entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
|
67
|
75
|
<provider selected="true" editor-type-id="text-editor">
|
68
|
76
|
<state vertical-scroll-proportion="0.0">
|
69
|
|
- <caret line="15" column="52" selection-start-line="15" selection-start-column="52" selection-end-line="15" selection-end-column="52" />
|
|
77
|
+ <caret line="82" column="11" selection-start-line="82" selection-start-column="11" selection-end-line="82" selection-end-column="11" />
|
70
|
78
|
<folding>
|
71
|
79
|
<element signature="imports" expanded="true" />
|
72
|
80
|
<element signature="e#2067#2068#0" expanded="true" />
|
|
@@ -80,11 +88,11 @@
|
80
|
88
|
<entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
|
81
|
89
|
<provider selected="true" editor-type-id="text-editor">
|
82
|
90
|
<state vertical-scroll-proportion="0.0">
|
83
|
|
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
|
|
91
|
+ <caret line="102" column="33" selection-start-line="102" selection-start-column="33" selection-end-line="102" selection-end-column="33" />
|
84
|
92
|
<folding>
|
85
|
93
|
<element signature="imports" expanded="true" />
|
86
|
|
- <element signature="e#996#997#0" expanded="true" />
|
87
|
|
- <element signature="e#1022#1023#0" expanded="true" />
|
|
94
|
+ <element signature="e#2963#2964#0" expanded="true" />
|
|
95
|
+ <element signature="e#2989#2990#0" expanded="true" />
|
88
|
96
|
</folding>
|
89
|
97
|
</state>
|
90
|
98
|
</provider>
|
|
@@ -111,7 +119,7 @@
|
111
|
119
|
</provider>
|
112
|
120
|
</entry>
|
113
|
121
|
</file>
|
114
|
|
- <file leaf-file-name="mcd.png" pinned="false" current-in-tab="true">
|
|
122
|
+ <file leaf-file-name="mcd.png" pinned="false" current-in-tab="false">
|
115
|
123
|
<entry file="file://$PROJECT_DIR$/mcd.png">
|
116
|
124
|
<provider selected="true" editor-type-id="images">
|
117
|
125
|
<state />
|
|
@@ -150,9 +158,9 @@
|
150
|
158
|
<option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
|
151
|
159
|
<option value="$PROJECT_DIR$/src/GestionQuestions.java" />
|
152
|
160
|
<option value="$PROJECT_DIR$/src/GestionCategories.java" />
|
153
|
|
- <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
|
154
|
|
- <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
|
155
|
161
|
<option value="$PROJECT_DIR$/src/GestionReponses.java" />
|
|
162
|
+ <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
|
|
163
|
+ <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
|
156
|
164
|
<option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
|
157
|
165
|
</list>
|
158
|
166
|
</option>
|
|
@@ -272,8 +280,8 @@
|
272
|
280
|
<sortByType />
|
273
|
281
|
</navigator>
|
274
|
282
|
<panes>
|
275
|
|
- <pane id="Scope" />
|
276
|
283
|
<pane id="PackagesPane" />
|
|
284
|
+ <pane id="Scratches" />
|
277
|
285
|
<pane id="ProjectPane">
|
278
|
286
|
<subPane>
|
279
|
287
|
<PATH>
|
|
@@ -308,7 +316,7 @@
|
308
|
316
|
</PATH>
|
309
|
317
|
</subPane>
|
310
|
318
|
</pane>
|
311
|
|
- <pane id="Scratches" />
|
|
319
|
+ <pane id="Scope" />
|
312
|
320
|
</panes>
|
313
|
321
|
</component>
|
314
|
322
|
<component name="PropertiesComponent">
|
|
@@ -585,7 +593,13 @@
|
585
|
593
|
<option name="project" value="LOCAL" />
|
586
|
594
|
<updated>1432912975055</updated>
|
587
|
595
|
</task>
|
588
|
|
- <option name="localTasksCounter" value="15" />
|
|
596
|
+ <task id="LOCAL-00015" summary="correction de bug">
|
|
597
|
+ <created>1432923249468</created>
|
|
598
|
+ <option name="number" value="00015" />
|
|
599
|
+ <option name="project" value="LOCAL" />
|
|
600
|
+ <updated>1432923249468</updated>
|
|
601
|
+ </task>
|
|
602
|
+ <option name="localTasksCounter" value="16" />
|
589
|
603
|
<servers />
|
590
|
604
|
</component>
|
591
|
605
|
<component name="TodoView">
|
|
@@ -599,7 +613,7 @@
|
599
|
613
|
</component>
|
600
|
614
|
<component name="ToolWindowManager">
|
601
|
615
|
<frame x="-1" y="27" width="1368" height="712" extended-state="6" />
|
602
|
|
- <editor active="false" />
|
|
616
|
+ <editor active="true" />
|
603
|
617
|
<layout>
|
604
|
618
|
<window_info id="Palette	" 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" />
|
605
|
619
|
<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" />
|
|
@@ -622,8 +636,8 @@
|
622
|
636
|
<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" />
|
623
|
637
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
624
|
638
|
<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" />
|
625
|
|
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
626
|
639
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
640
|
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
627
|
641
|
</layout>
|
628
|
642
|
</component>
|
629
|
643
|
<component name="Vcs.Log.UiProperties">
|
|
@@ -651,19 +665,12 @@
|
651
|
665
|
<MESSAGE value="java: gestion categorie operationelle" />
|
652
|
666
|
<MESSAGE value="java: gestion categorie operationelle et ergonomique" />
|
653
|
667
|
<MESSAGE value="++" />
|
654
|
|
- <option name="LAST_COMMIT_MESSAGE" value="++" />
|
|
668
|
+ <MESSAGE value="correction de bug" />
|
|
669
|
+ <option name="LAST_COMMIT_MESSAGE" value="correction de bug" />
|
655
|
670
|
</component>
|
656
|
671
|
<component name="XDebuggerManager">
|
657
|
672
|
<breakpoint-manager>
|
658
|
|
- <breakpoints>
|
659
|
|
- <line-breakpoint enabled="true" type="java-line">
|
660
|
|
- <url>file://$PROJECT_DIR$/src/InterfacePrincipale.java</url>
|
661
|
|
- <line>283</line>
|
662
|
|
- <properties />
|
663
|
|
- <option name="timeStamp" value="3" />
|
664
|
|
- </line-breakpoint>
|
665
|
|
- </breakpoints>
|
666
|
|
- <option name="time" value="4" />
|
|
673
|
+ <option name="time" value="5" />
|
667
|
674
|
</breakpoint-manager>
|
668
|
675
|
<watches-manager />
|
669
|
676
|
</component>
|
|
@@ -972,20 +979,6 @@
|
972
|
979
|
</state>
|
973
|
980
|
</provider>
|
974
|
981
|
</entry>
|
975
|
|
- <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
|
976
|
|
- <provider selected="true" editor-type-id="text-editor">
|
977
|
|
- <state vertical-scroll-proportion="0.12686567">
|
978
|
|
- <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
|
979
|
|
- <folding>
|
980
|
|
- <element signature="imports" expanded="true" />
|
981
|
|
- <element signature="e#1535#1536#0" expanded="true" />
|
982
|
|
- <element signature="e#1563#1564#0" expanded="true" />
|
983
|
|
- <element signature="e#1591#1592#0" expanded="true" />
|
984
|
|
- <element signature="e#1619#1620#0" expanded="true" />
|
985
|
|
- </folding>
|
986
|
|
- </state>
|
987
|
|
- </provider>
|
988
|
|
- </entry>
|
989
|
982
|
<entry file="file://$PROJECT_DIR$/src/Reponses.java">
|
990
|
983
|
<provider selected="true" editor-type-id="text-editor">
|
991
|
984
|
<state vertical-scroll-proportion="0.0">
|
|
@@ -1005,10 +998,27 @@
|
1005
|
998
|
</state>
|
1006
|
999
|
</provider>
|
1007
|
1000
|
</entry>
|
|
1001
|
+ <entry file="file://$PROJECT_DIR$/mcd.png">
|
|
1002
|
+ <provider selected="true" editor-type-id="images">
|
|
1003
|
+ <state />
|
|
1004
|
+ </provider>
|
|
1005
|
+ </entry>
|
|
1006
|
+ <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
|
|
1007
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1008
|
+ <state vertical-scroll-proportion="0.0">
|
|
1009
|
+ <caret line="102" column="33" selection-start-line="102" selection-start-column="33" selection-end-line="102" selection-end-column="33" />
|
|
1010
|
+ <folding>
|
|
1011
|
+ <element signature="imports" expanded="true" />
|
|
1012
|
+ <element signature="e#2963#2964#0" expanded="true" />
|
|
1013
|
+ <element signature="e#2989#2990#0" expanded="true" />
|
|
1014
|
+ </folding>
|
|
1015
|
+ </state>
|
|
1016
|
+ </provider>
|
|
1017
|
+ </entry>
|
1008
|
1018
|
<entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
|
1009
|
1019
|
<provider selected="true" editor-type-id="text-editor">
|
1010
|
1020
|
<state vertical-scroll-proportion="0.0">
|
1011
|
|
- <caret line="15" column="52" selection-start-line="15" selection-start-column="52" selection-end-line="15" selection-end-column="52" />
|
|
1021
|
+ <caret line="82" column="11" selection-start-line="82" selection-start-column="11" selection-end-line="82" selection-end-column="11" />
|
1012
|
1022
|
<folding>
|
1013
|
1023
|
<element signature="imports" expanded="true" />
|
1014
|
1024
|
<element signature="e#2067#2068#0" expanded="true" />
|
|
@@ -1020,44 +1030,39 @@
|
1020
|
1030
|
<entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
|
1021
|
1031
|
<provider selected="true" editor-type-id="text-editor">
|
1022
|
1032
|
<state vertical-scroll-proportion="0.0">
|
1023
|
|
- <caret line="69" column="44" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="44" />
|
|
1033
|
+ <caret line="88" column="94" selection-start-line="88" selection-start-column="94" selection-end-line="88" selection-end-column="94" />
|
1024
|
1034
|
<folding>
|
1025
|
1035
|
<element signature="imports" expanded="true" />
|
1026
|
1036
|
<element signature="e#1239#1240#0" expanded="true" />
|
1027
|
1037
|
<element signature="e#1294#1295#0" expanded="true" />
|
1028
|
1038
|
<element signature="e#1349#1350#0" expanded="true" />
|
1029
|
1039
|
<element signature="e#1404#1405#0" expanded="true" />
|
|
1040
|
+ <element signature="e#1960#1961#0" expanded="true" />
|
|
1041
|
+ <element signature="e#2017#2018#0" expanded="true" />
|
1030
|
1042
|
</folding>
|
1031
|
1043
|
</state>
|
1032
|
1044
|
</provider>
|
1033
|
1045
|
</entry>
|
1034
|
|
- <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
|
|
1046
|
+ <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
|
1035
|
1047
|
<provider selected="true" editor-type-id="text-editor">
|
1036
|
|
- <state vertical-scroll-proportion="0.0">
|
1037
|
|
- <caret line="374" column="16" selection-start-line="374" selection-start-column="16" selection-end-line="374" selection-end-column="16" />
|
|
1048
|
+ <state vertical-scroll-proportion="-0.6325967">
|
|
1049
|
+ <caret line="30" column="12" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" />
|
1038
|
1050
|
<folding>
|
1039
|
1051
|
<element signature="imports" expanded="true" />
|
1040
|
1052
|
</folding>
|
1041
|
1053
|
</state>
|
1042
|
1054
|
</provider>
|
1043
|
1055
|
</entry>
|
1044
|
|
- <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
|
|
1056
|
+ <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
|
1045
|
1057
|
<provider selected="true" editor-type-id="text-editor">
|
1046
|
|
- <state vertical-scroll-proportion="0.0">
|
1047
|
|
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
|
|
1058
|
+ <state vertical-scroll-proportion="3.2033582">
|
|
1059
|
+ <caret line="472" column="13" selection-start-line="472" selection-start-column="13" selection-end-line="472" selection-end-column="13" />
|
1048
|
1060
|
<folding>
|
1049
|
1061
|
<element signature="imports" expanded="true" />
|
1050
|
|
- <element signature="e#996#997#0" expanded="true" />
|
1051
|
|
- <element signature="e#1022#1023#0" expanded="true" />
|
1052
|
1062
|
</folding>
|
1053
|
1063
|
</state>
|
1054
|
1064
|
</provider>
|
1055
|
1065
|
</entry>
|
1056
|
|
- <entry file="file://$PROJECT_DIR$/mcd.png">
|
1057
|
|
- <provider selected="true" editor-type-id="images">
|
1058
|
|
- <state />
|
1059
|
|
- </provider>
|
1060
|
|
- </entry>
|
1061
|
1066
|
</component>
|
1062
|
1067
|
<component name="masterDetails">
|
1063
|
1068
|
<states>
|