|
@@ -3,42 +3,12 @@
|
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/main/java/com/alidade/config/PersistenceConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" afterDir="false" />
|
8
|
6
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" afterDir="false" />
|
9
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/FriendListController.java" beforeDir="false" />
|
10
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" afterDir="false" />
|
11
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/MapController.java" beforeDir="false" />
|
12
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/MessageBoardController.java" beforeDir="false" />
|
13
|
|
- <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" />
|
14
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserLoginController.java" beforeDir="false" />
|
15
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" afterDir="false" />
|
16
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" afterDir="false" />
|
17
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/MessageBoard.java" beforeDir="false" />
|
18
|
|
- <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" />
|
19
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" beforeDir="false" />
|
20
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/FriendListRepository.java" beforeDir="false" />
|
21
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/MapRepository.java" beforeDir="false" />
|
22
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/MessageBoardRepository.java" beforeDir="false" />
|
23
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserLoginRepository.java" beforeDir="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" />
|
24
|
8
|
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
|
25
|
9
|
<change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
|
26
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/config/PersistenceConfiguration.class" beforeDir="false" />
|
27
|
10
|
<change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/DestinationController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/controller/DestinationController.class" afterDir="false" />
|
28
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/FriendListController.class" beforeDir="false" />
|
29
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/HomeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/controller/HomeController.class" afterDir="false" />
|
30
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/MapController.class" beforeDir="false" />
|
31
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/MessageBoardController.class" beforeDir="false" />
|
32
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/controller/UserController.class" afterDir="false" />
|
33
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/controller/UserLoginController.class" beforeDir="false" />
|
34
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/FriendList.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/model/FriendList.class" afterDir="false" />
|
35
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Map.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/model/Map.class" afterDir="false" />
|
36
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/MessageBoard.class" beforeDir="false" />
|
37
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/UserLogin.class" beforeDir="false" />
|
38
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/FriendListRepository.class" beforeDir="false" />
|
39
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/MapRepository.class" beforeDir="false" />
|
40
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/MessageBoardRepository.class" beforeDir="false" />
|
41
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/repository/UserLoginRepository.class" beforeDir="false" />
|
|
11
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/model/Destination.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/alidade/model/Destination.class" afterDir="false" />
|
42
|
12
|
</list>
|
43
|
13
|
<ignored path="$PROJECT_DIR$/out/" />
|
44
|
14
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -54,8 +24,8 @@
|
54
|
24
|
<file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
|
55
|
25
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
56
|
26
|
<provider selected="true" editor-type-id="text-editor">
|
57
|
|
- <state relative-caret-position="207">
|
58
|
|
- <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
|
|
27
|
+ <state relative-caret-position="420">
|
|
28
|
+ <caret line="36" column="42" selection-start-line="36" selection-start-column="42" selection-end-line="36" selection-end-column="42" />
|
59
|
29
|
<folding>
|
60
|
30
|
<element signature="imports" expanded="true" />
|
61
|
31
|
</folding>
|
|
@@ -84,17 +54,17 @@
|
84
|
54
|
<file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
|
85
|
55
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
86
|
56
|
<provider selected="true" editor-type-id="text-editor">
|
87
|
|
- <state relative-caret-position="75">
|
88
|
|
- <caret line="5" column="24" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="24" />
|
|
57
|
+ <state relative-caret-position="615">
|
|
58
|
+ <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
|
89
|
59
|
</state>
|
90
|
60
|
</provider>
|
91
|
61
|
</entry>
|
92
|
62
|
</file>
|
93
|
|
- <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
63
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="true">
|
94
|
64
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
95
|
65
|
<provider selected="true" editor-type-id="text-editor">
|
96
|
|
- <state>
|
97
|
|
- <caret column="43" selection-start-column="43" selection-end-column="43" />
|
|
66
|
+ <state relative-caret-position="83">
|
|
67
|
+ <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
|
98
|
68
|
</state>
|
99
|
69
|
</provider>
|
100
|
70
|
</entry>
|
|
@@ -108,11 +78,11 @@
|
108
|
78
|
</provider>
|
109
|
79
|
</entry>
|
110
|
80
|
</file>
|
111
|
|
- <file leaf-file-name="PersistenceConfiguration.java" pinned="false" current-in-tab="true">
|
|
81
|
+ <file leaf-file-name="PersistenceConfiguration.java" pinned="false" current-in-tab="false">
|
112
|
82
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java">
|
113
|
83
|
<provider selected="true" editor-type-id="text-editor">
|
114
|
|
- <state relative-caret-position="86">
|
115
|
|
- <caret line="18" column="3" lean-forward="true" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
|
|
84
|
+ <state relative-caret-position="270">
|
|
85
|
+ <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
|
116
|
86
|
<folding>
|
117
|
87
|
<element signature="e#0#642#0" expanded="true" />
|
118
|
88
|
</folding>
|
|
@@ -123,7 +93,7 @@
|
123
|
93
|
<file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
|
124
|
94
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
125
|
95
|
<provider selected="true" editor-type-id="text-editor">
|
126
|
|
- <state relative-caret-position="75">
|
|
96
|
+ <state relative-caret-position="60">
|
127
|
97
|
<caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
|
128
|
98
|
<folding>
|
129
|
99
|
<element signature="imports" expanded="true" />
|
|
@@ -135,7 +105,7 @@
|
135
|
105
|
<file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
|
136
|
106
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
137
|
107
|
<provider selected="true" editor-type-id="text-editor">
|
138
|
|
- <state relative-caret-position="105">
|
|
108
|
+ <state relative-caret-position="75">
|
139
|
109
|
<caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
140
|
110
|
<folding>
|
141
|
111
|
<element signature="imports" expanded="true" />
|
|
@@ -147,8 +117,8 @@
|
147
|
117
|
<file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
|
148
|
118
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
149
|
119
|
<provider selected="true" editor-type-id="text-editor">
|
150
|
|
- <state relative-caret-position="195">
|
151
|
|
- <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
|
|
120
|
+ <state relative-caret-position="90">
|
|
121
|
+ <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
|
152
|
122
|
<folding>
|
153
|
123
|
<element signature="imports" expanded="true" />
|
154
|
124
|
</folding>
|
|
@@ -193,7 +163,6 @@
|
193
|
163
|
<option value="$PROJECT_DIR$/src/test/java/DestinationControllerTest.java" />
|
194
|
164
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" />
|
195
|
165
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Message.java" />
|
196
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
197
|
166
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/MessageController.java" />
|
198
|
167
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistanceConfiguration.java" />
|
199
|
168
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java" />
|
|
@@ -207,16 +176,17 @@
|
207
|
176
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/MapController.java" />
|
208
|
177
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/MessageBoardController.java" />
|
209
|
178
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserLoginController.java" />
|
210
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" />
|
211
|
179
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
|
212
|
180
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/MessageBoard.java" />
|
213
|
181
|
<option value="$PROJECT_DIR$/pom.xml" />
|
214
|
|
- <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
215
|
182
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" />
|
216
|
183
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
|
217
|
184
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
|
218
|
185
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
|
219
|
186
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" />
|
|
187
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
|
188
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" />
|
|
189
|
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
220
|
190
|
</list>
|
221
|
191
|
</option>
|
222
|
192
|
</component>
|
|
@@ -236,9 +206,9 @@
|
236
|
206
|
<component name="NodePackageJsonFileManager">
|
237
|
207
|
<packageJsonPaths />
|
238
|
208
|
</component>
|
239
|
|
- <component name="ProjectFrameBounds" extendedState="1">
|
|
209
|
+ <component name="ProjectFrameBounds" fullScreen="true">
|
240
|
210
|
<option name="y" value="23" />
|
241
|
|
- <option name="width" value="1093" />
|
|
211
|
+ <option name="width" value="1280" />
|
242
|
212
|
<option name="height" value="713" />
|
243
|
213
|
</component>
|
244
|
214
|
<component name="ProjectLevelVcsManager">
|
|
@@ -249,8 +219,6 @@
|
249
|
219
|
<foldersAlwaysOnTop value="true" />
|
250
|
220
|
</navigator>
|
251
|
221
|
<panes>
|
252
|
|
- <pane id="AndroidView" />
|
253
|
|
- <pane id="Scope" />
|
254
|
222
|
<pane id="ProjectPane">
|
255
|
223
|
<subPane>
|
256
|
224
|
<expand>
|
|
@@ -333,10 +301,19 @@
|
333
|
301
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
334
|
302
|
<item name="test" type="462c0819:PsiDirectoryNode" />
|
335
|
303
|
</path>
|
|
304
|
+ <path>
|
|
305
|
+ <item name="SharedTravelMap" type="b2602c69:ProjectViewProjectNode" />
|
|
306
|
+ <item name="Shared-Travel-Map" type="462c0819:PsiDirectoryNode" />
|
|
307
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
308
|
+ <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
309
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
310
|
+ </path>
|
336
|
311
|
</expand>
|
337
|
312
|
<select />
|
338
|
313
|
</subPane>
|
339
|
314
|
</pane>
|
|
315
|
+ <pane id="Scope" />
|
|
316
|
+ <pane id="AndroidView" />
|
340
|
317
|
<pane id="PackagesPane" />
|
341
|
318
|
</panes>
|
342
|
319
|
</component>
|
|
@@ -510,7 +487,10 @@
|
510
|
487
|
<workItem from="1531674537876" duration="2835000" />
|
511
|
488
|
<workItem from="1531677568975" duration="2641000" />
|
512
|
489
|
<workItem from="1531742741205" duration="3308000" />
|
513
|
|
- <workItem from="1531754853609" duration="3375000" />
|
|
490
|
+ <workItem from="1531754853609" duration="3476000" />
|
|
491
|
+ <workItem from="1531762938122" duration="894000" />
|
|
492
|
+ <workItem from="1531932455408" duration="4691000" />
|
|
493
|
+ <workItem from="1532000475012" duration="206000" />
|
514
|
494
|
</task>
|
515
|
495
|
<servers />
|
516
|
496
|
</component>
|
|
@@ -529,10 +509,19 @@
|
529
|
509
|
</history-entry>
|
530
|
510
|
</component>
|
531
|
511
|
<component name="TimeTrackingManager">
|
532
|
|
- <option name="totallyTimeSpent" value="38746000" />
|
|
512
|
+ <option name="totallyTimeSpent" value="44638000" />
|
|
513
|
+ </component>
|
|
514
|
+ <component name="TodoView">
|
|
515
|
+ <todo-panel id="selected-file">
|
|
516
|
+ <is-autoscroll-to-source value="true" />
|
|
517
|
+ </todo-panel>
|
|
518
|
+ <todo-panel id="all">
|
|
519
|
+ <are-packages-shown value="true" />
|
|
520
|
+ <is-autoscroll-to-source value="true" />
|
|
521
|
+ </todo-panel>
|
533
|
522
|
</component>
|
534
|
523
|
<component name="ToolWindowManager">
|
535
|
|
- <frame x="0" y="23" width="1093" height="713" extended-state="1" />
|
|
524
|
+ <frame x="0" y="0" width="1280" height="800" extended-state="0" />
|
536
|
525
|
<editor active="true" />
|
537
|
526
|
<layout>
|
538
|
527
|
<window_info anchor="right" id="Palette" order="3" />
|
|
@@ -546,17 +535,17 @@
|
546
|
535
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
547
|
536
|
<window_info id="UI Designer" order="2" />
|
548
|
537
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.3409091" />
|
549
|
|
- <window_info anchor="bottom" id="TODO" order="6" />
|
|
538
|
+ <window_info anchor="bottom" id="TODO" order="6" weight="0.32954547" />
|
550
|
539
|
<window_info anchor="bottom" id="Messages" order="8" weight="0.32916668" />
|
551
|
540
|
<window_info anchor="right" id="Palette	" order="3" />
|
552
|
541
|
<window_info id="Image Layers" order="2" />
|
553
|
542
|
<window_info anchor="bottom" id="Java Enterprise" order="8" />
|
554
|
543
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
555
|
|
- <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.6136364" />
|
556
|
|
- <window_info anchor="bottom" id="Version Control" order="7" />
|
557
|
|
- <window_info anchor="bottom" id="Spring" order="8" />
|
558
|
|
- <window_info anchor="bottom" id="Terminal" order="7" weight="0.10948905" />
|
559
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33111322" />
|
|
544
|
+ <window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
|
|
545
|
+ <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.68551725" />
|
|
546
|
+ <window_info anchor="bottom" id="Spring" order="8" weight="0.32954547" />
|
|
547
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.31493506" />
|
|
548
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28917608" />
|
560
|
549
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
561
|
550
|
<window_info id="Web" order="3" side_tool="true" />
|
562
|
551
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
|
@@ -590,9 +579,6 @@
|
590
|
579
|
<provider selected="true" editor-type-id="text-editor">
|
591
|
580
|
<state>
|
592
|
581
|
<caret selection-end-line="42" selection-end-column="5" />
|
593
|
|
- <folding>
|
594
|
|
- <element signature="imports" expanded="true" />
|
595
|
|
- </folding>
|
596
|
582
|
</state>
|
597
|
583
|
</provider>
|
598
|
584
|
</entry>
|
|
@@ -600,9 +586,6 @@
|
600
|
586
|
<provider selected="true" editor-type-id="text-editor">
|
601
|
587
|
<state relative-caret-position="483">
|
602
|
588
|
<caret line="43" column="1" selection-start-line="43" selection-start-column="1" selection-end-line="43" selection-end-column="1" />
|
603
|
|
- <folding>
|
604
|
|
- <element signature="imports" expanded="true" />
|
605
|
|
- </folding>
|
606
|
589
|
</state>
|
607
|
590
|
</provider>
|
608
|
591
|
</entry>
|
|
@@ -636,9 +619,6 @@
|
636
|
619
|
<provider selected="true" editor-type-id="text-editor">
|
637
|
620
|
<state relative-caret-position="30">
|
638
|
621
|
<caret line="3" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="3" selection-end-column="68" />
|
639
|
|
- <folding>
|
640
|
|
- <element signature="imports" expanded="true" />
|
641
|
|
- </folding>
|
642
|
622
|
</state>
|
643
|
623
|
</provider>
|
644
|
624
|
</entry>
|
|
@@ -675,9 +655,6 @@
|
675
|
655
|
<provider selected="true" editor-type-id="text-editor">
|
676
|
656
|
<state relative-caret-position="105">
|
677
|
657
|
<caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
|
678
|
|
- <folding>
|
679
|
|
- <element signature="imports" expanded="true" />
|
680
|
|
- </folding>
|
681
|
658
|
</state>
|
682
|
659
|
</provider>
|
683
|
660
|
</entry>
|
|
@@ -691,9 +668,6 @@
|
691
|
668
|
<provider selected="true" editor-type-id="text-editor">
|
692
|
669
|
<state relative-caret-position="150">
|
693
|
670
|
<caret line="10" selection-start-line="10" selection-end-line="10" />
|
694
|
|
- <folding>
|
695
|
|
- <element signature="imports" expanded="true" />
|
696
|
|
- </folding>
|
697
|
671
|
</state>
|
698
|
672
|
</provider>
|
699
|
673
|
</entry>
|
|
@@ -719,85 +693,85 @@
|
719
|
693
|
</state>
|
720
|
694
|
</provider>
|
721
|
695
|
</entry>
|
722
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
|
696
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" />
|
|
697
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
|
723
|
698
|
<provider selected="true" editor-type-id="text-editor">
|
724
|
|
- <state relative-caret-position="75">
|
725
|
|
- <caret line="5" column="24" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="24" />
|
|
699
|
+ <state relative-caret-position="150">
|
|
700
|
+ <caret line="11" column="2" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
|
726
|
701
|
</state>
|
727
|
702
|
</provider>
|
728
|
703
|
</entry>
|
729
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" />
|
730
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
|
704
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
731
|
705
|
<provider selected="true" editor-type-id="text-editor">
|
732
|
|
- <state relative-caret-position="195">
|
733
|
|
- <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
|
|
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" />
|
734
|
708
|
<folding>
|
735
|
709
|
<element signature="imports" expanded="true" />
|
736
|
710
|
</folding>
|
737
|
711
|
</state>
|
738
|
712
|
</provider>
|
739
|
713
|
</entry>
|
740
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
714
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
741
|
715
|
<provider selected="true" editor-type-id="text-editor">
|
742
|
|
- <state>
|
743
|
|
- <caret column="43" selection-start-column="43" selection-end-column="43" />
|
|
716
|
+ <state relative-caret-position="390">
|
|
717
|
+ <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
|
744
|
718
|
</state>
|
745
|
719
|
</provider>
|
746
|
720
|
</entry>
|
747
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
|
721
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java">
|
748
|
722
|
<provider selected="true" editor-type-id="text-editor">
|
749
|
|
- <state relative-caret-position="75">
|
750
|
|
- <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
|
|
723
|
+ <state relative-caret-position="270">
|
|
724
|
+ <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
|
751
|
725
|
<folding>
|
752
|
|
- <element signature="imports" expanded="true" />
|
|
726
|
+ <element signature="e#0#642#0" expanded="true" />
|
753
|
727
|
</folding>
|
754
|
728
|
</state>
|
755
|
729
|
</provider>
|
756
|
730
|
</entry>
|
757
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
|
758
|
|
- <provider selected="true" editor-type-id="text-editor">
|
759
|
|
- <state relative-caret-position="150">
|
760
|
|
- <caret line="11" column="2" selection-start-line="11" selection-start-column="2" selection-end-line="11" selection-end-column="2" />
|
761
|
|
- </state>
|
762
|
|
- </provider>
|
763
|
|
- </entry>
|
764
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
|
|
731
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
765
|
732
|
<provider selected="true" editor-type-id="text-editor">
|
766
|
|
- <state relative-caret-position="105">
|
767
|
|
- <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
733
|
+ <state relative-caret-position="420">
|
|
734
|
+ <caret line="36" column="42" selection-start-line="36" selection-start-column="42" selection-end-line="36" selection-end-column="42" />
|
768
|
735
|
<folding>
|
769
|
736
|
<element signature="imports" expanded="true" />
|
770
|
737
|
</folding>
|
771
|
738
|
</state>
|
772
|
739
|
</provider>
|
773
|
740
|
</entry>
|
774
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
|
741
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
775
|
742
|
<provider selected="true" editor-type-id="text-editor">
|
776
|
|
- <state relative-caret-position="207">
|
777
|
|
- <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
|
|
743
|
+ <state relative-caret-position="60">
|
|
744
|
+ <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
|
778
|
745
|
<folding>
|
779
|
746
|
<element signature="imports" expanded="true" />
|
780
|
747
|
</folding>
|
781
|
748
|
</state>
|
782
|
749
|
</provider>
|
783
|
750
|
</entry>
|
784
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
|
751
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
785
|
752
|
<provider selected="true" editor-type-id="text-editor">
|
786
|
|
- <state relative-caret-position="390">
|
787
|
|
- <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
|
|
753
|
+ <state relative-caret-position="615">
|
|
754
|
+ <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
|
788
|
755
|
</state>
|
789
|
756
|
</provider>
|
790
|
757
|
</entry>
|
791
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java">
|
|
758
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
792
|
759
|
<provider selected="true" editor-type-id="text-editor">
|
793
|
|
- <state relative-caret-position="86">
|
794
|
|
- <caret line="18" column="3" lean-forward="true" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
|
|
760
|
+ <state relative-caret-position="90">
|
|
761
|
+ <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
|
795
|
762
|
<folding>
|
796
|
|
- <element signature="e#0#642#0" expanded="true" />
|
|
763
|
+ <element signature="imports" expanded="true" />
|
797
|
764
|
</folding>
|
798
|
765
|
</state>
|
799
|
766
|
</provider>
|
800
|
767
|
</entry>
|
|
768
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
769
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
770
|
+ <state relative-caret-position="83">
|
|
771
|
+ <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
|
|
772
|
+ </state>
|
|
773
|
+ </provider>
|
|
774
|
+ </entry>
|
801
|
775
|
</component>
|
802
|
776
|
<component name="masterDetails">
|
803
|
777
|
<states>
|