Chad пре 6 година
родитељ
комит
6a0f92fbf5
3 измењених фајлова са 205 додато и 129 уклоњено
  1. 1
    0
      README.md
  2. 154
    129
      ZipTeamOrange/.idea/workspace.xml
  3. 50
    0
      ZipTeamOrange/Middleteir.uml

+ 1
- 0
README.md Прегледај датотеку

@@ -1,5 +1,6 @@
1 1
 # ZipTeam
2 2
 
3
+
3 4
 a zip code slack clone
4 5
 
5 6
 ### Project planning:

+ 154
- 129
ZipTeamOrange/.idea/workspace.xml Прегледај датотеку

@@ -13,99 +13,82 @@
13 13
   </component>
14 14
   <component name="FileEditorManager">
15 15
     <leaf>
16
-      <file leaf-file-name="ChatRepository.java" pinned="false" current-in-tab="false">
17
-        <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
18
-          <provider selected="true" editor-type-id="text-editor">
19
-            <state relative-caret-position="120">
20
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
21
-              <folding>
22
-                <element signature="imports" expanded="true" />
23
-              </folding>
24
-            </state>
25
-          </provider>
26
-        </entry>
27
-      </file>
28
-      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
29
-        <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
30
-          <provider selected="true" editor-type-id="text-editor">
31
-            <state>
32
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
33
-            </state>
34
-          </provider>
35
-        </entry>
36
-      </file>
37
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
38
-        <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
39
-          <provider selected="true" editor-type-id="text-editor">
16
+      <file leaf-file-name="JAVA/Chat" pinned="false" current-in-tab="false">
17
+        <entry file="uml://JAVA/Chat">
18
+          <provider selected="true" editor-type-id="UmlEditorProvider">
40 19
             <state>
41
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
20
+              <ID>JAVA</ID>
21
+              <OriginalElement>Chat</OriginalElement>
22
+              <nodes>
23
+                <node x="-167.0" y="-196.0">Chat</node>
24
+              </nodes>
25
+              <notes />
26
+              <edges />
27
+              <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
28
+              <SelectedNodes>
29
+                <node>Chat</node>
30
+              </SelectedNodes>
31
+              <Categories>
32
+                <Category>Fields</Category>
33
+                <Category>Constructors</Category>
34
+                <Category>Methods</Category>
35
+              </Categories>
36
+              <SCOPE>Project Files</SCOPE>
37
+              <VISIBILITY>private</VISIBILITY>
42 38
             </state>
43 39
           </provider>
44 40
         </entry>
45 41
       </file>
46
-      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
47
-        <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
48
-          <provider selected="true" editor-type-id="text-editor">
42
+      <file leaf-file-name="JAVA/" pinned="false" current-in-tab="true">
43
+        <entry file="uml://JAVA/">
44
+          <provider selected="true" editor-type-id="UmlEditorProvider">
49 45
             <state>
50
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
51
-            </state>
52
-          </provider>
53
-        </entry>
54
-      </file>
55
-      <file leaf-file-name="ChatController.java" pinned="false" current-in-tab="false">
56
-        <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
57
-          <provider selected="true" editor-type-id="text-editor">
58
-            <state>
59
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
60
-            </state>
61
-          </provider>
62
-        </entry>
63
-      </file>
64
-      <file leaf-file-name="Chat.java" pinned="false" current-in-tab="true">
65
-        <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
66
-          <provider selected="true" editor-type-id="text-editor">
67
-            <state relative-caret-position="135">
68
-              <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
69
-              <folding>
70
-                <element signature="imports" expanded="true" />
71
-                <element signature="e#255#261#0" expanded="true" />
72
-              </folding>
73
-            </state>
74
-          </provider>
75
-        </entry>
76
-      </file>
77
-      <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
78
-        <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
79
-          <provider selected="true" editor-type-id="text-editor">
80
-            <state relative-caret-position="30">
81
-              <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
82
-            </state>
83
-          </provider>
84
-        </entry>
85
-      </file>
86
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
87
-        <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
88
-          <provider selected="true" editor-type-id="text-editor">
89
-            <state>
90
-              <caret column="13" selection-start-column="13" selection-end-column="13" />
91
-            </state>
92
-          </provider>
93
-        </entry>
94
-      </file>
95
-      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
96
-        <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
97
-          <provider selected="true" editor-type-id="text-editor">
98
-            <state relative-caret-position="30">
99
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
100
-            </state>
101
-          </provider>
102
-        </entry>
103
-      </file>
104
-      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
105
-        <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
106
-          <provider selected="true" editor-type-id="text-editor">
107
-            <state relative-caret-position="15">
108
-              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
46
+              <ID>JAVA</ID>
47
+              <OriginalElement />
48
+              <nodes>
49
+                <node x="335.0" y="308.0">User</node>
50
+                <node x="687.0" y="308.0">Message</node>
51
+                <node x="0.0" y="603.0">MessageRespository</node>
52
+                <node x="0.0" y="699.0">UserRespository</node>
53
+                <node x="0.0" y="308.0">Chat</node>
54
+                <node x="0.0" y="101.0">UserController</node>
55
+                <node x="410.0" y="101.0">MessageController</node>
56
+                <node x="0.0" y="795.0">ChatRespository</node>
57
+                <node x="235.0" y="0.0">Controller</node>
58
+                <node x="205.0" y="101.0">ChatController</node>
59
+                <node x="541.0" y="795.0">Main</node>
60
+              </nodes>
61
+              <notes />
62
+              <edges>
63
+                <edge source="UserController" target="Controller">
64
+                  <point x="0.0" y="-81.0" />
65
+                  <point x="92.5" y="76.0" />
66
+                  <point x="255.83333333333334" y="76.0" />
67
+                  <point x="-41.66666666666666" y="25.5" />
68
+                </edge>
69
+                <edge source="MessageController" target="Controller">
70
+                  <point x="0.0" y="-81.0" />
71
+                  <point x="502.5" y="76.0" />
72
+                  <point x="339.16666666666663" y="76.0" />
73
+                  <point x="41.66666666666663" y="25.5" />
74
+                </edge>
75
+                <edge source="ChatController" target="Controller">
76
+                  <point x="0.0" y="-81.0" />
77
+                  <point x="0.0" y="25.5" />
78
+                </edge>
79
+              </edges>
80
+              <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
81
+              <SelectedNodes>
82
+                <node>MessageRespository</node>
83
+              </SelectedNodes>
84
+              <Categories>
85
+                <Category>Fields</Category>
86
+                <Category>Constructors</Category>
87
+                <Category>Methods</Category>
88
+                <Category>Properties</Category>
89
+              </Categories>
90
+              <SCOPE>Project Files</SCOPE>
91
+              <VISIBILITY>private</VISIBILITY>
109 92
             </state>
110 93
           </provider>
111 94
         </entry>
@@ -159,11 +142,11 @@
159 142
   <component name="NodePackageJsonFileManager">
160 143
     <packageJsonPaths />
161 144
   </component>
162
-  <component name="ProjectFrameBounds" extendedState="6">
163
-    <option name="x" value="442" />
164
-    <option name="y" value="115" />
165
-    <option name="width" value="1280" />
166
-    <option name="height" value="709" />
145
+  <component name="ProjectFrameBounds">
146
+    <option name="x" value="-170" />
147
+    <option name="y" value="-1049" />
148
+    <option name="width" value="1859" />
149
+    <option name="height" value="1043" />
167 150
   </component>
168 151
   <component name="ProjectView">
169 152
     <navigator proportions="" version="1">
@@ -196,22 +179,6 @@
196 179
               <item name="main" type="462c0819:PsiDirectoryNode" />
197 180
               <item name="java" type="462c0819:PsiDirectoryNode" />
198 181
             </path>
199
-            <path>
200
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
201
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
202
-              <item name="src" type="462c0819:PsiDirectoryNode" />
203
-              <item name="main" type="462c0819:PsiDirectoryNode" />
204
-              <item name="java" type="462c0819:PsiDirectoryNode" />
205
-              <item name="ChatRepository.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
206
-            </path>
207
-            <path>
208
-              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
209
-              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
210
-              <item name="src" type="462c0819:PsiDirectoryNode" />
211
-              <item name="main" type="462c0819:PsiDirectoryNode" />
212
-              <item name="java" type="462c0819:PsiDirectoryNode" />
213
-              <item name="MessageRepository.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
214
-            </path>
215 182
           </expand>
216 183
           <select />
217 184
         </subPane>
@@ -307,10 +274,10 @@
307 274
     <servers />
308 275
   </component>
309 276
   <component name="TimeTrackingManager">
310
-    <option name="totallyTimeSpent" value="8061000" />
277
+    <option name="totallyTimeSpent" value="9446000" />
311 278
   </component>
312 279
   <component name="ToolWindowManager">
313
-    <frame x="0" y="23" width="1280" height="709" extended-state="6" />
280
+    <frame x="-170" y="-1049" width="1859" height="1043" extended-state="0" />
314 281
     <editor active="true" />
315 282
     <layout>
316 283
       <window_info anchor="right" id="Palette" />
@@ -333,7 +300,7 @@
333 300
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
334 301
       <window_info anchor="bottom" id="Spring" />
335 302
       <window_info anchor="bottom" id="Terminal" />
336
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
303
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17213556" />
337 304
       <window_info anchor="right" id="Bean Validation" />
338 305
       <window_info id="Web" side_tool="true" />
339 306
       <window_info anchor="right" id="Theme Preview" />
@@ -520,24 +487,6 @@
520 487
         </state>
521 488
       </provider>
522 489
     </entry>
523
-    <entry file="uml://JAVA/Chat">
524
-      <provider selected="true" editor-type-id="UmlEditorProvider">
525
-        <state>
526
-          <ID>JAVA</ID>
527
-          <OriginalElement>Chat</OriginalElement>
528
-          <nodes>
529
-            <node x="" y="">Chat</node>
530
-          </nodes>
531
-          <notes />
532
-          <edges />
533
-          <settings layout="Hierarchic Group" zoom="1.0" x="38.5" y="14.5" />
534
-          <SelectedNodes />
535
-          <Categories />
536
-          <SCOPE>All</SCOPE>
537
-          <VISIBILITY>private</VISIBILITY>
538
-        </state>
539
-      </provider>
540
-    </entry>
541 490
     <entry file="uml://JAVA/User">
542 491
       <provider selected="true" editor-type-id="UmlEditorProvider">
543 492
         <state>
@@ -684,6 +633,82 @@
684 633
         </state>
685 634
       </provider>
686 635
     </entry>
636
+    <entry file="uml://JAVA/Chat">
637
+      <provider selected="true" editor-type-id="UmlEditorProvider">
638
+        <state>
639
+          <ID>JAVA</ID>
640
+          <OriginalElement>Chat</OriginalElement>
641
+          <nodes>
642
+            <node x="-167.0" y="-196.0">Chat</node>
643
+          </nodes>
644
+          <notes />
645
+          <edges />
646
+          <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
647
+          <SelectedNodes>
648
+            <node>Chat</node>
649
+          </SelectedNodes>
650
+          <Categories>
651
+            <Category>Fields</Category>
652
+            <Category>Constructors</Category>
653
+            <Category>Methods</Category>
654
+          </Categories>
655
+          <SCOPE>Project Files</SCOPE>
656
+          <VISIBILITY>private</VISIBILITY>
657
+        </state>
658
+      </provider>
659
+    </entry>
660
+    <entry file="uml://JAVA/">
661
+      <provider selected="true" editor-type-id="UmlEditorProvider">
662
+        <state>
663
+          <ID>JAVA</ID>
664
+          <OriginalElement />
665
+          <nodes>
666
+            <node x="335.0" y="308.0">User</node>
667
+            <node x="687.0" y="308.0">Message</node>
668
+            <node x="0.0" y="603.0">MessageRespository</node>
669
+            <node x="0.0" y="699.0">UserRespository</node>
670
+            <node x="0.0" y="308.0">Chat</node>
671
+            <node x="0.0" y="101.0">UserController</node>
672
+            <node x="410.0" y="101.0">MessageController</node>
673
+            <node x="0.0" y="795.0">ChatRespository</node>
674
+            <node x="235.0" y="0.0">Controller</node>
675
+            <node x="205.0" y="101.0">ChatController</node>
676
+            <node x="541.0" y="795.0">Main</node>
677
+          </nodes>
678
+          <notes />
679
+          <edges>
680
+            <edge source="UserController" target="Controller">
681
+              <point x="0.0" y="-81.0" />
682
+              <point x="92.5" y="76.0" />
683
+              <point x="255.83333333333334" y="76.0" />
684
+              <point x="-41.66666666666666" y="25.5" />
685
+            </edge>
686
+            <edge source="MessageController" target="Controller">
687
+              <point x="0.0" y="-81.0" />
688
+              <point x="502.5" y="76.0" />
689
+              <point x="339.16666666666663" y="76.0" />
690
+              <point x="41.66666666666663" y="25.5" />
691
+            </edge>
692
+            <edge source="ChatController" target="Controller">
693
+              <point x="0.0" y="-81.0" />
694
+              <point x="0.0" y="25.5" />
695
+            </edge>
696
+          </edges>
697
+          <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
698
+          <SelectedNodes>
699
+            <node>MessageRespository</node>
700
+          </SelectedNodes>
701
+          <Categories>
702
+            <Category>Fields</Category>
703
+            <Category>Constructors</Category>
704
+            <Category>Methods</Category>
705
+            <Category>Properties</Category>
706
+          </Categories>
707
+          <SCOPE>Project Files</SCOPE>
708
+          <VISIBILITY>private</VISIBILITY>
709
+        </state>
710
+      </provider>
711
+    </entry>
687 712
   </component>
688 713
   <component name="masterDetails">
689 714
     <states>

+ 50
- 0
ZipTeamOrange/Middleteir.uml Прегледај датотеку

@@ -0,0 +1,50 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<Diagram>
3
+  <ID>JAVA</ID>
4
+  <OriginalElement />
5
+  <nodes>
6
+    <node x="335.0" y="308.0">User</node>
7
+    <node x="687.0" y="308.0">Message</node>
8
+    <node x="0.0" y="603.0">MessageRespository</node>
9
+    <node x="0.0" y="699.0">UserRespository</node>
10
+    <node x="0.0" y="308.0">Chat</node>
11
+    <node x="410.0" y="101.0">UserController</node>
12
+    <node x="205.0" y="101.0">MessageController</node>
13
+    <node x="0.0" y="795.0">ChatRespository</node>
14
+    <node x="235.0" y="0.0">Controller</node>
15
+    <node x="0.0" y="101.0">ChatController</node>
16
+    <node x="541.0" y="795.0">Main</node>
17
+  </nodes>
18
+  <notes />
19
+  <edges>
20
+    <edge source="UserController" target="Controller">
21
+      <point x="0.0" y="-81.0" />
22
+      <point x="502.5" y="76.0" />
23
+      <point x="339.16666666666663" y="76.0" />
24
+      <point x="41.66666666666663" y="25.5" />
25
+    </edge>
26
+    <edge source="MessageController" target="Controller">
27
+      <point x="0.0" y="-81.0" />
28
+      <point x="0.0" y="25.5" />
29
+    </edge>
30
+    <edge source="ChatController" target="Controller">
31
+      <point x="0.0" y="-81.0" />
32
+      <point x="92.5" y="76.0" />
33
+      <point x="255.83333333333334" y="76.0" />
34
+      <point x="-41.66666666666666" y="25.5" />
35
+    </edge>
36
+  </edges>
37
+  <settings layout="Hierarchic Group" zoom="1.0" x="454.0" y="423.0" />
38
+  <SelectedNodes>
39
+    <node>MessageRespository</node>
40
+  </SelectedNodes>
41
+  <Categories>
42
+    <Category>Fields</Category>
43
+    <Category>Constructors</Category>
44
+    <Category>Methods</Category>
45
+    <Category>Properties</Category>
46
+  </Categories>
47
+  <SCOPE>Project Files</SCOPE>
48
+  <VISIBILITY>private</VISIBILITY>
49
+</Diagram>
50
+