|
@@ -2,16 +2,26 @@
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="ad381d05-32c5-4ad5-8041-a0cb51a71fd9" name="Default" comment="">
|
5
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" afterDir="false" />
|
6
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
7
|
|
- <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" />
|
8
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" afterDir="false" />
|
9
|
6
|
<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" />
|
10
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" beforeDir="false" />
|
11
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" beforeDir="false" />
|
12
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" afterDir="false" />
|
13
|
|
- <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" />
|
14
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" afterDir="false" />
|
|
7
|
+ <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" />
|
|
8
|
+ <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" />
|
|
9
|
+ <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" />
|
|
10
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
|
|
11
|
+ <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
|
|
12
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/home/HomeController.class" beforeDir="false" />
|
|
13
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/map/Destination.class" beforeDir="false" />
|
|
14
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/map/DestinationController.class" beforeDir="false" />
|
|
15
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/map/DestinationRepository.class" beforeDir="false" />
|
|
16
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/map/DestinationState.class" beforeDir="false" />
|
|
17
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/map/Map.class" beforeDir="false" />
|
|
18
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/user/FriendList.class" beforeDir="false" />
|
|
19
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/user/User.class" beforeDir="false" />
|
|
20
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/user/UserController.class" beforeDir="false" />
|
|
21
|
+ <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/user/UserRepository.class" beforeDir="false" />
|
|
22
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/AppTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/AppTest.class" afterDir="false" />
|
|
23
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" afterDir="false" />
|
|
24
|
+ <change beforePath="$PROJECT_DIR$/target/test-classes/UserControllerTest.class" beforeDir="false" />
|
15
|
25
|
</list>
|
16
|
26
|
<ignored path="$PROJECT_DIR$/out/" />
|
17
|
27
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -36,11 +46,14 @@
|
36
|
46
|
</provider>
|
37
|
47
|
</entry>
|
38
|
48
|
</file>
|
39
|
|
- <file leaf-file-name="Profile.java" pinned="false" current-in-tab="false">
|
|
49
|
+ <file leaf-file-name="Profile.java" pinned="false" current-in-tab="true">
|
40
|
50
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
41
|
51
|
<provider selected="true" editor-type-id="text-editor">
|
42
|
|
- <state relative-caret-position="450">
|
43
|
|
- <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
|
|
52
|
+ <state relative-caret-position="264">
|
|
53
|
+ <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
|
|
54
|
+ <folding>
|
|
55
|
+ <element signature="imports" expanded="true" />
|
|
56
|
+ </folding>
|
44
|
57
|
</state>
|
45
|
58
|
</provider>
|
46
|
59
|
</entry>
|
|
@@ -48,8 +61,8 @@
|
48
|
61
|
<file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
|
49
|
62
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
50
|
63
|
<provider selected="true" editor-type-id="text-editor">
|
51
|
|
- <state relative-caret-position="705">
|
52
|
|
- <caret line="47" column="27" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="27" />
|
|
64
|
+ <state relative-caret-position="195">
|
|
65
|
+ <caret line="13" column="27" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="27" />
|
53
|
66
|
</state>
|
54
|
67
|
</provider>
|
55
|
68
|
</entry>
|
|
@@ -57,10 +70,10 @@
|
57
|
70
|
<file leaf-file-name="User.java" pinned="false" current-in-tab="false">
|
58
|
71
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
59
|
72
|
<provider selected="true" editor-type-id="text-editor">
|
60
|
|
- <state relative-caret-position="90">
|
61
|
|
- <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
|
|
73
|
+ <state relative-caret-position="60">
|
|
74
|
+ <caret line="4" selection-start-line="4" selection-end-line="4" />
|
62
|
75
|
<folding>
|
63
|
|
- <element signature="imports" expanded="true" />
|
|
76
|
+ <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
|
64
|
77
|
</folding>
|
65
|
78
|
</state>
|
66
|
79
|
</provider>
|
|
@@ -69,8 +82,8 @@
|
69
|
82
|
<file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
70
|
83
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
71
|
84
|
<provider selected="true" editor-type-id="text-editor">
|
72
|
|
- <state relative-caret-position="165">
|
73
|
|
- <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
|
|
85
|
+ <state relative-caret-position="210">
|
|
86
|
+ <caret line="14" column="38" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
|
74
|
87
|
</state>
|
75
|
88
|
</provider>
|
76
|
89
|
</entry>
|
|
@@ -79,16 +92,28 @@
|
79
|
92
|
<entry file="file://$PROJECT_DIR$/pom.xml">
|
80
|
93
|
<provider selected="true" editor-type-id="text-editor">
|
81
|
94
|
<state relative-caret-position="315">
|
82
|
|
- <caret line="21" column="18" lean-forward="true" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
|
95
|
+ <caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
83
|
96
|
</state>
|
84
|
97
|
</provider>
|
85
|
98
|
</entry>
|
86
|
99
|
</file>
|
87
|
|
- <file leaf-file-name="Destination.java" pinned="false" current-in-tab="true">
|
|
100
|
+ <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
|
|
101
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
|
102
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
103
|
+ <state relative-caret-position="90">
|
|
104
|
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
|
105
|
+ <folding>
|
|
106
|
+ <element signature="imports" expanded="true" />
|
|
107
|
+ </folding>
|
|
108
|
+ </state>
|
|
109
|
+ </provider>
|
|
110
|
+ </entry>
|
|
111
|
+ </file>
|
|
112
|
+ <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
|
88
|
113
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
89
|
114
|
<provider selected="true" editor-type-id="text-editor">
|
90
|
|
- <state relative-caret-position="360">
|
91
|
|
- <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
|
|
115
|
+ <state relative-caret-position="600">
|
|
116
|
+ <caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
|
92
|
117
|
<folding>
|
93
|
118
|
<element signature="imports" expanded="true" />
|
94
|
119
|
</folding>
|
|
@@ -162,7 +187,6 @@
|
162
|
187
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" />
|
163
|
188
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
|
164
|
189
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" />
|
165
|
|
- <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
166
|
190
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationRepository.java" />
|
167
|
191
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/user/DestinationType.java" />
|
168
|
192
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/user/DestinationState.java" />
|
|
@@ -173,10 +197,11 @@
|
173
|
197
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/UserAccount.java" />
|
174
|
198
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
|
175
|
199
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
|
176
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
|
|
200
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
|
201
|
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
177
|
202
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" />
|
178
|
203
|
<option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
|
179
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
|
|
204
|
+ <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
|
180
|
205
|
</list>
|
181
|
206
|
</option>
|
182
|
207
|
</component>
|
|
@@ -210,9 +235,6 @@
|
210
|
235
|
<foldersAlwaysOnTop value="true" />
|
211
|
236
|
</navigator>
|
212
|
237
|
<panes>
|
213
|
|
- <pane id="Scope" />
|
214
|
|
- <pane id="PackagesPane" />
|
215
|
|
- <pane id="AndroidView" />
|
216
|
238
|
<pane id="ProjectPane">
|
217
|
239
|
<subPane>
|
218
|
240
|
<expand>
|
|
@@ -297,6 +319,9 @@
|
297
|
319
|
<select />
|
298
|
320
|
</subPane>
|
299
|
321
|
</pane>
|
|
322
|
+ <pane id="Scope" />
|
|
323
|
+ <pane id="AndroidView" />
|
|
324
|
+ <pane id="PackagesPane" />
|
300
|
325
|
</panes>
|
301
|
326
|
</component>
|
302
|
327
|
<component name="PropertiesComponent">
|
|
@@ -478,7 +503,8 @@
|
478
|
503
|
<workItem from="1531762938122" duration="894000" />
|
479
|
504
|
<workItem from="1531932455408" duration="4691000" />
|
480
|
505
|
<workItem from="1532000475012" duration="5571000" />
|
481
|
|
- <workItem from="1532369057862" duration="7541000" />
|
|
506
|
+ <workItem from="1532369057862" duration="14487000" />
|
|
507
|
+ <workItem from="1532388208946" duration="2000" />
|
482
|
508
|
</task>
|
483
|
509
|
<servers />
|
484
|
510
|
</component>
|
|
@@ -497,7 +523,7 @@
|
497
|
523
|
</history-entry>
|
498
|
524
|
</component>
|
499
|
525
|
<component name="TimeTrackingManager">
|
500
|
|
- <option name="totallyTimeSpent" value="57544000" />
|
|
526
|
+ <option name="totallyTimeSpent" value="64492000" />
|
501
|
527
|
</component>
|
502
|
528
|
<component name="TodoView">
|
503
|
529
|
<todo-panel id="selected-file">
|
|
@@ -510,7 +536,6 @@
|
510
|
536
|
</component>
|
511
|
537
|
<component name="ToolWindowManager">
|
512
|
538
|
<frame x="-320" y="-1080" width="1920" height="1080" extended-state="0" />
|
513
|
|
- <editor active="true" />
|
514
|
539
|
<layout>
|
515
|
540
|
<window_info anchor="right" id="Palette" order="3" />
|
516
|
541
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
@@ -528,14 +553,13 @@
|
528
|
553
|
<window_info id="Image Layers" order="2" />
|
529
|
554
|
<window_info anchor="bottom" id="Java Enterprise" order="8" />
|
530
|
555
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
531
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.42068964" />
|
|
556
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.4199005" />
|
532
|
557
|
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
|
533
|
558
|
<window_info anchor="bottom" id="Spring" order="8" weight="0.32935324" />
|
534
|
559
|
<window_info anchor="bottom" id="Terminal" order="7" weight="0.31493506" />
|
535
|
560
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19009584" />
|
536
|
561
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
537
|
562
|
<window_info id="Web" order="3" side_tool="true" />
|
538
|
|
- <window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
|
539
|
563
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
540
|
564
|
<window_info id="Favorites" order="2" side_tool="true" />
|
541
|
565
|
<window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
|
|
@@ -544,6 +568,7 @@
|
544
|
568
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
545
|
569
|
<window_info anchor="bottom" id="Message" order="0" />
|
546
|
570
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
571
|
+ <window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
|
547
|
572
|
</layout>
|
548
|
573
|
</component>
|
549
|
574
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -665,13 +690,7 @@
|
665
|
690
|
</state>
|
666
|
691
|
</provider>
|
667
|
692
|
</entry>
|
668
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationState.java">
|
669
|
|
- <provider selected="true" editor-type-id="text-editor">
|
670
|
|
- <state relative-caret-position="60">
|
671
|
|
- <caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
|
672
|
|
- </state>
|
673
|
|
- </provider>
|
674
|
|
- </entry>
|
|
693
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationState.java" />
|
675
|
694
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
|
676
|
695
|
<provider selected="true" editor-type-id="text-editor">
|
677
|
696
|
<state relative-caret-position="75">
|
|
@@ -683,12 +702,18 @@
|
683
|
702
|
<provider selected="true" editor-type-id="text-editor">
|
684
|
703
|
<state relative-caret-position="105">
|
685
|
704
|
<caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
686
|
|
- <folding>
|
687
|
|
- <element signature="imports" expanded="true" />
|
688
|
|
- </folding>
|
689
|
705
|
</state>
|
690
|
706
|
</provider>
|
691
|
707
|
</entry>
|
|
708
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
709
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
710
|
+ <state relative-caret-position="315">
|
|
711
|
+ <caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
|
712
|
+ </state>
|
|
713
|
+ </provider>
|
|
714
|
+ </entry>
|
|
715
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
|
|
716
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
|
692
|
717
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
|
693
|
718
|
<provider selected="true" editor-type-id="text-editor">
|
694
|
719
|
<state relative-caret-position="90">
|
|
@@ -699,82 +724,64 @@
|
699
|
724
|
</state>
|
700
|
725
|
</provider>
|
701
|
726
|
</entry>
|
702
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
|
727
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
703
|
728
|
<provider selected="true" editor-type-id="text-editor">
|
704
|
|
- <state relative-caret-position="180">
|
705
|
|
- <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
706
|
|
- <folding>
|
707
|
|
- <element signature="imports" expanded="true" />
|
708
|
|
- </folding>
|
|
729
|
+ <state relative-caret-position="210">
|
|
730
|
+ <caret line="14" column="38" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
|
709
|
731
|
</state>
|
710
|
732
|
</provider>
|
711
|
733
|
</entry>
|
712
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
|
734
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
713
|
735
|
<provider selected="true" editor-type-id="text-editor">
|
714
|
|
- <state relative-caret-position="195">
|
715
|
|
- <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
736
|
+ <state relative-caret-position="60">
|
|
737
|
+ <caret line="4" selection-start-line="4" selection-end-line="4" />
|
716
|
738
|
<folding>
|
717
|
|
- <element signature="imports" expanded="true" />
|
|
739
|
+ <marker date="1532387074712" expanded="true" signature="346:466" ph="..." />
|
718
|
740
|
</folding>
|
719
|
741
|
</state>
|
720
|
742
|
</provider>
|
721
|
743
|
</entry>
|
722
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
723
|
|
- <provider selected="true" editor-type-id="text-editor">
|
724
|
|
- <state relative-caret-position="315">
|
725
|
|
- <caret line="21" column="18" lean-forward="true" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
|
726
|
|
- </state>
|
727
|
|
- </provider>
|
728
|
|
- </entry>
|
729
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
|
730
|
|
- <provider selected="true" editor-type-id="text-editor">
|
731
|
|
- <state relative-caret-position="120">
|
732
|
|
- <caret line="9" column="20" lean-forward="true" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
|
733
|
|
- </state>
|
734
|
|
- </provider>
|
735
|
|
- </entry>
|
736
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
744
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
737
|
745
|
<provider selected="true" editor-type-id="text-editor">
|
738
|
|
- <state relative-caret-position="165">
|
739
|
|
- <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
|
|
746
|
+ <state relative-caret-position="195">
|
|
747
|
+ <caret line="13" column="27" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="27" />
|
740
|
748
|
</state>
|
741
|
749
|
</provider>
|
742
|
750
|
</entry>
|
743
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java">
|
|
751
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
744
|
752
|
<provider selected="true" editor-type-id="text-editor">
|
745
|
|
- <state relative-caret-position="105">
|
746
|
|
- <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
|
|
753
|
+ <state relative-caret-position="600">
|
|
754
|
+ <caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
|
|
755
|
+ <folding>
|
|
756
|
+ <element signature="imports" expanded="true" />
|
|
757
|
+ </folding>
|
747
|
758
|
</state>
|
748
|
759
|
</provider>
|
749
|
760
|
</entry>
|
750
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
|
|
761
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
|
751
|
762
|
<provider selected="true" editor-type-id="text-editor">
|
752
|
|
- <state relative-caret-position="90">
|
753
|
|
- <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
|
|
763
|
+ <state relative-caret-position="180">
|
|
764
|
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
754
|
765
|
<folding>
|
755
|
766
|
<element signature="imports" expanded="true" />
|
756
|
767
|
</folding>
|
757
|
768
|
</state>
|
758
|
769
|
</provider>
|
759
|
770
|
</entry>
|
760
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
|
|
771
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
|
761
|
772
|
<provider selected="true" editor-type-id="text-editor">
|
762
|
|
- <state relative-caret-position="705">
|
763
|
|
- <caret line="47" column="27" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="27" />
|
|
773
|
+ <state relative-caret-position="195">
|
|
774
|
+ <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
775
|
+ <folding>
|
|
776
|
+ <element signature="imports" expanded="true" />
|
|
777
|
+ </folding>
|
764
|
778
|
</state>
|
765
|
779
|
</provider>
|
766
|
780
|
</entry>
|
767
|
781
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
|
768
|
782
|
<provider selected="true" editor-type-id="text-editor">
|
769
|
|
- <state relative-caret-position="450">
|
770
|
|
- <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
|
771
|
|
- </state>
|
772
|
|
- </provider>
|
773
|
|
- </entry>
|
774
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
|
775
|
|
- <provider selected="true" editor-type-id="text-editor">
|
776
|
|
- <state relative-caret-position="360">
|
777
|
|
- <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
|
|
783
|
+ <state relative-caret-position="264">
|
|
784
|
+ <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
|
778
|
785
|
<folding>
|
779
|
786
|
<element signature="imports" expanded="true" />
|
780
|
787
|
</folding>
|