|
@@ -3,25 +3,17 @@
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="ad381d05-32c5-4ad5-8041-a0cb51a71fd9" name="Default" comment="">
|
5
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
6
|
|
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
7
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" afterDir="false" />
|
8
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" afterDir="false" />
|
9
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" afterDir="false" />
|
10
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" afterDir="false" />
|
11
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/SharedTravelApp.class" beforeDir="false" />
|
12
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/DestinationController.class" beforeDir="false" />
|
13
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/HomeController.class" beforeDir="false" />
|
14
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/LoginController.class" beforeDir="false" />
|
15
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/ProfileController.class" beforeDir="false" />
|
16
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/UserController.class" beforeDir="false" />
|
17
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Destination.class" beforeDir="false" />
|
18
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Login.class" beforeDir="false" />
|
19
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Profile.class" beforeDir="false" />
|
20
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/User.class" beforeDir="false" />
|
21
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/DestinationRepository.class" beforeDir="false" />
|
22
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/LoginRepository.class" beforeDir="false" />
|
23
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/ProfileRepository.class" beforeDir="false" />
|
24
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/UserRepository.class" beforeDir="false" />
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" afterDir="false" />
|
|
7
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" afterDir="false" />
|
|
8
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" afterDir="false" />
|
|
9
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" afterDir="false" />
|
|
10
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" afterDir="false" />
|
|
11
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" afterDir="false" />
|
|
12
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" afterDir="false" />
|
|
13
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" afterDir="false" />
|
|
14
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/LoginControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/LoginControllerTest.class" afterDir="false" />
|
|
15
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/ProfileControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ProfileControllerTest.class" afterDir="false" />
|
|
16
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/UserControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/UserControllerTest.class" afterDir="false" />
|
25
|
17
|
</list>
|
26
|
18
|
<ignored path="$PROJECT_DIR$/out/" />
|
27
|
19
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -37,17 +29,17 @@
|
37
|
29
|
<file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
|
38
|
30
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
39
|
31
|
<provider selected="true" editor-type-id="text-editor">
|
40
|
|
- <state relative-caret-position="255">
|
41
|
|
- <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
|
|
32
|
+ <state relative-caret-position="285">
|
|
33
|
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
42
|
34
|
</state>
|
43
|
35
|
</provider>
|
44
|
36
|
</entry>
|
45
|
37
|
</file>
|
46
|
|
- <file leaf-file-name="Profile.java" pinned="false" current-in-tab="false">
|
47
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
|
38
|
+ <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
|
|
39
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
48
|
40
|
<provider selected="true" editor-type-id="text-editor">
|
49
|
|
- <state relative-caret-position="120">
|
50
|
|
- <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
|
|
41
|
+ <state relative-caret-position="345">
|
|
42
|
+ <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
|
51
|
43
|
<folding>
|
52
|
44
|
<element signature="imports" expanded="true" />
|
53
|
45
|
</folding>
|
|
@@ -55,44 +47,41 @@
|
55
|
47
|
</provider>
|
56
|
48
|
</entry>
|
57
|
49
|
</file>
|
58
|
|
- <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
|
59
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
|
50
|
+ <file leaf-file-name="Profile.java" pinned="false" current-in-tab="false">
|
|
51
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
60
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
61
|
|
- <state relative-caret-position="195">
|
62
|
|
- <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
|
|
53
|
+ <state relative-caret-position="495">
|
|
54
|
+ <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
|
63
|
55
|
<folding>
|
64
|
|
- <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
|
|
56
|
+ <element signature="imports" expanded="true" />
|
65
|
57
|
</folding>
|
66
|
58
|
</state>
|
67
|
59
|
</provider>
|
68
|
60
|
</entry>
|
69
|
61
|
</file>
|
70
|
|
- <file leaf-file-name="UserController.java" pinned="false" current-in-tab="true">
|
71
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
|
62
|
+ <file leaf-file-name="ProfileRepository.java" pinned="false" current-in-tab="false">
|
|
63
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
|
72
|
64
|
<provider selected="true" editor-type-id="text-editor">
|
73
|
|
- <state relative-caret-position="390">
|
74
|
|
- <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
|
75
|
|
- <folding>
|
76
|
|
- <element signature="imports" expanded="true" />
|
77
|
|
- </folding>
|
|
65
|
+ <state relative-caret-position="75">
|
|
66
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
78
|
67
|
</state>
|
79
|
68
|
</provider>
|
80
|
69
|
</entry>
|
81
|
70
|
</file>
|
82
|
|
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
83
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
71
|
+ <file leaf-file-name="DestinationRepository.java" pinned="false" current-in-tab="false">
|
|
72
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
|
84
|
73
|
<provider selected="true" editor-type-id="text-editor">
|
85
|
|
- <state relative-caret-position="300">
|
86
|
|
- <caret line="20" selection-start-line="20" selection-end-line="20" />
|
|
74
|
+ <state relative-caret-position="75">
|
|
75
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
87
|
76
|
</state>
|
88
|
77
|
</provider>
|
89
|
78
|
</entry>
|
90
|
79
|
</file>
|
91
|
|
- <file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
|
92
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
|
80
|
+ <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
|
|
81
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
93
|
82
|
<provider selected="true" editor-type-id="text-editor">
|
94
|
|
- <state relative-caret-position="210">
|
95
|
|
- <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
|
|
83
|
+ <state relative-caret-position="90">
|
|
84
|
+ <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
|
96
|
85
|
<folding>
|
97
|
86
|
<element signature="imports" expanded="true" />
|
98
|
87
|
</folding>
|
|
@@ -100,23 +89,23 @@
|
100
|
89
|
</provider>
|
101
|
90
|
</entry>
|
102
|
91
|
</file>
|
103
|
|
- <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
|
104
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
|
92
|
+ <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
|
|
93
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
105
|
94
|
<provider selected="true" editor-type-id="text-editor">
|
106
|
|
- <state relative-caret-position="150">
|
107
|
|
- <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
|
|
95
|
+ <state relative-caret-position="330">
|
|
96
|
+ <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
|
108
|
97
|
<folding>
|
109
|
|
- <element signature="imports" expanded="true" />
|
|
98
|
+ <marker date="1533129044369" expanded="true" signature="346:636" ph="..." />
|
110
|
99
|
</folding>
|
111
|
100
|
</state>
|
112
|
101
|
</provider>
|
113
|
102
|
</entry>
|
114
|
103
|
</file>
|
115
|
|
- <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
|
116
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
|
|
104
|
+ <file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
|
|
105
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
117
|
106
|
<provider selected="true" editor-type-id="text-editor">
|
118
|
|
- <state relative-caret-position="225">
|
119
|
|
- <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
|
|
107
|
+ <state relative-caret-position="300">
|
|
108
|
+ <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
|
120
|
109
|
<folding>
|
121
|
110
|
<element signature="imports" expanded="true" />
|
122
|
111
|
</folding>
|
|
@@ -124,11 +113,11 @@
|
124
|
113
|
</provider>
|
125
|
114
|
</entry>
|
126
|
115
|
</file>
|
127
|
|
- <file leaf-file-name="ProfileController.java" pinned="false" current-in-tab="false">
|
128
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
|
|
116
|
+ <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
|
|
117
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
129
|
118
|
<provider selected="true" editor-type-id="text-editor">
|
130
|
|
- <state relative-caret-position="255">
|
131
|
|
- <caret line="23" selection-start-line="23" selection-end-line="23" />
|
|
119
|
+ <state relative-caret-position="150">
|
|
120
|
+ <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
|
132
|
121
|
<folding>
|
133
|
122
|
<element signature="imports" expanded="true" />
|
134
|
123
|
</folding>
|
|
@@ -136,11 +125,11 @@
|
136
|
125
|
</provider>
|
137
|
126
|
</entry>
|
138
|
127
|
</file>
|
139
|
|
- <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
|
|
128
|
+ <file leaf-file-name="Destination.java" pinned="false" current-in-tab="true">
|
140
|
129
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
141
|
130
|
<provider selected="true" editor-type-id="text-editor">
|
142
|
|
- <state relative-caret-position="1740">
|
143
|
|
- <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
|
|
131
|
+ <state relative-caret-position="122">
|
|
132
|
+ <caret line="43" column="46" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
|
144
|
133
|
<folding>
|
145
|
134
|
<element signature="imports" expanded="true" />
|
146
|
135
|
</folding>
|
|
@@ -202,24 +191,24 @@
|
202
|
191
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
|
203
|
192
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
|
204
|
193
|
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
205
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" />
|
206
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
|
207
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
|
208
|
194
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java" />
|
209
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" />
|
210
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" />
|
211
|
195
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" />
|
212
|
196
|
<option value="$PROJECT_DIR$/src/test/java/AppTest.java" />
|
213
|
197
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" />
|
214
|
198
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java" />
|
215
|
199
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java" />
|
216
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
|
217
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
218
|
200
|
<option value="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" />
|
219
|
201
|
<option value="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" />
|
220
|
202
|
<option value="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" />
|
221
|
203
|
<option value="$PROJECT_DIR$/src/test/java/UserControllerTest.java" />
|
222
|
204
|
<option value="$PROJECT_DIR$/pom.xml" />
|
|
205
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" />
|
|
206
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" />
|
|
207
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
|
|
208
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" />
|
|
209
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
|
|
210
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
|
|
211
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
223
|
212
|
</list>
|
224
|
213
|
</option>
|
225
|
214
|
</component>
|
|
@@ -240,9 +229,10 @@
|
240
|
229
|
<packageJsonPaths />
|
241
|
230
|
</component>
|
242
|
231
|
<component name="ProjectFrameBounds" fullScreen="true">
|
243
|
|
- <option name="x" value="1280" />
|
244
|
|
- <option name="width" value="1680" />
|
245
|
|
- <option name="height" value="1050" />
|
|
232
|
+ <option name="x" value="-320" />
|
|
233
|
+ <option name="y" value="-983" />
|
|
234
|
+ <option name="width" value="1280" />
|
|
235
|
+ <option name="height" value="713" />
|
246
|
236
|
</component>
|
247
|
237
|
<component name="ProjectLevelVcsManager">
|
248
|
238
|
<ConfirmationsSetting value="2" id="Add" />
|
|
@@ -252,7 +242,6 @@
|
252
|
242
|
<foldersAlwaysOnTop value="true" />
|
253
|
243
|
</navigator>
|
254
|
244
|
<panes>
|
255
|
|
- <pane id="Scope" />
|
256
|
245
|
<pane id="AndroidView" />
|
257
|
246
|
<pane id="ProjectPane">
|
258
|
247
|
<subPane>
|
|
@@ -338,6 +327,7 @@
|
338
|
327
|
<select />
|
339
|
328
|
</subPane>
|
340
|
329
|
</pane>
|
|
330
|
+ <pane id="Scope" />
|
341
|
331
|
<pane id="PackagesPane" />
|
342
|
332
|
</panes>
|
343
|
333
|
</component>
|
|
@@ -527,6 +517,7 @@
|
527
|
517
|
<workItem from="1532541641694" duration="615000" />
|
528
|
518
|
<workItem from="1532635085154" duration="2289000" />
|
529
|
519
|
<workItem from="1532786194419" duration="318000" />
|
|
520
|
+ <workItem from="1532903810519" duration="7096000" />
|
530
|
521
|
</task>
|
531
|
522
|
<servers />
|
532
|
523
|
</component>
|
|
@@ -557,7 +548,7 @@
|
557
|
548
|
</history-entry>
|
558
|
549
|
</component>
|
559
|
550
|
<component name="TimeTrackingManager">
|
560
|
|
- <option name="totallyTimeSpent" value="79320000" />
|
|
551
|
+ <option name="totallyTimeSpent" value="86416000" />
|
561
|
552
|
</component>
|
562
|
553
|
<component name="TodoView">
|
563
|
554
|
<todo-panel id="selected-file">
|
|
@@ -569,7 +560,7 @@
|
569
|
560
|
</todo-panel>
|
570
|
561
|
</component>
|
571
|
562
|
<component name="ToolWindowManager">
|
572
|
|
- <frame x="1280" y="0" width="1680" height="1050" extended-state="0" />
|
|
563
|
+ <frame x="-320" y="-1080" width="1920" height="1080" extended-state="0" />
|
573
|
564
|
<editor active="true" />
|
574
|
565
|
<layout>
|
575
|
566
|
<window_info anchor="right" id="Palette" order="3" />
|
|
@@ -579,20 +570,21 @@
|
579
|
570
|
<window_info id="Capture Tool" order="2" />
|
580
|
571
|
<window_info id="Designer" order="2" />
|
581
|
572
|
<window_info anchor="right" id="Database" order="3" />
|
582
|
|
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
573
|
+ <window_info id="Structure" order="1" sideWeight="0.50144094" side_tool="true" weight="0.17252396" />
|
583
|
574
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
584
|
575
|
<window_info id="UI Designer" order="2" />
|
585
|
576
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.3409091" />
|
586
|
577
|
<window_info anchor="bottom" id="TODO" order="6" weight="0.32954547" />
|
|
578
|
+ <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
|
587
|
579
|
<window_info anchor="right" id="Palette	" order="3" />
|
588
|
580
|
<window_info id="Image Layers" order="2" />
|
589
|
581
|
<window_info anchor="bottom" id="Java Enterprise" order="8" />
|
590
|
582
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
591
|
583
|
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
|
592
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.39310345" />
|
|
584
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.30945274" />
|
593
|
585
|
<window_info anchor="bottom" id="Spring" order="8" weight="0.32935324" />
|
594
|
|
- <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.23384616" />
|
595
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22344323" />
|
|
586
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.36307693" />
|
|
587
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4985591" visible="true" weight="0.17252396" />
|
596
|
588
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
597
|
589
|
<window_info id="Web" order="3" side_tool="true" />
|
598
|
590
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
|
@@ -600,7 +592,6 @@
|
600
|
592
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
601
|
593
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
602
|
594
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
603
|
|
- <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
|
604
|
595
|
<window_info anchor="bottom" id="Message" order="0" />
|
605
|
596
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
606
|
597
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
|
|
@@ -701,34 +692,6 @@
|
701
|
692
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationState.java" />
|
702
|
693
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
|
703
|
694
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
|
704
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
|
705
|
|
- <provider selected="true" editor-type-id="text-editor">
|
706
|
|
- <state relative-caret-position="75">
|
707
|
|
- <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
708
|
|
- </state>
|
709
|
|
- </provider>
|
710
|
|
- </entry>
|
711
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java">
|
712
|
|
- <provider selected="true" editor-type-id="text-editor">
|
713
|
|
- <state relative-caret-position="75">
|
714
|
|
- <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
|
715
|
|
- </state>
|
716
|
|
- </provider>
|
717
|
|
- </entry>
|
718
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
|
719
|
|
- <provider selected="true" editor-type-id="text-editor">
|
720
|
|
- <state relative-caret-position="75">
|
721
|
|
- <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
722
|
|
- </state>
|
723
|
|
- </provider>
|
724
|
|
- </entry>
|
725
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
726
|
|
- <provider selected="true" editor-type-id="text-editor">
|
727
|
|
- <state relative-caret-position="75">
|
728
|
|
- <caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
|
729
|
|
- </state>
|
730
|
|
- </provider>
|
731
|
|
- </entry>
|
732
|
695
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
733
|
696
|
<provider selected="true" editor-type-id="text-editor">
|
734
|
697
|
<state relative-caret-position="75">
|
|
@@ -777,53 +740,66 @@
|
777
|
740
|
</state>
|
778
|
741
|
</provider>
|
779
|
742
|
</entry>
|
780
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
|
743
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
744
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
745
|
+ <state relative-caret-position="300">
|
|
746
|
+ <caret line="20" selection-start-line="20" selection-end-line="20" />
|
|
747
|
+ </state>
|
|
748
|
+ </provider>
|
|
749
|
+ </entry>
|
|
750
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java">
|
781
|
751
|
<provider selected="true" editor-type-id="text-editor">
|
782
|
|
- <state relative-caret-position="1740">
|
783
|
|
- <caret line="121" column="31" selection-start-line="121" selection-start-column="31" selection-end-line="121" selection-end-column="31" />
|
|
752
|
+ <state relative-caret-position="105">
|
|
753
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
784
|
754
|
<folding>
|
785
|
755
|
<element signature="imports" expanded="true" />
|
786
|
756
|
</folding>
|
787
|
757
|
</state>
|
788
|
758
|
</provider>
|
789
|
759
|
</entry>
|
790
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
|
760
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
|
791
|
761
|
<provider selected="true" editor-type-id="text-editor">
|
792
|
|
- <state relative-caret-position="255">
|
793
|
|
- <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
|
|
762
|
+ <state relative-caret-position="279">
|
|
763
|
+ <caret line="23" selection-start-line="23" selection-end-line="23" />
|
|
764
|
+ <folding>
|
|
765
|
+ <element signature="imports" expanded="true" />
|
|
766
|
+ </folding>
|
794
|
767
|
</state>
|
795
|
768
|
</provider>
|
796
|
769
|
</entry>
|
797
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
|
770
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
|
798
|
771
|
<provider selected="true" editor-type-id="text-editor">
|
799
|
|
- <state relative-caret-position="120">
|
800
|
|
- <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
|
|
772
|
+ <state relative-caret-position="225">
|
|
773
|
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
|
801
|
774
|
<folding>
|
802
|
775
|
<element signature="imports" expanded="true" />
|
803
|
776
|
</folding>
|
804
|
777
|
</state>
|
805
|
778
|
</provider>
|
806
|
779
|
</entry>
|
807
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
|
780
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
808
|
781
|
<provider selected="true" editor-type-id="text-editor">
|
809
|
|
- <state relative-caret-position="195">
|
810
|
|
- <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
|
|
782
|
+ <state relative-caret-position="345">
|
|
783
|
+ <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
|
811
|
784
|
<folding>
|
812
|
|
- <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
|
|
785
|
+ <element signature="imports" expanded="true" />
|
813
|
786
|
</folding>
|
814
|
787
|
</state>
|
815
|
788
|
</provider>
|
816
|
789
|
</entry>
|
817
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
790
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
818
|
791
|
<provider selected="true" editor-type-id="text-editor">
|
819
|
|
- <state relative-caret-position="300">
|
820
|
|
- <caret line="20" selection-start-line="20" selection-end-line="20" />
|
|
792
|
+ <state relative-caret-position="150">
|
|
793
|
+ <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
|
|
794
|
+ <folding>
|
|
795
|
+ <element signature="imports" expanded="true" />
|
|
796
|
+ </folding>
|
821
|
797
|
</state>
|
822
|
798
|
</provider>
|
823
|
799
|
</entry>
|
824
|
800
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
825
|
801
|
<provider selected="true" editor-type-id="text-editor">
|
826
|
|
- <state relative-caret-position="210">
|
|
802
|
+ <state relative-caret-position="300">
|
827
|
803
|
<caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
|
828
|
804
|
<folding>
|
829
|
805
|
<element signature="imports" expanded="true" />
|
|
@@ -831,40 +807,61 @@
|
831
|
807
|
</state>
|
832
|
808
|
</provider>
|
833
|
809
|
</entry>
|
834
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
|
810
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
835
|
811
|
<provider selected="true" editor-type-id="text-editor">
|
836
|
|
- <state relative-caret-position="150">
|
837
|
|
- <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
|
|
812
|
+ <state relative-caret-position="90">
|
|
813
|
+ <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
|
838
|
814
|
<folding>
|
839
|
815
|
<element signature="imports" expanded="true" />
|
840
|
816
|
</folding>
|
841
|
817
|
</state>
|
842
|
818
|
</provider>
|
843
|
819
|
</entry>
|
844
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/LoginController.java">
|
|
820
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
|
845
|
821
|
<provider selected="true" editor-type-id="text-editor">
|
846
|
|
- <state relative-caret-position="225">
|
847
|
|
- <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
|
|
822
|
+ <state relative-caret-position="75">
|
|
823
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
824
|
+ </state>
|
|
825
|
+ </provider>
|
|
826
|
+ </entry>
|
|
827
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
|
|
828
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
829
|
+ <state relative-caret-position="75">
|
|
830
|
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
831
|
+ </state>
|
|
832
|
+ </provider>
|
|
833
|
+ </entry>
|
|
834
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
|
835
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
836
|
+ <state relative-caret-position="285">
|
|
837
|
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
838
|
+ </state>
|
|
839
|
+ </provider>
|
|
840
|
+ </entry>
|
|
841
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
|
842
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
843
|
+ <state relative-caret-position="495">
|
|
844
|
+ <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
|
848
|
845
|
<folding>
|
849
|
846
|
<element signature="imports" expanded="true" />
|
850
|
847
|
</folding>
|
851
|
848
|
</state>
|
852
|
849
|
</provider>
|
853
|
850
|
</entry>
|
854
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/ProfileController.java">
|
|
851
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
855
|
852
|
<provider selected="true" editor-type-id="text-editor">
|
856
|
|
- <state relative-caret-position="255">
|
857
|
|
- <caret line="23" selection-start-line="23" selection-end-line="23" />
|
|
853
|
+ <state relative-caret-position="330">
|
|
854
|
+ <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
|
858
|
855
|
<folding>
|
859
|
|
- <element signature="imports" expanded="true" />
|
|
856
|
+ <marker date="1533129044369" expanded="true" signature="346:636" ph="..." />
|
860
|
857
|
</folding>
|
861
|
858
|
</state>
|
862
|
859
|
</provider>
|
863
|
860
|
</entry>
|
864
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
|
861
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
865
|
862
|
<provider selected="true" editor-type-id="text-editor">
|
866
|
|
- <state relative-caret-position="390">
|
867
|
|
- <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
|
|
863
|
+ <state relative-caret-position="122">
|
|
864
|
+ <caret line="43" column="46" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
|
868
|
865
|
<folding>
|
869
|
866
|
<element signature="imports" expanded="true" />
|
870
|
867
|
</folding>
|