|
|
|
|
6
|
</artifacts-to-build>
|
6
|
</artifacts-to-build>
|
7
|
</component>
|
7
|
</component>
|
8
|
<component name="ChangeListManager">
|
8
|
<component name="ChangeListManager">
|
9
|
- <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="boite de dialogue plus ergonomique">
|
|
|
10
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
|
|
|
11
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Modele/Categorie.java" />
|
|
|
12
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java" />
|
|
|
13
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/ConnexionBDD.java" />
|
|
|
14
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
|
|
|
15
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionCategories.java" />
|
|
|
16
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionQuestions.java" />
|
|
|
17
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
|
|
|
18
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
|
|
|
19
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java" />
|
|
|
20
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.java" />
|
|
|
21
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Modele/Question.java" />
|
|
|
22
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Modele/Reponses.java" />
|
|
|
23
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/Bouton.class" afterPath="" />
|
|
|
24
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/Categorie.class" afterPath="" />
|
|
|
25
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/ConnectDialog.class" afterPath="" />
|
|
|
26
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="" />
|
|
|
27
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="" />
|
|
|
28
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionQuestions.class" afterPath="" />
|
|
|
29
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/GestionReponses.class" afterPath="" />
|
|
|
30
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$1.class" afterPath="" />
|
|
|
31
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="" />
|
|
|
32
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="" />
|
|
|
33
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/Question.class" afterPath="" />
|
|
|
34
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/out/production/java/Reponses.class" afterPath="" />
|
|
|
35
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/Bouton.java" afterPath="" />
|
|
|
36
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/Categorie.java" afterPath="" />
|
|
|
37
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/ConfigBDD.java" afterPath="" />
|
|
|
38
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/ConnectDialog.java" afterPath="" />
|
|
|
39
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="" />
|
|
|
40
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/ConnexionBddDialog.java" afterPath="" />
|
|
|
41
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/GestionCategories.java" afterPath="" />
|
|
|
42
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/GestionQuestions.java" afterPath="" />
|
|
|
43
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/GestionReponses.java" afterPath="" />
|
|
|
44
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="" />
|
|
|
45
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" afterPath="" />
|
|
|
46
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="" />
|
|
|
47
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/Question.java" afterPath="" />
|
|
|
48
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/Reponses.java" afterPath="" />
|
|
|
49
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" afterPath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" />
|
|
|
50
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
|
|
|
|
|
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" />
|
|
|
11
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
|
51
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
12
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
52
|
</list>
|
13
|
</list>
|
53
|
<ignored path="java.iws" />
|
14
|
<ignored path="java.iws" />
|
|
|
|
|
70
|
</component>
|
31
|
</component>
|
71
|
<component name="FileEditorManager">
|
32
|
<component name="FileEditorManager">
|
72
|
<leaf>
|
33
|
<leaf>
|
73
|
- <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
|
|
|
|
|
34
|
+ <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
|
74
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
|
35
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
|
75
|
<provider selected="true" editor-type-id="text-editor">
|
36
|
<provider selected="true" editor-type-id="text-editor">
|
76
|
- <state vertical-scroll-proportion="-6.317164">
|
|
|
77
|
- <caret line="81" column="28" selection-start-line="81" selection-start-column="28" selection-end-line="81" selection-end-column="28" />
|
|
|
|
|
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" />
|
78
|
<folding>
|
39
|
<folding>
|
79
|
<element signature="imports" expanded="true" />
|
40
|
<element signature="imports" expanded="true" />
|
80
|
</folding>
|
41
|
</folding>
|
|
|
|
|
82
|
</provider>
|
43
|
</provider>
|
83
|
</entry>
|
44
|
</entry>
|
84
|
</file>
|
45
|
</file>
|
85
|
- <file leaf-file-name="Categorie.java" pinned="false" current-in-tab="false">
|
|
|
86
|
- <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
|
|
|
|
|
46
|
+ <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="true">
|
|
|
47
|
+ <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
|
87
|
<provider selected="true" editor-type-id="text-editor">
|
48
|
<provider selected="true" editor-type-id="text-editor">
|
88
|
- <state vertical-scroll-proportion="0.0">
|
|
|
89
|
- <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
|
|
|
|
|
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" />
|
90
|
<folding>
|
51
|
<folding>
|
91
|
- <element signature="e#97#98#0" expanded="true" />
|
|
|
92
|
- <element signature="e#118#119#0" expanded="true" />
|
|
|
|
|
52
|
+ <element signature="imports" expanded="true" />
|
93
|
</folding>
|
53
|
</folding>
|
94
|
</state>
|
54
|
</state>
|
95
|
</provider>
|
55
|
</provider>
|
96
|
</entry>
|
56
|
</entry>
|
97
|
</file>
|
57
|
</file>
|
98
|
- <file leaf-file-name="Reponses.java" pinned="false" current-in-tab="false">
|
|
|
99
|
- <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
|
|
|
100
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
101
|
- <state vertical-scroll-proportion="0.0">
|
|
|
102
|
- <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
|
|
103
|
- <folding />
|
|
|
104
|
- </state>
|
|
|
105
|
- </provider>
|
|
|
106
|
- </entry>
|
|
|
107
|
- </file>
|
|
|
108
|
<file leaf-file-name="ConfigBDD.java" pinned="false" current-in-tab="false">
|
58
|
<file leaf-file-name="ConfigBDD.java" pinned="false" current-in-tab="false">
|
109
|
<entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
|
59
|
<entry file="file://$PROJECT_DIR$/src/GestionBddDAO/ConfigBDD.java">
|
110
|
<provider selected="true" editor-type-id="text-editor">
|
60
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
119
|
</provider>
|
69
|
</provider>
|
120
|
</entry>
|
70
|
</entry>
|
121
|
</file>
|
71
|
</file>
|
122
|
- <file leaf-file-name="Bouton.java" pinned="false" current-in-tab="false">
|
|
|
123
|
- <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java">
|
|
|
124
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
125
|
- <state vertical-scroll-proportion="0.0">
|
|
|
126
|
- <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
|
|
|
127
|
- <folding>
|
|
|
128
|
- <element signature="imports" expanded="true" />
|
|
|
129
|
- </folding>
|
|
|
130
|
- </state>
|
|
|
131
|
- </provider>
|
|
|
132
|
- </entry>
|
|
|
133
|
- </file>
|
|
|
134
|
<file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
|
72
|
<file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
|
135
|
<entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java">
|
73
|
<entry file="file://$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java">
|
136
|
<provider selected="true" editor-type-id="text-editor">
|
74
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
175
|
</provider>
|
113
|
</provider>
|
176
|
</entry>
|
114
|
</entry>
|
177
|
</file>
|
115
|
</file>
|
178
|
- <file leaf-file-name="NouvelleQuestionDialog.java" pinned="false" current-in-tab="false">
|
|
|
179
|
- <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
|
|
|
180
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
181
|
- <state vertical-scroll-proportion="0.0">
|
|
|
182
|
- <caret line="75" column="143" selection-start-line="75" selection-start-column="143" selection-end-line="75" selection-end-column="143" />
|
|
|
183
|
- <folding />
|
|
|
184
|
- </state>
|
|
|
185
|
- </provider>
|
|
|
186
|
- </entry>
|
|
|
187
|
- </file>
|
|
|
188
|
</leaf>
|
116
|
</leaf>
|
189
|
</component>
|
117
|
</component>
|
190
|
<component name="FileTemplateManagerImpl">
|
118
|
<component name="FileTemplateManagerImpl">
|
|
|
|
|
231
|
<option value="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
|
159
|
<option value="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
|
232
|
<option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
|
160
|
<option value="$PROJECT_DIR$/src/GestionBddDAO/GestionReponses.java" />
|
233
|
<option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
|
161
|
<option value="$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java" />
|
|
|
162
|
+ <option value="$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java" />
|
234
|
</list>
|
163
|
</list>
|
235
|
</option>
|
164
|
</option>
|
236
|
</component>
|
165
|
</component>
|
|
|
|
|
349
|
<sortByType />
|
278
|
<sortByType />
|
350
|
</navigator>
|
279
|
</navigator>
|
351
|
<panes>
|
280
|
<panes>
|
352
|
- <pane id="PackagesPane" />
|
|
|
|
|
281
|
+ <pane id="Scratches" />
|
|
|
282
|
+ <pane id="Scope" />
|
353
|
<pane id="ProjectPane">
|
283
|
<pane id="ProjectPane">
|
354
|
<subPane>
|
284
|
<subPane>
|
355
|
<PATH>
|
285
|
<PATH>
|
|
|
|
|
460
|
</PATH>
|
390
|
</PATH>
|
461
|
</subPane>
|
391
|
</subPane>
|
462
|
</pane>
|
392
|
</pane>
|
463
|
- <pane id="Scope" />
|
|
|
464
|
- <pane id="Scratches" />
|
|
|
|
|
393
|
+ <pane id="PackagesPane" />
|
465
|
</panes>
|
394
|
</panes>
|
466
|
</component>
|
395
|
</component>
|
467
|
<component name="PropertiesComponent">
|
396
|
<component name="PropertiesComponent">
|
|
|
|
|
495
|
<recent name="DialogBoxes" />
|
424
|
<recent name="DialogBoxes" />
|
496
|
</key>
|
425
|
</key>
|
497
|
</component>
|
426
|
</component>
|
498
|
- <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
|
|
|
499
|
- <UpdatedFiles>
|
|
|
500
|
- <FILE-GROUP>
|
|
|
501
|
- <option name="myUpdateName" value="Updated from server" />
|
|
|
502
|
- <option name="myStatusName" value="Changed on server" />
|
|
|
503
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
504
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
505
|
- <option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
506
|
- <FILE-GROUP>
|
|
|
507
|
- <option name="myUpdateName" value="Updated" />
|
|
|
508
|
- <option name="myStatusName" value="Changed" />
|
|
|
509
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
510
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
511
|
- <option name="myId" value="UPDATED" />
|
|
|
512
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/controller/palmares.php</PATH>
|
|
|
513
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.categorie.php</PATH>
|
|
|
514
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.connector.php</PATH>
|
|
|
515
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.questset.php</PATH>
|
|
|
516
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/game.js</PATH>
|
|
|
517
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/client/index.html</PATH>
|
|
|
518
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/client/js/game.js</PATH>
|
|
|
519
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/server/server.js</PATH>
|
|
|
520
|
- </FILE-GROUP>
|
|
|
521
|
- <FILE-GROUP>
|
|
|
522
|
- <option name="myUpdateName" value="Created" />
|
|
|
523
|
- <option name="myStatusName" value="Created" />
|
|
|
524
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
525
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
526
|
- <option name="myId" value="CREATED" />
|
|
|
527
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/test.php</PATH>
|
|
|
528
|
- </FILE-GROUP>
|
|
|
529
|
- <FILE-GROUP>
|
|
|
530
|
- <option name="myUpdateName" value="Deleted" />
|
|
|
531
|
- <option name="myStatusName" value="Deleted" />
|
|
|
532
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
533
|
- <option name="myCanBeAbsent" value="true" />
|
|
|
534
|
- <option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
535
|
- <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/tests.php</PATH>
|
|
|
536
|
- </FILE-GROUP>
|
|
|
537
|
- <FILE-GROUP>
|
|
|
538
|
- <option name="myUpdateName" value="Restored" />
|
|
|
539
|
- <option name="myStatusName" value="Will be restored" />
|
|
|
540
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
541
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
542
|
- <option name="myId" value="RESTORED" />
|
|
|
543
|
- </FILE-GROUP>
|
|
|
544
|
- </FILE-GROUP>
|
|
|
545
|
- <FILE-GROUP>
|
|
|
546
|
- <option name="myUpdateName" value="Modified" />
|
|
|
547
|
- <option name="myStatusName" value="Modified" />
|
|
|
548
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
549
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
550
|
- <option name="myId" value="MODIFIED" />
|
|
|
551
|
- </FILE-GROUP>
|
|
|
552
|
- <FILE-GROUP>
|
|
|
553
|
- <option name="myUpdateName" value="Skipped" />
|
|
|
554
|
- <option name="myStatusName" value="Skipped" />
|
|
|
555
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
556
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
557
|
- <option name="myId" value="SKIPPED" />
|
|
|
558
|
- </FILE-GROUP>
|
|
|
559
|
- <FILE-GROUP>
|
|
|
560
|
- <option name="myUpdateName" value="Merged with conflicts" />
|
|
|
561
|
- <option name="myStatusName" value="Will be merged with conflicts" />
|
|
|
562
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
563
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
564
|
- <option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
565
|
- </FILE-GROUP>
|
|
|
566
|
- <FILE-GROUP>
|
|
|
567
|
- <option name="myUpdateName" value="Merged with tree conflicts" />
|
|
|
568
|
- <option name="myStatusName" value="Merged with tree conflicts" />
|
|
|
569
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
570
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
571
|
- <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
572
|
- </FILE-GROUP>
|
|
|
573
|
- <FILE-GROUP>
|
|
|
574
|
- <option name="myUpdateName" value="Merged with property conflicts" />
|
|
|
575
|
- <option name="myStatusName" value="Will be merged with property conflicts" />
|
|
|
576
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
577
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
578
|
- <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
579
|
- </FILE-GROUP>
|
|
|
580
|
- <FILE-GROUP>
|
|
|
581
|
- <option name="myUpdateName" value="Merged" />
|
|
|
582
|
- <option name="myStatusName" value="Will be merged" />
|
|
|
583
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
584
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
585
|
- <option name="myId" value="MERGED" />
|
|
|
586
|
- </FILE-GROUP>
|
|
|
587
|
- <FILE-GROUP>
|
|
|
588
|
- <option name="myUpdateName" value="Not in repository" />
|
|
|
589
|
- <option name="myStatusName" value="Not in repository" />
|
|
|
590
|
- <option name="mySupportsDeletion" value="true" />
|
|
|
591
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
592
|
- <option name="myId" value="UNKNOWN" />
|
|
|
593
|
- </FILE-GROUP>
|
|
|
594
|
- <FILE-GROUP>
|
|
|
595
|
- <option name="myUpdateName" value="Locally added" />
|
|
|
596
|
- <option name="myStatusName" value="Locally added" />
|
|
|
597
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
598
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
599
|
- <option name="myId" value="LOCALLY_ADDED" />
|
|
|
600
|
- </FILE-GROUP>
|
|
|
601
|
- <FILE-GROUP>
|
|
|
602
|
- <option name="myUpdateName" value="Locally removed" />
|
|
|
603
|
- <option name="myStatusName" value="Locally removed" />
|
|
|
604
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
605
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
606
|
- <option name="myId" value="LOCALLY_REMOVED" />
|
|
|
607
|
- </FILE-GROUP>
|
|
|
608
|
- <FILE-GROUP>
|
|
|
609
|
- <option name="myUpdateName" value="Switched" />
|
|
|
610
|
- <option name="myStatusName" value="Switched" />
|
|
|
611
|
- <option name="mySupportsDeletion" value="false" />
|
|
|
612
|
- <option name="myCanBeAbsent" value="false" />
|
|
|
613
|
- <option name="myId" value="SWITCHED" />
|
|
|
614
|
- </FILE-GROUP>
|
|
|
615
|
- </UpdatedFiles>
|
|
|
616
|
- </component>
|
|
|
617
|
<component name="RunManager" selected="Application.Main">
|
427
|
<component name="RunManager" selected="Application.Main">
|
618
|
<configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
|
428
|
<configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
|
619
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
429
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
|
|
|
935
|
<option name="project" value="LOCAL" />
|
745
|
<option name="project" value="LOCAL" />
|
936
|
<updated>1433508006053</updated>
|
746
|
<updated>1433508006053</updated>
|
937
|
</task>
|
747
|
</task>
|
938
|
- <option name="localTasksCounter" value="27" />
|
|
|
|
|
748
|
+ <task id="LOCAL-00027" summary="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon) NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)">
|
|
|
749
|
+ <created>1433516680268</created>
|
|
|
750
|
+ <option name="number" value="00027" />
|
|
|
751
|
+ <option name="project" value="LOCAL" />
|
|
|
752
|
+ <updated>1433516680268</updated>
|
|
|
753
|
+ </task>
|
|
|
754
|
+ <option name="localTasksCounter" value="28" />
|
939
|
<servers />
|
755
|
<servers />
|
940
|
</component>
|
756
|
</component>
|
941
|
<component name="TodoView">
|
757
|
<component name="TodoView">
|
|
|
|
|
966
|
<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" />
|
782
|
<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" />
|
967
|
<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" />
|
783
|
<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" />
|
968
|
<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" />
|
784
|
<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" />
|
969
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26291794" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
970
|
- <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" />
|
|
|
|
|
785
|
+ <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" />
|
971
|
<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" />
|
787
|
<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" />
|
972
|
<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" />
|
788
|
<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" />
|
973
|
<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" />
|
789
|
<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" />
|
974
|
<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" />
|
790
|
<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" />
|
975
|
- <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="4" side_tool="false" content_ui="tabs" />
|
|
|
976
|
<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" />
|
791
|
<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" />
|
|
|
792
|
+ <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="4" side_tool="false" content_ui="tabs" />
|
977
|
</layout>
|
793
|
</layout>
|
978
|
</component>
|
794
|
</component>
|
979
|
<component name="Vcs.Log.UiProperties">
|
795
|
<component name="Vcs.Log.UiProperties">
|
|
|
|
|
1011
|
<MESSAGE value="amelioration diverse concernant la boite de dialogue des parametres" />
|
827
|
<MESSAGE value="amelioration diverse concernant la boite de dialogue des parametres" />
|
1012
|
<MESSAGE value="modification parametre operationelle" />
|
828
|
<MESSAGE value="modification parametre operationelle" />
|
1013
|
<MESSAGE value="boite de dialogue plus ergonomique" />
|
829
|
<MESSAGE value="boite de dialogue plus ergonomique" />
|
1014
|
- <option name="LAST_COMMIT_MESSAGE" value="boite de dialogue plus ergonomique" />
|
|
|
|
|
830
|
+ <MESSAGE value="PATATTE ET MAYONAISE!!!!!!!!! (+ cornichon et emental sinon c'est pas bon) 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) NE PAS OUBLIER LA SOUPE AU POTIRON!!!!! (À MELANGER AVEC AMOUR BIEN SUR.)" />
|
1015
|
</component>
|
832
|
</component>
|
1016
|
<component name="XDebuggerManager">
|
833
|
<component name="XDebuggerManager">
|
1017
|
<breakpoint-manager>
|
834
|
<breakpoint-manager>
|
|
|
|
|
1300
|
</state>
|
1117
|
</state>
|
1301
|
</provider>
|
1118
|
</provider>
|
1302
|
</entry>
|
1119
|
</entry>
|
1303
|
- <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
|
|
|
1304
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1305
|
- <state vertical-scroll-proportion="0.0">
|
|
|
1306
|
- <caret line="107" column="143" selection-start-line="107" selection-start-column="143" selection-end-line="107" selection-end-column="143" />
|
|
|
1307
|
- <folding>
|
|
|
1308
|
- <element signature="imports" expanded="true" />
|
|
|
1309
|
- </folding>
|
|
|
1310
|
- </state>
|
|
|
1311
|
- </provider>
|
|
|
1312
|
- </entry>
|
|
|
1313
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
|
1120
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.java">
|
1314
|
<provider selected="true" editor-type-id="text-editor">
|
1121
|
<provider selected="true" editor-type-id="text-editor">
|
1315
|
<state vertical-scroll-proportion="0.0">
|
1122
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
1397
|
</entry>
|
1204
|
</entry>
|
1398
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
|
1205
|
<entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/InterfacePrincipale.java">
|
1399
|
<provider selected="true" editor-type-id="text-editor">
|
1206
|
<provider selected="true" editor-type-id="text-editor">
|
1400
|
- <state vertical-scroll-proportion="-6.317164">
|
|
|
1401
|
- <caret line="81" column="28" selection-start-line="81" selection-start-column="28" selection-end-line="81" selection-end-column="28" />
|
|
|
|
|
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>
|
|
|
1212
|
+ </state>
|
|
|
1213
|
+ </provider>
|
|
|
1214
|
+ </entry>
|
|
|
1215
|
+ <entry file="file://$PROJECT_DIR$/src/InterfaceGraphique/DialogBoxes/ConnexionBddDialog.java">
|
|
|
1216
|
+ <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" />
|
1402
|
<folding>
|
1219
|
<folding>
|
1403
|
<element signature="imports" expanded="true" />
|
1220
|
<element signature="imports" expanded="true" />
|
1404
|
</folding>
|
1221
|
</folding>
|