hallinanc
/
ZipTeam
forkato da ZipCodeWilmington/ZipTeam
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Activity
Sfoglia il codice sorgente

added UI

Chad 6 anni fa
parent
f4d297c49c
commit
73347c3f35
9 ha cambiato i file con 472 aggiunte e 196 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. BIN
      IMG_20180709_105418-2.jpg
  2. 6
    0
      ZipTeamOrange/.idea/encodings.xml
  3. 1
    1
      ZipTeamOrange/.idea/misc.xml
  4. 124
    0
      ZipTeamOrange/.idea/uiDesigner.xml
  5. 339
    191
      ZipTeamOrange/.idea/workspace.xml
  6. 0
    1
      ZipTeamOrange/src/main/java/Chat.java
  7. 1
    1
      ZipTeamOrange/src/main/java/ChatController.java
  8. 1
    1
      ZipTeamOrange/src/main/java/MessageController.java
  9. 0
    1
      ZipTeamOrange/src/main/java/MessageRepository.java

BIN
IMG_20180709_105418-2.jpg Vedi File


+ 6
- 0
ZipTeamOrange/.idea/encodings.xml Vedi File 

@@ -0,0 +1,6 @@
1 
+<?xml version="1.0" encoding="UTF-8"?>
2 
+<project version="4">
3 
+  <component name="Encoding">
4 
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
5 
+  </component>
6 
+</project>

+ 1
- 1
ZipTeamOrange/.idea/misc.xml Vedi 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="1.8" project-jdk-type="JavaSDK">
11 
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
12 12 
     <output url="file://$PROJECT_DIR$/out" />
13 13 
   </component>
14 14 
 </project>

+ 124
- 0
ZipTeamOrange/.idea/uiDesigner.xml Vedi File 

@@ -0,0 +1,124 @@
1 
+<?xml version="1.0" encoding="UTF-8"?>
2 
+<project version="4">
3 
+  <component name="Palette2">
4 
+    <group name="Swing">
5 
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6 
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7 
+      </item>
8 
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9 
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10 
+      </item>
11 
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13 
+      </item>
14 
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15 
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16 
+      </item>
17 
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19 
+        <initial-values>
20 
+          <property name="text" value="Button" />
21 
+        </initial-values>
22 
+      </item>
23 
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25 
+        <initial-values>
26 
+          <property name="text" value="RadioButton" />
27 
+        </initial-values>
28 
+      </item>
29 
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30 
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31 
+        <initial-values>
32 
+          <property name="text" value="CheckBox" />
33 
+        </initial-values>
34 
+      </item>
35 
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36 
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37 
+        <initial-values>
38 
+          <property name="text" value="Label" />
39 
+        </initial-values>
40 
+      </item>
41 
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43 
+          <preferred-size width="150" height="-1" />
44 
+        </default-constraints>
45 
+      </item>
46 
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48 
+          <preferred-size width="150" height="-1" />
49 
+        </default-constraints>
50 
+      </item>
51 
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53 
+          <preferred-size width="150" height="-1" />
54 
+        </default-constraints>
55 
+      </item>
56 
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58 
+          <preferred-size width="150" height="50" />
59 
+        </default-constraints>
60 
+      </item>
61 
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63 
+          <preferred-size width="150" height="50" />
64 
+        </default-constraints>
65 
+      </item>
66 
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68 
+          <preferred-size width="150" height="50" />
69 
+        </default-constraints>
70 
+      </item>
71 
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72 
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73 
+      </item>
74 
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76 
+          <preferred-size width="150" height="50" />
77 
+        </default-constraints>
78 
+      </item>
79 
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80 
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81 
+          <preferred-size width="150" height="50" />
82 
+        </default-constraints>
83 
+      </item>
84 
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86 
+          <preferred-size width="150" height="50" />
87 
+        </default-constraints>
88 
+      </item>
89 
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91 
+          <preferred-size width="200" height="200" />
92 
+        </default-constraints>
93 
+      </item>
94 
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95 
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96 
+          <preferred-size width="200" height="200" />
97 
+        </default-constraints>
98 
+      </item>
99 
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101 
+      </item>
102 
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104 
+      </item>
105 
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106 
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107 
+      </item>
108 
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110 
+      </item>
111 
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112 
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113 
+          <preferred-size width="-1" height="20" />
114 
+        </default-constraints>
115 
+      </item>
116 
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117 
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118 
+      </item>
119 
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120 
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121 
+      </item>
122 
+    </group>
123 
+  </component>
124 
+</project>

+ 339
- 191
ZipTeamOrange/.idea/workspace.xml Vedi File 

@@ -12,127 +12,100 @@
12 12 
     <option name="LAST_RESOLUTION" value="IGNORE" />
13 13 
   </component>
14 14 
   <component name="FileEditorManager">
15 
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16 
-      <file leaf-file-name="Chat.java" pinned="false" current-in-tab="false">
17 
-        <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
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 18 
           <provider selected="true" editor-type-id="text-editor">
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" />
19 
+            <state relative-caret-position="120">
20 
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
21 21 
               <folding>
22 22 
                 <element signature="imports" expanded="true" />
23 
-                <element signature="e#209#215#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" />
30 23 
               </folding>
31 24 
             </state>
32 25 
           </provider>
33 26 
         </entry>
34 27 
       </file>
35 
-      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
36 
-        <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
28 
+      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
29 
+        <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
37 30 
           <provider selected="true" editor-type-id="text-editor">
38 
-            <state relative-caret-position="90">
39 
-              <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
31 
+            <state>
32 
+              <caret column="13" selection-start-column="13" selection-end-column="13" />
40 33 
             </state>
41 34 
           </provider>
42 35 
         </entry>
43 36 
       </file>
44 
-      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
45 
-        <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
37 
+      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
38 
+        <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
46 39 
           <provider selected="true" editor-type-id="text-editor">
47 40 
             <state>
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>
41 
+              <caret column="13" selection-start-column="13" selection-end-column="13" />
57 42 
             </state>
58 43 
           </provider>
59 44 
         </entry>
60 45 
       </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">
46 
+      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
47 
+        <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
63 48 
           <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" />
49 
+            <state>
50 
+              <caret column="13" selection-start-column="13" selection-end-column="13" />
66 51 
             </state>
67 52 
           </provider>
68 53 
         </entry>
69 54 
       </file>
70 
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
71 
-        <entry file="file://$PROJECT_DIR$/pom.xml">
55 
+      <file leaf-file-name="ChatController.java" pinned="false" current-in-tab="false">
56 
+        <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
72 57 
           <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" />
58 
+            <state>
59 
+              <caret column="13" selection-start-column="13" selection-end-column="13" />
75 60 
             </state>
76 61 
           </provider>
77 62 
         </entry>
78 63 
       </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">
64 
+      <file leaf-file-name="Chat.java" pinned="false" current-in-tab="true">
65 
+        <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
81 66 
           <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" />
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>
84 73 
             </state>
85 74 
           </provider>
86 75 
         </entry>
87 76 
       </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">
77 
+      <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
78 
+        <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
90 79 
           <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" />
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" />
93 82 
             </state>
94 83 
           </provider>
95 84 
         </entry>
96 85 
       </file>
97 
-      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
98 
-        <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
86 
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
87 
+        <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
99 88 
           <provider selected="true" editor-type-id="text-editor">
100 89 
             <state>
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>
90 
+              <caret column="13" selection-start-column="13" selection-end-column="13" />
110 91 
             </state>
111 92 
           </provider>
112 93 
         </entry>
113 94 
       </file>
114 
-      <file leaf-file-name="ChatController.java" pinned="false" current-in-tab="false">
115 
-        <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
95 
+      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
96 
+        <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
116 97 
           <provider selected="true" editor-type-id="text-editor">
117 
-            <state>
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>
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" />
127 100 
             </state>
128 101 
           </provider>
129 102 
         </entry>
130 103 
       </file>
131 
-      <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
132 
-        <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
104 
+      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
105 
+        <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
133 106 
           <provider selected="true" editor-type-id="text-editor">
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" />
107 
+            <state relative-caret-position="15">
108 
+              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
136 109 
             </state>
137 110 
           </provider>
138 111 
         </entry>
 
@@ -143,22 +116,30 @@
143 116 
     <option name="RECENT_TEMPLATES">
144 117 
       <list>
145 118 
         <option value="Class" />
119 
+        <option value="Interface" />
146 120 
       </list>
147 121 
     </option>
148 122 
   </component>
149 123 
   <component name="IdeDocumentHistory">
150 124 
     <option name="CHANGED_PATHS">
151 125 
       <list>
152 
-        <option value="$PROJECT_DIR$/src/main/java/User.java" />
153 126 
         <option value="$PROJECT_DIR$/src/main/java/Message.java" />
154 
-        <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
155 127 
         <option value="$PROJECT_DIR$/src/main/java/Controller.java" />
156 128 
         <option value="$PROJECT_DIR$/src/main/java/ChatController.java" />
157 129 
         <option value="$PROJECT_DIR$/src/main/java/MessageController.java" />
158 130 
         <option value="$PROJECT_DIR$/src/main/java/UserController.java" />
159 131 
         <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
160 
-        <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
132 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/user/UserRepository.java" />
133 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/message/MessageRepository.java" />
134 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/Chat.java" />
135 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/ChatRepository.java" />
136 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/User.java" />
137 
+        <option value="$PROJECT_DIR$/src/main/java/User.java" />
138 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/Chat.java" />
139 
+        <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
161 140 
         <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
141 
+        <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
142 
+        <option value="$PROJECT_DIR$/src/main/java/ChatRepository1.java" />
162 143 
       </list>
163 144 
     </option>
164 145 
   </component>
 
@@ -178,7 +159,7 @@
178 159 
   <component name="NodePackageJsonFileManager">
179 160 
     <packageJsonPaths />
180 161 
   </component>
181 
-  <component name="ProjectFrameBounds">
162 
+  <component name="ProjectFrameBounds" extendedState="6">
182 163 
     <option name="x" value="442" />
183 164 
     <option name="y" value="115" />
184 165 
     <option name="width" value="1280" />
 
@@ -189,9 +170,7 @@
189 170 
       <foldersAlwaysOnTop value="true" />
190 171 
     </navigator>
191 172 
     <panes>
192 
-      <pane id="Scope" />
193 173 
       <pane id="AndroidView" />
194 
-      <pane id="PackagesPane" />
195 174 
       <pane id="ProjectPane">
196 175 
         <subPane>
197 176 
           <expand>
 
@@ -199,10 +178,46 @@
199 178 
               <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
200 179 
               <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
201 180 
             </path>
181 
+            <path>
182 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
183 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
184 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
185 
+            </path>
186 
+            <path>
187 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
188 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
189 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
190 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
191 
+            </path>
192 
+            <path>
193 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
194 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
195 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
196 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
197 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
198 
+            </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>
202 215 
           </expand>
203 216 
           <select />
204 217 
         </subPane>
205 218 
       </pane>
219 
+      <pane id="PackagesPane" />
220 
+      <pane id="Scope" />
206 221 
     </panes>
207 222 
   </component>
208 223 
   <component name="PropertiesComponent">
 
@@ -217,6 +232,11 @@
217 232 
     <property name="project.structure.side.proportion" value="0.2" />
218 233 
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
219 234 
   </component>
235 
+  <component name="RecentsManager">
236 
+    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
237 
+      <recent name="" />
238 
+    </key>
239 
+  </component>
220 240 
   <component name="RunDashboard">
221 241 
     <option name="ruleStates">
222 242 
       <list>
 
@@ -287,40 +307,65 @@
287 307 
     <servers />
288 308 
   </component>
289 309 
   <component name="TimeTrackingManager">
290 
-    <option name="totallyTimeSpent" value="5313000" />
310 
+    <option name="totallyTimeSpent" value="8061000" />
291 311 
   </component>
292 312 
   <component name="ToolWindowManager">
293 
-    <frame x="442" y="115" width="1280" height="709" extended-state="0" />
313 
+    <frame x="0" y="23" width="1280" height="709" extended-state="6" />
294 314 
     <editor active="true" />
295 315 
     <layout>
296 
-      <window_info anchor="right" id="Palette" order="3" />
316 
+      <window_info anchor="right" id="Palette" />
317 
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
318 
+      <window_info anchor="right" id="Maven Projects" />
319 
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
320 
+      <window_info id="Capture Tool" />
321 
+      <window_info id="Designer" />
322 
+      <window_info anchor="right" id="Database" />
323 
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
324 
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
325 
+      <window_info id="UI Designer" />
326 
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
297 327 
       <window_info anchor="bottom" id="TODO" order="6" />
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" />
328 
+      <window_info anchor="right" id="Palette&#9;" />
329 
+      <window_info id="Image Layers" />
330 
+      <window_info anchor="bottom" id="Java Enterprise" />
331 
+      <window_info anchor="right" id="Capture Analysis" />
303 332 
       <window_info anchor="bottom" id="Run" order="2" />
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" />
333 
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
334 
+      <window_info anchor="bottom" id="Spring" />
335 
+      <window_info anchor="bottom" id="Terminal" />
336 
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
337 
+      <window_info anchor="right" id="Bean Validation" />
338 
+      <window_info id="Web" side_tool="true" />
339 
+      <window_info anchor="right" id="Theme Preview" />
340 
+      <window_info id="Favorites" side_tool="true" />
341 
+      <window_info anchor="right" id="Palette" order="3" />
307 342 
       <window_info id="Designer" order="2" />
343 
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
344 
+      <window_info anchor="right" id="Capture Analysis" order="3" />
345 
+      <window_info anchor="bottom" id="Run" order="2" />
346 
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
308 347 
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
309 
-      <window_info id="Learn" />
310 348 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
311 
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
349 
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
350 
+      <window_info anchor="bottom" id="TODO" order="6" />
351 
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
352 
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
353 
+      <window_info id="Image Layers" order="2" />
354 
+      <window_info id="Capture Tool" order="2" />
312 355 
       <window_info id="UI Designer" order="2" />
356 
+      <window_info anchor="bottom" id="Find" order="1" />
313 357 
       <window_info anchor="right" id="Theme Preview" order="3" />
314 
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
315 
-      <window_info id="Favorites" order="2" side_tool="true" />
316 
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
358 
+      <window_info id="Learn" order="3" />
359 
+      <window_info anchor="right" id="Palette&#9;" order="3" />
360 
+      <window_info anchor="bottom" id="Terminal" order="7" />
361 
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
317 362 
       <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" />
320 
-      <window_info anchor="bottom" id="Message" order="0" />
321 
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
322 363 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
323 
-      <window_info anchor="bottom" id="Find" order="1" />
364 
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
365 
+      <window_info anchor="bottom" id="Message" order="0" />
366 
+      <window_info anchor="right" id="Database" order="3" />
367 
+      <window_info anchor="right" id="Maven Projects" order="3" />
368 
+      <window_info id="Favorites" order="2" side_tool="true" />
324 369 
     </layout>
325 370 
   </component>
326 371 
   <component name="TypeScriptGeneratedFilesManager">
 
@@ -335,6 +380,86 @@
335 380 
     </ignored-roots>
336 381 
   </component>
337 382 
   <component name="editorHistoryManager">
383 
+    <entry file="file://$PROJECT_DIR$/pom.xml">
384 
+      <provider selected="true" editor-type-id="text-editor" />
385 
+    </entry>
386 
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
387 
+      <provider selected="true" editor-type-id="text-editor">
388 
+        <state>
389 
+          <caret column="30" selection-start-column="30" selection-end-column="30" />
390 
+        </state>
391 
+      </provider>
392 
+    </entry>
393 
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
394 
+      <provider selected="true" editor-type-id="text-editor">
395 
+        <state>
396 
+          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
397 
+        </state>
398 
+      </provider>
399 
+    </entry>
400 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
401 
+      <provider selected="true" editor-type-id="text-editor">
402 
+        <state>
403 
+          <caret column="17" selection-start-column="17" selection-end-column="17" />
404 
+        </state>
405 
+      </provider>
406 
+    </entry>
407 
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
408 
+      <provider selected="true" editor-type-id="text-editor">
409 
+        <state>
410 
+          <caret column="27" selection-start-column="27" selection-end-column="27" />
411 
+        </state>
412 
+      </provider>
413 
+    </entry>
414 
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
415 
+      <provider selected="true" editor-type-id="text-editor">
416 
+        <state relative-caret-position="450">
417 
+          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
418 
+          <folding>
419 
+            <element signature="e#140#141#0" expanded="true" />
420 
+            <element signature="e#169#170#0" expanded="true" />
421 
+            <element signature="e#200#201#0" expanded="true" />
422 
+            <element signature="e#227#228#0" expanded="true" />
423 
+            <element signature="e#259#260#0" expanded="true" />
424 
+            <element signature="e#287#288#0" expanded="true" />
425 
+            <element signature="e#322#323#0" expanded="true" />
426 
+            <element signature="e#353#354#0" expanded="true" />
427 
+            <element signature="e#387#388#0" expanded="true" />
428 
+            <element signature="e#417#418#0" expanded="true" />
429 
+          </folding>
430 
+        </state>
431 
+      </provider>
432 
+    </entry>
433 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
434 
+      <provider selected="true" editor-type-id="text-editor">
435 
+        <state relative-caret-position="90">
436 
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
437 
+          <folding>
438 
+            <element signature="e#134#135#0" expanded="true" />
439 
+            <element signature="e#166#167#0" expanded="true" />
440 
+            <element signature="e#197#198#0" expanded="true" />
441 
+            <element signature="e#224#225#0" expanded="true" />
442 
+            <element signature="e#258#259#0" expanded="true" />
443 
+            <element signature="e#290#291#0" expanded="true" />
444 
+            <element signature="e#580#581#0" expanded="true" />
445 
+            <element signature="e#609#610#0" expanded="true" />
446 
+            <element signature="e#639#640#0" expanded="true" />
447 
+            <element signature="e#668#669#0" expanded="true" />
448 
+          </folding>
449 
+        </state>
450 
+      </provider>
451 
+    </entry>
452 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
453 
+      <provider selected="true" editor-type-id="text-editor">
454 
+        <state relative-caret-position="180">
455 
+          <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
456 
+          <folding>
457 
+            <element signature="imports" expanded="true" />
458 
+            <element signature="e#255#261#0" expanded="true" />
459 
+          </folding>
460 
+        </state>
461 
+      </provider>
462 
+    </entry>
338 463 
     <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
339 464 
       <provider selected="true" editor-type-id="text-editor">
340 465 
         <state relative-caret-position="450">
 
@@ -353,14 +478,6 @@
353 478 
       <provider selected="true" editor-type-id="text-editor">
354 479 
         <state>
355 480 
           <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 481 
         </state>
365 482 
       </provider>
366 483 
     </entry>
 
@@ -368,14 +485,6 @@
368 485 
       <provider selected="true" editor-type-id="text-editor">
369 486 
         <state>
370 487 
           <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>
379 488 
         </state>
380 489 
       </provider>
381 490 
     </entry>
 
@@ -383,14 +492,6 @@
383 492 
       <provider selected="true" editor-type-id="text-editor">
384 493 
         <state>
385 494 
           <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>
394 495 
         </state>
395 496 
       </provider>
396 497 
     </entry>
 
@@ -407,132 +508,179 @@
407 508 
           <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
408 509 
           <folding>
409 510 
             <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" />
511 
+            <element signature="e#255#261#0" expanded="true" />
417 512 
           </folding>
418 513 
         </state>
419 514 
       </provider>
420 515 
     </entry>
421 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
516 
+    <entry file="file://$PROJECT_DIR$/pom.xml">
422 517 
       <provider selected="true" editor-type-id="text-editor">
518 
+        <state relative-caret-position="120">
519 
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
520 
+        </state>
521 
+      </provider>
522 
+    </entry>
523 
+    <entry file="uml://JAVA/Chat">
524 
+      <provider selected="true" editor-type-id="UmlEditorProvider">
423 525 
         <state>
424 
-          <caret column="17" selection-start-column="17" selection-end-column="17" />
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>
425 538 
         </state>
426 539 
       </provider>
427 540 
     </entry>
428 
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
429 
-      <provider selected="true" editor-type-id="text-editor">
430 
-        <state relative-caret-position="450">
431 
-          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
541 
+    <entry file="uml://JAVA/User">
542 
+      <provider selected="true" editor-type-id="UmlEditorProvider">
543 
+        <state>
544 
+          <ID>JAVA</ID>
545 
+          <OriginalElement>User</OriginalElement>
546 
+          <nodes>
547 
+            <node x="" y="">User</node>
548 
+          </nodes>
549 
+          <notes />
550 
+          <edges />
551 
+          <settings layout="Hierarchic Group" zoom="1.0" x="38.5" y="14.5" />
552 
+          <SelectedNodes />
553 
+          <Categories />
554 
+          <SCOPE>All</SCOPE>
555 
+          <VISIBILITY>private</VISIBILITY>
432 556 
         </state>
433 557 
       </provider>
434 558 
     </entry>
435 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
436 
-      <provider selected="true" editor-type-id="text-editor">
437 
-        <state relative-caret-position="90">
438 
-          <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
559 
+    <entry file="uml://JAVA/UserController">
560 
+      <provider selected="true" editor-type-id="UmlEditorProvider">
561 
+        <state>
562 
+          <ID>JAVA</ID>
563 
+          <OriginalElement>UserController</OriginalElement>
564 
+          <nodes>
565 
+            <node x="" y="">UserController</node>
566 
+            <node x="" y="">Controller</node>
567 
+          </nodes>
568 
+          <notes />
569 
+          <edges />
570 
+          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
571 
+          <SelectedNodes />
572 
+          <Categories />
573 
+          <SCOPE>All</SCOPE>
574 
+          <VISIBILITY>private</VISIBILITY>
439 575 
         </state>
440 576 
       </provider>
441 577 
     </entry>
442 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
578 
+    <entry file="uml://JAVA/ChatController">
579 
+      <provider selected="true" editor-type-id="UmlEditorProvider">
580 
+        <state>
581 
+          <ID>JAVA</ID>
582 
+          <OriginalElement>ChatController</OriginalElement>
583 
+          <nodes>
584 
+            <node x="" y="">ChatController</node>
585 
+            <node x="" y="">Controller</node>
586 
+          </nodes>
587 
+          <notes />
588 
+          <edges />
589 
+          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
590 
+          <SelectedNodes />
591 
+          <Categories />
592 
+          <SCOPE>All</SCOPE>
593 
+          <VISIBILITY>private</VISIBILITY>
594 
+        </state>
595 
+      </provider>
596 
+    </entry>
597 
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
443 598 
       <provider selected="true" editor-type-id="text-editor">
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" />
599 
+        <state relative-caret-position="105">
600 
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
446 601 
           <folding>
447 602 
             <element signature="imports" expanded="true" />
448 
-            <element signature="e#209#215#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 603 
           </folding>
456 604 
         </state>
457 605 
       </provider>
458 606 
     </entry>
459 
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
607 
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
460 608 
       <provider selected="true" editor-type-id="text-editor">
461 
-        <state>
462 
-          <caret column="46" selection-start-column="46" selection-end-column="46" />
609 
+        <state relative-caret-position="15">
610 
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
611 
+        </state>
612 
+      </provider>
613 
+    </entry>
614 
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository1.java">
615 
+      <provider selected="true" editor-type-id="text-editor" />
616 
+    </entry>
617 
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
618 
+      <provider selected="true" editor-type-id="text-editor">
619 
+        <state relative-caret-position="120">
620 
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
463 621 
           <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" />
622 
+            <element signature="imports" expanded="true" />
470 623 
           </folding>
471 624 
         </state>
472 625 
       </provider>
473 626 
     </entry>
474 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
627 
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
475 628 
       <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" />
629 
+        <state>
630 
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
478 631 
         </state>
479 632 
       </provider>
480 633 
     </entry>
481 
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
634 
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
482 635 
       <provider selected="true" editor-type-id="text-editor">
483 636 
         <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>
637 
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
493 638 
         </state>
494 639 
       </provider>
495 640 
     </entry>
496 641 
     <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
497 642 
       <provider selected="true" editor-type-id="text-editor">
498 643 
         <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>
644 
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
508 645 
         </state>
509 646 
       </provider>
510 647 
     </entry>
511 
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
648 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
512 649 
       <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" />
650 
+        <state relative-caret-position="30">
651 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
515 652 
         </state>
516 653 
       </provider>
517 654 
     </entry>
518 
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
655 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
519 656 
       <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" />
657 
+        <state>
658 
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
522 659 
         </state>
523 660 
       </provider>
524 661 
     </entry>
525 
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
662 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
526 663 
       <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" />
664 
+        <state relative-caret-position="30">
665 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
529 666 
         </state>
530 667 
       </provider>
531 668 
     </entry>
532 
-    <entry file="file://$PROJECT_DIR$/pom.xml">
669 
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
533 670 
       <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" />
671 
+        <state>
672 
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
673 
+        </state>
674 
+      </provider>
675 
+    </entry>
676 
+    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
677 
+      <provider selected="true" editor-type-id="text-editor">
678 
+        <state relative-caret-position="135">
679 
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
680 
+          <folding>
681 
+            <element signature="imports" expanded="true" />
682 
+            <element signature="e#255#261#0" expanded="true" />
683 
+          </folding>
536 684 
         </state>
537 685 
       </provider>
538 686 
     </entry>

+ 0
- 1
ZipTeamOrange/src/main/java/Chat.java Vedi File 

@@ -1,4 +1,3 @@
1 
-import java.util.ArrayList;
2 1 
 import java.util.HashMap;
3 2 
 import java.util.HashSet;
4 3

+ 1
- 1
ZipTeamOrange/src/main/java/ChatController.java Vedi File 

@@ -1,4 +1,4 @@
1 
-public class ChatController extends Controller{
1 
+public class ChatController extends Controller {
2 2
3 3 
     private Chat chat;
4 4 
     private String uri;

+ 1
- 1
ZipTeamOrange/src/main/java/MessageController.java Vedi File 

@@ -1,4 +1,4 @@
1 
-public class MessageController extends Controller{
1 
+public class MessageController extends Controller {
2 2
3 3 
     private Message message;
4 4 
     private String uri;

+ 0
- 1
ZipTeamOrange/src/main/java/MessageRepository.java Vedi File 

@@ -1,5 +1,4 @@
1 1 
 import org.springframework.data.jpa.repository.JpaRepository;
2 
-
3 2 
 import java.util.List;
4 3
5 4 
 interface MessageRespository extends JpaRepository<User, Integer> {