Browse Source

controllers added#

JaseG256 6 years ago
parent
commit
f4d297c49c

+ 1
- 1
ZipTeamOrange/.idea/misc.xml View File

@@ -8,7 +8,7 @@
8 8
       </list>
9 9
     </option>
10 10
   </component>
11
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
11
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
12 12
     <output url="file://$PROJECT_DIR$/out" />
13 13
   </component>
14 14
 </project>

+ 260
- 137
ZipTeamOrange/.idea/workspace.xml View File

@@ -12,47 +12,21 @@
12 12
     <option name="LAST_RESOLUTION" value="IGNORE" />
13 13
   </component>
14 14
   <component name="FileEditorManager">
15
-    <leaf>
16
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
17
-        <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
18
-          <provider selected="true" editor-type-id="text-editor">
19
-            <state relative-caret-position="450">
20
-              <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
21
-              <folding>
22
-                <element signature="e#140#141#0" expanded="true" />
23
-                <element signature="e#169#170#0" expanded="true" />
24
-                <element signature="e#200#201#0" expanded="true" />
25
-                <element signature="e#227#228#0" expanded="true" />
26
-                <element signature="e#259#260#0" expanded="true" />
27
-                <element signature="e#287#288#0" expanded="true" />
28
-                <element signature="e#322#323#0" expanded="true" />
29
-                <element signature="e#353#354#0" expanded="true" />
30
-                <element signature="e#387#388#0" expanded="true" />
31
-                <element signature="e#417#418#0" expanded="true" />
32
-              </folding>
33
-            </state>
34
-          </provider>
35
-        </entry>
36
-      </file>
37
-      <file leaf-file-name="Chat.java" pinned="false" current-in-tab="true">
15
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16
+      <file leaf-file-name="Chat.java" pinned="false" current-in-tab="false">
38 17
         <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
39 18
           <provider selected="true" editor-type-id="text-editor">
40
-            <state relative-caret-position="105">
41
-              <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
19
+            <state relative-caret-position="480">
20
+              <caret line="42" column="31" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
42 21
               <folding>
43 22
                 <element signature="imports" expanded="true" />
44 23
                 <element signature="e#209#215#0" expanded="true" />
45
-                <element signature="e#244#253#0" expanded="true" />
46
-                <element signature="e#152#153#0" expanded="true" />
47
-                <element signature="e#176#177#0" expanded="true" />
48
-                <element signature="e#126#127#0" expanded="true" />
49
-                <element signature="e#155#156#0" expanded="true" />
50
-                <element signature="e#186#187#0" expanded="true" />
51
-                <element signature="e#213#214#0" expanded="true" />
52
-                <element signature="e#247#248#0" expanded="true" />
53
-                <element signature="e#279#280#0" expanded="true" />
54
-                <element signature="e#312#313#0" expanded="true" />
55
-                <element signature="e#343#344#0" expanded="true" />
24
+                <element signature="e#296#313#0" expanded="true" />
25
+                <element signature="e#979#980#0" expanded="true" />
26
+                <element signature="e#1018#1019#0" expanded="true" />
27
+                <element signature="e#1046#1047#0" expanded="true" />
28
+                <element signature="e#1099#1100#0" expanded="true" />
29
+                <element signature="e#1130#1131#0" expanded="true" />
56 30
               </folding>
57 31
             </state>
58 32
           </provider>
@@ -62,19 +36,7 @@
62 36
         <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
63 37
           <provider selected="true" editor-type-id="text-editor">
64 38
             <state relative-caret-position="90">
65
-              <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
66
-              <folding>
67
-                <element signature="e#134#135#0" expanded="true" />
68
-                <element signature="e#166#167#0" expanded="true" />
69
-                <element signature="e#197#198#0" expanded="true" />
70
-                <element signature="e#224#225#0" expanded="true" />
71
-                <element signature="e#258#259#0" expanded="true" />
72
-                <element signature="e#290#291#0" expanded="true" />
73
-                <element signature="e#580#581#0" expanded="true" />
74
-                <element signature="e#609#610#0" expanded="true" />
75
-                <element signature="e#639#640#0" expanded="true" />
76
-                <element signature="e#668#669#0" expanded="true" />
77
-              </folding>
39
+              <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
78 40
             </state>
79 41
           </provider>
80 42
         </entry>
@@ -83,7 +45,51 @@
83 45
         <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
84 46
           <provider selected="true" editor-type-id="text-editor">
85 47
             <state>
86
-              <caret column="27" selection-start-column="27" selection-end-column="27" />
48
+              <caret column="46" selection-start-column="46" selection-end-column="46" />
49
+              <folding>
50
+                <element signature="e#74#75#0" expanded="true" />
51
+                <element signature="e#100#101#0" expanded="true" />
52
+                <element signature="e#147#148#0" expanded="true" />
53
+                <element signature="e#173#174#0" expanded="true" />
54
+                <element signature="e#226#227#0" expanded="true" />
55
+                <element signature="e#252#253#0" expanded="true" />
56
+              </folding>
57
+            </state>
58
+          </provider>
59
+        </entry>
60
+      </file>
61
+      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
62
+        <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
63
+          <provider selected="true" editor-type-id="text-editor">
64
+            <state relative-caret-position="75">
65
+              <caret line="5" column="5" lean-forward="true" selection-start-line="2" selection-end-line="5" selection-end-column="5" />
66
+            </state>
67
+          </provider>
68
+        </entry>
69
+      </file>
70
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
71
+        <entry file="file://$PROJECT_DIR$/pom.xml">
72
+          <provider selected="true" editor-type-id="text-editor">
73
+            <state relative-caret-position="120">
74
+              <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
75
+            </state>
76
+          </provider>
77
+        </entry>
78
+      </file>
79
+      <file leaf-file-name="MessageRepository.java" pinned="false" current-in-tab="false">
80
+        <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
81
+          <provider selected="true" editor-type-id="text-editor">
82
+            <state relative-caret-position="75">
83
+              <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
84
+            </state>
85
+          </provider>
86
+        </entry>
87
+      </file>
88
+      <file leaf-file-name="ChatRepository.java" pinned="false" current-in-tab="false">
89
+        <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
90
+          <provider selected="true" editor-type-id="text-editor">
91
+            <state relative-caret-position="75">
92
+              <caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
87 93
             </state>
88 94
           </provider>
89 95
         </entry>
@@ -92,7 +98,15 @@
92 98
         <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
93 99
           <provider selected="true" editor-type-id="text-editor">
94 100
             <state>
95
-              <caret column="30" selection-start-column="30" selection-end-column="30" />
101
+              <caret column="49" selection-start-column="49" selection-end-column="49" />
102
+              <folding>
103
+                <element signature="e#130#131#0" expanded="true" />
104
+                <element signature="e#168#169#0" expanded="true" />
105
+                <element signature="e#203#204#0" expanded="true" />
106
+                <element signature="e#241#242#0" expanded="true" />
107
+                <element signature="e#282#283#0" expanded="true" />
108
+                <element signature="e#320#321#0" expanded="true" />
109
+              </folding>
96 110
             </state>
97 111
           </provider>
98 112
         </entry>
@@ -101,16 +115,24 @@
101 115
         <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
102 116
           <provider selected="true" editor-type-id="text-editor">
103 117
             <state>
104
-              <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
118
+              <caret column="46" selection-start-column="46" selection-end-column="46" />
119
+              <folding>
120
+                <element signature="e#119#120#0" expanded="true" />
121
+                <element signature="e#157#158#0" expanded="true" />
122
+                <element signature="e#192#193#0" expanded="true" />
123
+                <element signature="e#230#231#0" expanded="true" />
124
+                <element signature="e#271#272#0" expanded="true" />
125
+                <element signature="e#309#310#0" expanded="true" />
126
+              </folding>
105 127
             </state>
106 128
           </provider>
107 129
         </entry>
108 130
       </file>
109
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
110
-        <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
131
+      <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
132
+        <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
111 133
           <provider selected="true" editor-type-id="text-editor">
112
-            <state>
113
-              <caret column="17" selection-start-column="17" selection-end-column="17" />
134
+            <state relative-caret-position="60">
135
+              <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
114 136
             </state>
115 137
           </provider>
116 138
         </entry>
@@ -130,6 +152,13 @@
130 152
         <option value="$PROJECT_DIR$/src/main/java/User.java" />
131 153
         <option value="$PROJECT_DIR$/src/main/java/Message.java" />
132 154
         <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
155
+        <option value="$PROJECT_DIR$/src/main/java/Controller.java" />
156
+        <option value="$PROJECT_DIR$/src/main/java/ChatController.java" />
157
+        <option value="$PROJECT_DIR$/src/main/java/MessageController.java" />
158
+        <option value="$PROJECT_DIR$/src/main/java/UserController.java" />
159
+        <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
160
+        <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
161
+        <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
133 162
       </list>
134 163
     </option>
135 164
   </component>
@@ -160,7 +189,9 @@
160 189
       <foldersAlwaysOnTop value="true" />
161 190
     </navigator>
162 191
     <panes>
192
+      <pane id="Scope" />
163 193
       <pane id="AndroidView" />
194
+      <pane id="PackagesPane" />
164 195
       <pane id="ProjectPane">
165 196
         <subPane>
166 197
           <expand>
@@ -168,36 +199,17 @@
168 199
               <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
169 200
               <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
170 201
             </path>
171
-            <path>
172
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
173
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
174
-              <item name="src" type="462c0819:PsiDirectoryNode" />
175
-            </path>
176
-            <path>
177
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
178
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
179
-              <item name="src" type="462c0819:PsiDirectoryNode" />
180
-              <item name="main" type="462c0819:PsiDirectoryNode" />
181
-            </path>
182
-            <path>
183
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
184
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
185
-              <item name="src" type="462c0819:PsiDirectoryNode" />
186
-              <item name="main" type="462c0819:PsiDirectoryNode" />
187
-              <item name="java" type="462c0819:PsiDirectoryNode" />
188
-            </path>
189 202
           </expand>
190 203
           <select />
191 204
         </subPane>
192 205
       </pane>
193
-      <pane id="PackagesPane" />
194
-      <pane id="Scope" />
195 206
     </panes>
196 207
   </component>
197 208
   <component name="PropertiesComponent">
198 209
     <property name="WebServerToolWindowFactoryState" value="false" />
199 210
     <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
200 211
     <property name="aspect.path.notification.shown" value="true" />
212
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
201 213
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
202 214
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
203 215
     <property name="project.structure.last.edited" value="Modules" />
@@ -281,33 +293,34 @@
281 293
     <frame x="442" y="115" width="1280" height="709" extended-state="0" />
282 294
     <editor active="true" />
283 295
     <layout>
284
-      <window_info anchor="right" id="Palette" />
296
+      <window_info anchor="right" id="Palette" order="3" />
285 297
       <window_info anchor="bottom" id="TODO" order="6" />
286
-      <window_info anchor="right" id="Palette&#9;" />
287
-      <window_info id="Image Layers" />
288
-      <window_info anchor="right" id="Capture Analysis" />
289
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
290
-      <window_info anchor="right" id="Maven Projects" />
291
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
298
+      <window_info anchor="right" id="Palette&#9;" order="3" />
299
+      <window_info id="Image Layers" order="2" />
300
+      <window_info anchor="right" id="Capture Analysis" order="3" />
301
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
302
+      <window_info anchor="right" id="Maven Projects" order="3" />
292 303
       <window_info anchor="bottom" id="Run" order="2" />
293
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
294
-      <window_info anchor="bottom" id="Terminal" />
295
-      <window_info id="Capture Tool" />
296
-      <window_info id="Designer" />
297
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
298
-      <window_info anchor="right" id="Database" />
304
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
305
+      <window_info anchor="bottom" id="Terminal" order="7" />
306
+      <window_info id="Capture Tool" order="2" />
307
+      <window_info id="Designer" order="2" />
308
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
309
+      <window_info id="Learn" />
299 310
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
300 311
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
301
-      <window_info id="UI Designer" />
302
-      <window_info anchor="right" id="Theme Preview" />
312
+      <window_info id="UI Designer" order="2" />
313
+      <window_info anchor="right" id="Theme Preview" order="3" />
303 314
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
304
-      <window_info id="Favorites" side_tool="true" />
305
-      <window_info anchor="bottom" id="Find" order="1" />
306
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
307
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
315
+      <window_info id="Favorites" order="2" side_tool="true" />
308 316
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
317
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
318
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
319
+      <window_info anchor="right" id="Database" order="3" />
309 320
       <window_info anchor="bottom" id="Message" order="0" />
321
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
310 322
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
323
+      <window_info anchor="bottom" id="Find" order="1" />
311 324
     </layout>
312 325
   </component>
313 326
   <component name="TypeScriptGeneratedFilesManager">
@@ -322,13 +335,47 @@
322 335
     </ignored-roots>
323 336
   </component>
324 337
   <component name="editorHistoryManager">
325
-    <entry file="file://$PROJECT_DIR$/pom.xml">
326
-      <provider selected="true" editor-type-id="text-editor" />
338
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
339
+      <provider selected="true" editor-type-id="text-editor">
340
+        <state relative-caret-position="450">
341
+          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
342
+        </state>
343
+      </provider>
344
+    </entry>
345
+    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
346
+      <provider selected="true" editor-type-id="text-editor">
347
+        <state relative-caret-position="90">
348
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
349
+        </state>
350
+      </provider>
351
+    </entry>
352
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
353
+      <provider selected="true" editor-type-id="text-editor">
354
+        <state>
355
+          <caret column="27" selection-start-column="27" selection-end-column="27" />
356
+          <folding>
357
+            <element signature="e#74#75#0" expanded="true" />
358
+            <element signature="e#100#101#0" expanded="true" />
359
+            <element signature="e#147#148#0" expanded="true" />
360
+            <element signature="e#173#174#0" expanded="true" />
361
+            <element signature="e#226#227#0" expanded="true" />
362
+            <element signature="e#252#253#0" expanded="true" />
363
+          </folding>
364
+        </state>
365
+      </provider>
327 366
     </entry>
328 367
     <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
329 368
       <provider selected="true" editor-type-id="text-editor">
330 369
         <state>
331 370
           <caret column="30" selection-start-column="30" selection-end-column="30" />
371
+          <folding>
372
+            <element signature="e#130#131#0" expanded="true" />
373
+            <element signature="e#168#169#0" expanded="true" />
374
+            <element signature="e#203#204#0" expanded="true" />
375
+            <element signature="e#241#242#0" expanded="true" />
376
+            <element signature="e#282#283#0" expanded="true" />
377
+            <element signature="e#320#321#0" expanded="true" />
378
+          </folding>
332 379
         </state>
333 380
       </provider>
334 381
     </entry>
@@ -336,6 +383,14 @@
336 383
       <provider selected="true" editor-type-id="text-editor">
337 384
         <state>
338 385
           <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
386
+          <folding>
387
+            <element signature="e#119#120#0" expanded="true" />
388
+            <element signature="e#157#158#0" expanded="true" />
389
+            <element signature="e#192#193#0" expanded="true" />
390
+            <element signature="e#230#231#0" expanded="true" />
391
+            <element signature="e#271#272#0" expanded="true" />
392
+            <element signature="e#309#310#0" expanded="true" />
393
+          </folding>
339 394
         </state>
340 395
       </provider>
341 396
     </entry>
@@ -346,10 +401,27 @@
346 401
         </state>
347 402
       </provider>
348 403
     </entry>
349
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
404
+    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
405
+      <provider selected="true" editor-type-id="text-editor">
406
+        <state relative-caret-position="135">
407
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
408
+          <folding>
409
+            <element signature="imports" expanded="true" />
410
+            <element signature="e#209#215#0" expanded="true" />
411
+            <element signature="e#296#313#0" expanded="true" />
412
+            <element signature="e#979#980#0" expanded="true" />
413
+            <element signature="e#1018#1019#0" expanded="true" />
414
+            <element signature="e#1046#1047#0" expanded="true" />
415
+            <element signature="e#1099#1100#0" expanded="true" />
416
+            <element signature="e#1130#1131#0" expanded="true" />
417
+          </folding>
418
+        </state>
419
+      </provider>
420
+    </entry>
421
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
350 422
       <provider selected="true" editor-type-id="text-editor">
351 423
         <state>
352
-          <caret column="27" selection-start-column="27" selection-end-column="27" />
424
+          <caret column="17" selection-start-column="17" selection-end-column="17" />
353 425
         </state>
354 426
       </provider>
355 427
     </entry>
@@ -357,62 +429,113 @@
357 429
       <provider selected="true" editor-type-id="text-editor">
358 430
         <state relative-caret-position="450">
359 431
           <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
360
-          <folding>
361
-            <element signature="e#140#141#0" expanded="true" />
362
-            <element signature="e#169#170#0" expanded="true" />
363
-            <element signature="e#200#201#0" expanded="true" />
364
-            <element signature="e#227#228#0" expanded="true" />
365
-            <element signature="e#259#260#0" expanded="true" />
366
-            <element signature="e#287#288#0" expanded="true" />
367
-            <element signature="e#322#323#0" expanded="true" />
368
-            <element signature="e#353#354#0" expanded="true" />
369
-            <element signature="e#387#388#0" expanded="true" />
370
-            <element signature="e#417#418#0" expanded="true" />
371
-          </folding>
372 432
         </state>
373 433
       </provider>
374 434
     </entry>
375 435
     <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
376 436
       <provider selected="true" editor-type-id="text-editor">
377 437
         <state relative-caret-position="90">
378
-          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
379
-          <folding>
380
-            <element signature="e#134#135#0" expanded="true" />
381
-            <element signature="e#166#167#0" expanded="true" />
382
-            <element signature="e#197#198#0" expanded="true" />
383
-            <element signature="e#224#225#0" expanded="true" />
384
-            <element signature="e#258#259#0" expanded="true" />
385
-            <element signature="e#290#291#0" expanded="true" />
386
-            <element signature="e#580#581#0" expanded="true" />
387
-            <element signature="e#609#610#0" expanded="true" />
388
-            <element signature="e#639#640#0" expanded="true" />
389
-            <element signature="e#668#669#0" expanded="true" />
390
-          </folding>
438
+          <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
391 439
         </state>
392 440
       </provider>
393 441
     </entry>
394 442
     <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
395 443
       <provider selected="true" editor-type-id="text-editor">
396
-        <state relative-caret-position="105">
397
-          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
444
+        <state relative-caret-position="480">
445
+          <caret line="42" column="31" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
398 446
           <folding>
399 447
             <element signature="imports" expanded="true" />
400 448
             <element signature="e#209#215#0" expanded="true" />
401
-            <element signature="e#244#253#0" expanded="true" />
402
-            <element signature="e#152#153#0" expanded="true" />
403
-            <element signature="e#176#177#0" expanded="true" />
404
-            <element signature="e#126#127#0" expanded="true" />
405
-            <element signature="e#155#156#0" expanded="true" />
406
-            <element signature="e#186#187#0" expanded="true" />
407
-            <element signature="e#213#214#0" expanded="true" />
408
-            <element signature="e#247#248#0" expanded="true" />
409
-            <element signature="e#279#280#0" expanded="true" />
410
-            <element signature="e#312#313#0" expanded="true" />
411
-            <element signature="e#343#344#0" expanded="true" />
449
+            <element signature="e#296#313#0" expanded="true" />
450
+            <element signature="e#979#980#0" expanded="true" />
451
+            <element signature="e#1018#1019#0" expanded="true" />
452
+            <element signature="e#1046#1047#0" expanded="true" />
453
+            <element signature="e#1099#1100#0" expanded="true" />
454
+            <element signature="e#1130#1131#0" expanded="true" />
455
+          </folding>
456
+        </state>
457
+      </provider>
458
+    </entry>
459
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
460
+      <provider selected="true" editor-type-id="text-editor">
461
+        <state>
462
+          <caret column="46" selection-start-column="46" selection-end-column="46" />
463
+          <folding>
464
+            <element signature="e#119#120#0" expanded="true" />
465
+            <element signature="e#157#158#0" expanded="true" />
466
+            <element signature="e#192#193#0" expanded="true" />
467
+            <element signature="e#230#231#0" expanded="true" />
468
+            <element signature="e#271#272#0" expanded="true" />
469
+            <element signature="e#309#310#0" expanded="true" />
412 470
           </folding>
413 471
         </state>
414 472
       </provider>
415 473
     </entry>
474
+    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
475
+      <provider selected="true" editor-type-id="text-editor">
476
+        <state relative-caret-position="60">
477
+          <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
478
+        </state>
479
+      </provider>
480
+    </entry>
481
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
482
+      <provider selected="true" editor-type-id="text-editor">
483
+        <state>
484
+          <caret column="46" selection-start-column="46" selection-end-column="46" />
485
+          <folding>
486
+            <element signature="e#74#75#0" expanded="true" />
487
+            <element signature="e#100#101#0" expanded="true" />
488
+            <element signature="e#147#148#0" expanded="true" />
489
+            <element signature="e#173#174#0" expanded="true" />
490
+            <element signature="e#226#227#0" expanded="true" />
491
+            <element signature="e#252#253#0" expanded="true" />
492
+          </folding>
493
+        </state>
494
+      </provider>
495
+    </entry>
496
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
497
+      <provider selected="true" editor-type-id="text-editor">
498
+        <state>
499
+          <caret column="49" selection-start-column="49" selection-end-column="49" />
500
+          <folding>
501
+            <element signature="e#130#131#0" expanded="true" />
502
+            <element signature="e#168#169#0" expanded="true" />
503
+            <element signature="e#203#204#0" expanded="true" />
504
+            <element signature="e#241#242#0" expanded="true" />
505
+            <element signature="e#282#283#0" expanded="true" />
506
+            <element signature="e#320#321#0" expanded="true" />
507
+          </folding>
508
+        </state>
509
+      </provider>
510
+    </entry>
511
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
512
+      <provider selected="true" editor-type-id="text-editor">
513
+        <state relative-caret-position="75">
514
+          <caret line="5" column="5" lean-forward="true" selection-start-line="2" selection-end-line="5" selection-end-column="5" />
515
+        </state>
516
+      </provider>
517
+    </entry>
518
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
519
+      <provider selected="true" editor-type-id="text-editor">
520
+        <state relative-caret-position="75">
521
+          <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
522
+        </state>
523
+      </provider>
524
+    </entry>
525
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
526
+      <provider selected="true" editor-type-id="text-editor">
527
+        <state relative-caret-position="75">
528
+          <caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
529
+        </state>
530
+      </provider>
531
+    </entry>
532
+    <entry file="file://$PROJECT_DIR$/pom.xml">
533
+      <provider selected="true" editor-type-id="text-editor">
534
+        <state relative-caret-position="120">
535
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
536
+        </state>
537
+      </provider>
538
+    </entry>
416 539
   </component>
417 540
   <component name="masterDetails">
418 541
     <states>

+ 0
- 2
ZipTeamOrange/ZipTeamOrange.iml View File

@@ -1,2 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<module type="JAVA_MODULE" version="4" />

+ 59
- 0
ZipTeamOrange/pom.xml View File

@@ -8,5 +8,64 @@
8 8
     <artifactId>ZipTeamOrange</artifactId>
9 9
     <version>1.0-SNAPSHOT</version>
10 10
 
11
+    <parent>
12
+        <groupId>org.springframework.boot</groupId>
13
+        <artifactId>spring-boot-starter-parent</artifactId>
14
+        <version>2.0.3.RELEASE</version>
15
+    </parent>
16
+
17
+    <dependencies>
18
+        <dependency>
19
+            <groupId>org.springframework.boot</groupId>
20
+            <artifactId>spring-boot-starter-web</artifactId>
21
+        </dependency>
22
+        <dependency>
23
+            <groupId>org.springframework.boot</groupId>
24
+            <artifactId>spring-boot-starter-test</artifactId>
25
+            <scope>test</scope>
26
+        </dependency>
27
+        <dependency>
28
+            <groupId>junit</groupId>
29
+            <artifactId>junit</artifactId>
30
+        </dependency>
31
+        <dependency>
32
+            <groupId>org.springframework.boot</groupId>
33
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
34
+        </dependency>
35
+        <dependency>
36
+            <groupId>org.springframework</groupId>
37
+            <artifactId>spring-test</artifactId>
38
+            <version>5.0.7.RELEASE</version>
39
+            <scope>compile</scope>
40
+        </dependency>
41
+        <dependency>
42
+            <groupId>org.hamcrest</groupId>
43
+            <artifactId>hamcrest-library</artifactId>
44
+        </dependency>
45
+        <dependency>
46
+            <groupId>org.springframework.boot</groupId>
47
+            <artifactId>spring-boot-starter-actuator</artifactId>
48
+        </dependency>
49
+
50
+        <dependency>
51
+            <groupId>org.springframework.boot</groupId>
52
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
53
+        </dependency>
54
+    </dependencies>
55
+
56
+    <properties>
57
+        <java.version>1.8</java.version>
58
+    </properties>
59
+
60
+    <build>
61
+        <plugins>
62
+            <plugin>
63
+                <groupId>org.springframework.boot</groupId>
64
+                <artifactId>spring-boot-maven-plugin</artifactId>
65
+            </plugin>
66
+        </plugins>
67
+    </build>
68
+
69
+
11 70
 
12 71
 </project>

+ 20
- 7
ZipTeamOrange/src/main/java/Chat.java View File

@@ -1,14 +1,15 @@
1 1
 import java.util.ArrayList;
2
+import java.util.HashMap;
2 3
 import java.util.HashSet;
3 4
 
4 5
 public class Chat {
5
-    int chatId;
6
-    String name;
7
-    boolean isChannel;
8
-    boolean isPublic;
9
-    int creatorId;
10
-    HashSet<User> users = new HashSet<User>();
11
-    ArrayList<Message> messages = new ArrayList<Message>();
6
+    private int chatId;
7
+    private String name;
8
+    private boolean isChannel;
9
+    private boolean isPublic;
10
+    private int creatorId;
11
+    private HashSet<User> users = new HashSet<User>();
12
+    private HashMap<String, Message> messages = new HashMap<String, Message>();
12 13
 
13 14
     public Chat(){}
14 15
 
@@ -38,4 +39,16 @@ public class Chat {
38 39
     public boolean isPublic() {
39 40
         return isPublic;
40 41
     }
42
+
43
+    public int getCreatorId() {
44
+        return creatorId;
45
+    }
46
+
47
+    public HashSet<User> getUsers() {
48
+        return users;
49
+    }
50
+
51
+    public HashMap<String, Message> getMessages() {
52
+        return messages;
53
+    }
41 54
 }

+ 17
- 1
ZipTeamOrange/src/main/java/ChatController.java View File

@@ -1,2 +1,18 @@
1
-public class ChatController {
1
+public class ChatController extends Controller{
2
+
3
+    private Chat chat;
4
+    private String uri;
5
+
6
+    public  String get(User user) {
7
+        return user.toString();
8
+    }
9
+    public String put(User user) {
10
+        return user.toString();
11
+    }
12
+
13
+    public String post(User user) {
14
+        return user.toString();
15
+    }
16
+
17
+    public String delete(User user) { return user.toString(); }
2 18
 }

+ 8
- 0
ZipTeamOrange/src/main/java/ChatRepository.java View File

@@ -0,0 +1,8 @@
1
+import org.springframework.data.jpa.repository.JpaRepository;
2
+
3
+import java.util.List;
4
+
5
+interface ChatRespository extends JpaRepository<User, Integer> {
6
+
7
+    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
8
+}

+ 6
- 0
ZipTeamOrange/src/main/java/Controller.java View File

@@ -0,0 +1,6 @@
1
+
2
+
3
+public abstract class Controller {
4
+
5
+    private String url;
6
+}

+ 17
- 1
ZipTeamOrange/src/main/java/MessageController.java View File

@@ -1,2 +1,18 @@
1
-public class MessageController {
1
+public class MessageController extends Controller{
2
+
3
+    private Message message;
4
+    private String uri;
5
+
6
+    public  String get(User user) {
7
+        return user.toString();
8
+    }
9
+    public String put(User user) {
10
+        return user.toString();
11
+    }
12
+
13
+    public String post(User user) {
14
+        return user.toString();
15
+    }
16
+
17
+    public String delete(User user) { return user.toString(); }
2 18
 }

+ 8
- 0
ZipTeamOrange/src/main/java/MessageRepository.java View File

@@ -0,0 +1,8 @@
1
+import org.springframework.data.jpa.repository.JpaRepository;
2
+
3
+import java.util.List;
4
+
5
+interface MessageRespository extends JpaRepository<User, Integer> {
6
+
7
+    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
8
+}

+ 17
- 1
ZipTeamOrange/src/main/java/UserController.java View File

@@ -1,2 +1,18 @@
1
-public class UserController {
1
+public class UserController extends Controller{
2
+
3
+    private User user;
4
+    private String uri;
5
+
6
+    public  String get(User user) {
7
+        return user.toString();
8
+    }
9
+    public String put(User user) {
10
+     return user.toString();
11
+    }
12
+
13
+    public String post(User user) {
14
+     return user.toString();
15
+    }
16
+
17
+    public String delete(User user) { return user.toString(); }
2 18
 }

+ 8
- 0
ZipTeamOrange/src/main/java/UserRepository.java View File

@@ -0,0 +1,8 @@
1
+import org.springframework.data.jpa.repository.JpaRepository;
2
+
3
+import java.util.List;
4
+
5
+interface UserRespository extends JpaRepository<User, Integer> {
6
+
7
+    List<User> findByTitleContainingOrContentContaining(String text, String textAgain);
8
+}