hallinanc
/
ZipTeam
forkattu lähteestä ZipCodeWilmington/ZipTeam
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

user class

JaseG256 6 vuotta sitten
vanhempi
f4d297c49c
commit
3053f6ac30
15 muutettua tiedostoa jossa 536 lisäystä ja 238 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 6
    0
      ZipTeamOrange/.idea/encodings.xml
  2. 124
    0
      ZipTeamOrange/.idea/uiDesigner.xml
  3. 315
    181
      ZipTeamOrange/.idea/workspace.xml
  4. 0
    55
      ZipTeamOrange/src/main/java/User.java
  5. 2
    1
      ZipTeamOrange/src/main/java/com/zipteam/Chat.java
  6. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/ChatController.java
  7. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/ChatRepository.java
  8. 1
    1
      ZipTeamOrange/src/main/java/com/zipteam/Controller.java
  9. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/Main.java
  10. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/Message.java
  11. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/MessageController.java
  12. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/MessageRepository.java
  13. 72
    0
      ZipTeamOrange/src/main/java/com/zipteam/User.java
  14. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/UserController.java
  15. 2
    0
      ZipTeamOrange/src/main/java/com/zipteam/UserRepository.java

+ 6
- 0
ZipTeamOrange/.idea/encodings.xml Näytä tiedosto 

@@ -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>

+ 124
- 0
ZipTeamOrange/.idea/uiDesigner.xml Näytä tiedosto 

@@ -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>

+ 315
- 181
ZipTeamOrange/.idea/workspace.xml Näytä tiedosto 

@@ -13,126 +13,105 @@
13 13 
   </component>
14 14 
   <component name="FileEditorManager">
15 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">
16 
+      <file leaf-file-name="User.java" pinned="false" current-in-tab="true">
17 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.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="150">
20 
+              <caret line="10" column="50" lean-forward="true" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
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="pom.xml" pinned="false" current-in-tab="false">
29 
+        <entry file="file://$PROJECT_DIR$/pom.xml">
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 relative-caret-position="720">
32 
+              <caret line="48" selection-start-line="48" selection-end-line="48" />
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="Message.java" pinned="false" current-in-tab="false">
38 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Message.java">
46 39 
           <provider selected="true" editor-type-id="text-editor">
47 
-            <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>
40 
+            <state relative-caret-position="60">
41 
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" 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="UserController.java" pinned="false" current-in-tab="false">
47 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.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 relative-caret-position="210">
50 
+              <caret line="20" selection-start-line="20" selection-end-line="20" />
51 
+              <folding>
52 
+                <element signature="e#226#227#0" expanded="true" />
53 
+                <element signature="e#261#262#0" expanded="true" />
54 
+              </folding>
66 55 
             </state>
67 56 
           </provider>
68 57 
         </entry>
69 58 
       </file>
70 
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
71 
-        <entry file="file://$PROJECT_DIR$/pom.xml">
59 
+      <file leaf-file-name="MessageController.java" pinned="false" current-in-tab="false">
60 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
72 61 
           <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" />
62 
+            <state relative-caret-position="30">
63 
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
75 64 
             </state>
76 65 
           </provider>
77 66 
         </entry>
78 67 
       </file>
79 68 
       <file leaf-file-name="MessageRepository.java" pinned="false" current-in-tab="false">
80 
-        <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
69 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageRepository.java">
81 70 
           <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" />
71 
+            <state relative-caret-position="60">
72 
+              <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
73 
+              <folding>
74 
+                <element signature="imports" expanded="true" />
75 
+              </folding>
84 76 
             </state>
85 77 
           </provider>
86 78 
         </entry>
87 79 
       </file>
88 80 
       <file leaf-file-name="ChatRepository.java" pinned="false" current-in-tab="false">
89 
-        <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
81 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatRepository.java">
90 82 
           <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" />
83 
+            <state relative-caret-position="60">
84 
+              <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
85 
+              <folding>
86 
+                <element signature="imports" expanded="true" />
87 
+              </folding>
93 88 
             </state>
94 89 
           </provider>
95 90 
         </entry>
96 91 
       </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">
92 
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
93 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
99 94 
           <provider selected="true" editor-type-id="text-editor">
100 
-            <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>
95 
+            <state relative-caret-position="30">
96 
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
110 97 
             </state>
111 98 
           </provider>
112 99 
         </entry>
113 100 
       </file>
114 101 
       <file leaf-file-name="ChatController.java" pinned="false" current-in-tab="false">
115 
-        <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
102 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
116 103 
           <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>
104 
+            <state relative-caret-position="30">
105 
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
127 106 
             </state>
128 107 
           </provider>
129 108 
         </entry>
130 109 
       </file>
131 110 
       <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
132 
-        <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
111 
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Controller.java">
133 112 
           <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" />
113 
+            <state relative-caret-position="30">
114 
+              <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
136 115 
             </state>
137 116 
           </provider>
138 117 
         </entry>
 
@@ -143,6 +122,7 @@
143 122 
     <option name="RECENT_TEMPLATES">
144 123 
       <list>
145 124 
         <option value="Class" />
125 
+        <option value="Interface" />
146 126 
       </list>
147 127 
     </option>
148 128 
   </component>
 
@@ -156,9 +136,12 @@
156 136 
         <option value="$PROJECT_DIR$/src/main/java/ChatController.java" />
157 137 
         <option value="$PROJECT_DIR$/src/main/java/MessageController.java" />
158 138 
         <option value="$PROJECT_DIR$/src/main/java/UserController.java" />
159 
-        <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
139 
+        <option value="$PROJECT_DIR$/pom.xml" />
160 140 
         <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
161 141 
         <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
142 
+        <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
143 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteam/UserRepository.java" />
144 
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteam/User.java" />
162 145 
       </list>
163 146 
     </option>
164 147 
   </component>
 
@@ -178,20 +161,19 @@
178 161 
   <component name="NodePackageJsonFileManager">
179 162 
     <packageJsonPaths />
180 163 
   </component>
181 
-  <component name="ProjectFrameBounds">
182 
-    <option name="x" value="442" />
183 
-    <option name="y" value="115" />
164 
+  <component name="ProjectFrameBounds" extendedState="6">
165 
+    <option name="y" value="23" />
184 166 
     <option name="width" value="1280" />
185 
-    <option name="height" value="709" />
167 
+    <option name="height" value="717" />
186 168 
   </component>
187 169 
   <component name="ProjectView">
188 170 
     <navigator proportions="" version="1">
189 171 
       <foldersAlwaysOnTop value="true" />
190 172 
     </navigator>
191 173 
     <panes>
174 
+      <pane id="PackagesPane" />
192 175 
       <pane id="Scope" />
193 176 
       <pane id="AndroidView" />
194 
-      <pane id="PackagesPane" />
195 177 
       <pane id="ProjectPane">
196 178 
         <subPane>
197 179 
           <expand>
 
@@ -199,6 +181,32 @@
199 181 
               <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
200 182 
               <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
201 183 
             </path>
184 
+            <path>
185 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
186 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
187 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
188 
+            </path>
189 
+            <path>
190 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
191 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
192 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
193 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
194 
+            </path>
195 
+            <path>
196 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
197 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
198 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
199 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
200 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
201 
+            </path>
202 
+            <path>
203 
+              <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
204 
+              <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
205 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
206 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
207 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
208 
+              <item name="zipteam" type="462c0819:PsiDirectoryNode" />
209 
+            </path>
202 210 
           </expand>
203 211 
           <select />
204 212 
         </subPane>
 
@@ -290,8 +298,7 @@
290 298 
     <option name="totallyTimeSpent" value="5313000" />
291 299 
   </component>
292 300 
   <component name="ToolWindowManager">
293 
-    <frame x="442" y="115" width="1280" height="709" extended-state="0" />
294 
-    <editor active="true" />
301 
+    <frame x="0" y="23" width="1280" height="717" extended-state="0" />
295 302 
     <layout>
296 303 
       <window_info anchor="right" id="Palette" order="3" />
297 304 
       <window_info anchor="bottom" id="TODO" order="6" />
 
@@ -302,11 +309,11 @@
302 309 
       <window_info anchor="right" id="Maven Projects" order="3" />
303 310 
       <window_info anchor="bottom" id="Run" order="2" />
304 311 
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
305 
-      <window_info anchor="bottom" id="Terminal" order="7" />
312 
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.27096775" />
306 313 
       <window_info id="Capture Tool" order="2" />
307 314 
       <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" />
315 
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26171243" />
316 
+      <window_info id="Learn" order="3" />
310 317 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
311 318 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
312 319 
       <window_info id="UI Designer" order="2" />
 
@@ -314,9 +321,9 @@
314 321 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
315 322 
       <window_info id="Favorites" order="2" side_tool="true" />
316 323 
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
324 
+      <window_info anchor="right" id="Database" order="3" />
317 325 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
318 326 
       <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 327 
       <window_info anchor="bottom" id="Message" order="0" />
321 328 
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
322 329 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
 
@@ -335,204 +342,331 @@
335 342 
     </ignored-roots>
336 343 
   </component>
337 344 
   <component name="editorHistoryManager">
338 
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
345 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
339 346 
       <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" />
347 
+        <state relative-caret-position="225">
348 
+          <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
349 
+          <folding>
350 
+            <element signature="imports" expanded="true" />
351 
+          </folding>
342 352 
         </state>
343 353 
       </provider>
344 354 
     </entry>
345 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
355 
+    <entry file="file://$PROJECT_DIR$/pom.xml">
346 356 
       <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" />
357 
+        <state relative-caret-position="720">
358 
+          <caret line="48" selection-start-line="48" selection-end-line="48" />
349 359 
         </state>
350 360 
       </provider>
351 361 
     </entry>
352 
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
362 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.java">
353 363 
       <provider selected="true" editor-type-id="text-editor">
354 
-        <state>
355 
-          <caret column="27" selection-start-column="27" selection-end-column="27" />
364 
+        <state relative-caret-position="210">
365 
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
356 366 
           <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 367 
             <element signature="e#226#227#0" expanded="true" />
362 
-            <element signature="e#252#253#0" expanded="true" />
368 
+            <element signature="e#261#262#0" expanded="true" />
363 369 
           </folding>
364 370 
         </state>
365 371 
       </provider>
366 372 
     </entry>
367 
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
373 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
368 374 
       <provider selected="true" editor-type-id="text-editor">
369 
-        <state>
370 
-          <caret column="30" selection-start-column="30" selection-end-column="30" />
375 
+        <state relative-caret-position="30">
376 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
377 
+        </state>
378 
+      </provider>
379 
+    </entry>
380 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageRepository.java">
381 
+      <provider selected="true" editor-type-id="text-editor">
382 
+        <state relative-caret-position="60">
383 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
371 384 
           <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" />
385 
+            <element signature="imports" expanded="true" />
378 386 
           </folding>
379 387 
         </state>
380 388 
       </provider>
381 389 
     </entry>
382 
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
390 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatRepository.java">
383 391 
       <provider selected="true" editor-type-id="text-editor">
384 
-        <state>
385 
-          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
392 
+        <state relative-caret-position="60">
393 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
386 394 
           <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" />
395 
+            <element signature="imports" expanded="true" />
393 396 
           </folding>
394 397 
         </state>
395 398 
       </provider>
396 399 
     </entry>
397 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
400 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
398 401 
       <provider selected="true" editor-type-id="text-editor">
399 
-        <state>
400 
-          <caret column="17" selection-start-column="17" selection-end-column="17" />
402 
+        <state relative-caret-position="30">
403 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
401 404 
         </state>
402 405 
       </provider>
403 406 
     </entry>
404 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
407 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
405 408 
       <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" />
409 
+        <state relative-caret-position="30">
410 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
411 
+        </state>
412 
+      </provider>
413 
+    </entry>
414 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Controller.java">
415 
+      <provider selected="true" editor-type-id="text-editor">
416 
+        <state relative-caret-position="30">
417 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
418 
+        </state>
419 
+      </provider>
420 
+    </entry>
421 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Message.java">
422 
+      <provider selected="true" editor-type-id="text-editor">
423 
+        <state relative-caret-position="60">
424 
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
425 
+        </state>
426 
+      </provider>
427 
+    </entry>
428 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
429 
+      <provider selected="true" editor-type-id="text-editor">
430 
+        <state relative-caret-position="30">
431 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
408 432 
           <folding>
409 433 
             <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 434 
           </folding>
418 435 
         </state>
419 436 
       </provider>
420 437 
     </entry>
421 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
438 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Chat.java">
422 439 
       <provider selected="true" editor-type-id="text-editor">
423 
-        <state>
424 
-          <caret column="17" selection-start-column="17" selection-end-column="17" />
440 
+        <state relative-caret-position="75">
441 
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
442 
+          <folding>
443 
+            <element signature="imports" expanded="true" />
444 
+          </folding>
425 445 
         </state>
426 446 
       </provider>
427 447 
     </entry>
428 
-    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
448 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Message.java">
429 449 
       <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" />
450 
+        <state relative-caret-position="60">
451 
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
432 452 
         </state>
433 453 
       </provider>
434 454 
     </entry>
435 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
455 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
456 
+      <provider selected="true" editor-type-id="text-editor">
457 
+        <state relative-caret-position="30">
458 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
459 
+        </state>
460 
+      </provider>
461 
+    </entry>
462 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageRepository.java">
436 463 
       <provider selected="true" editor-type-id="text-editor">
437 464 
         <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" />
465 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
466 
+          <folding>
467 
+            <element signature="imports" expanded="true" />
468 
+          </folding>
439 469 
         </state>
440 470 
       </provider>
441 471 
     </entry>
442 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
472 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatRepository.java">
443 473 
       <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" />
474 
+        <state relative-caret-position="90">
475 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
446 476 
           <folding>
447 477 
             <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 478 
           </folding>
456 479 
         </state>
457 480 
       </provider>
458 481 
     </entry>
459 
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
482 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
460 483 
       <provider selected="true" editor-type-id="text-editor">
461 
-        <state>
462 
-          <caret column="46" selection-start-column="46" selection-end-column="46" />
484 
+        <state relative-caret-position="30">
485 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
486 
+        </state>
487 
+      </provider>
488 
+    </entry>
489 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
490 
+      <provider selected="true" editor-type-id="text-editor">
491 
+        <state relative-caret-position="30">
492 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
493 
+        </state>
494 
+      </provider>
495 
+    </entry>
496 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Controller.java">
497 
+      <provider selected="true" editor-type-id="text-editor">
498 
+        <state relative-caret-position="30">
499 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
500 
+        </state>
501 
+      </provider>
502 
+    </entry>
503 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.java">
504 
+      <provider selected="true" editor-type-id="text-editor">
505 
+        <state relative-caret-position="240">
506 
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
463 507 
           <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" />
508 
+            <element signature="e#226#227#0" expanded="true" />
509 
+            <element signature="e#261#262#0" expanded="true" />
470 510 
           </folding>
471 511 
         </state>
472 512 
       </provider>
473 513 
     </entry>
474 
-    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
514 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
475 515 
       <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" />
516 
+        <state relative-caret-position="450">
517 
+          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
478 518 
         </state>
479 519 
       </provider>
480 520 
     </entry>
481 
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
521 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Message.java">
522 
+      <provider selected="true" editor-type-id="text-editor">
523 
+        <state relative-caret-position="90">
524 
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
525 
+        </state>
526 
+      </provider>
527 
+    </entry>
528 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.java">
482 529 
       <provider selected="true" editor-type-id="text-editor">
483 530 
         <state>
484 
-          <caret column="46" selection-start-column="46" selection-end-column="46" />
531 
+          <caret column="27" selection-start-column="27" selection-end-column="27" />
485 532 
           <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 533 
             <element signature="e#226#227#0" expanded="true" />
491 
-            <element signature="e#252#253#0" expanded="true" />
534 
+            <element signature="e#261#262#0" expanded="true" />
492 535 
           </folding>
493 536 
         </state>
494 537 
       </provider>
495 538 
     </entry>
496 
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
539 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
497 540 
       <provider selected="true" editor-type-id="text-editor">
498 541 
         <state>
499 
-          <caret column="49" selection-start-column="49" selection-end-column="49" />
542 
+          <caret column="30" selection-start-column="30" selection-end-column="30" />
543 
+        </state>
544 
+      </provider>
545 
+    </entry>
546 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
547 
+      <provider selected="true" editor-type-id="text-editor">
548 
+        <state>
549 
+          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
550 
+        </state>
551 
+      </provider>
552 
+    </entry>
553 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
554 
+      <provider selected="true" editor-type-id="text-editor">
555 
+        <state>
556 
+          <caret column="17" selection-start-column="17" selection-end-column="17" />
557 
+        </state>
558 
+      </provider>
559 
+    </entry>
560 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Chat.java">
561 
+      <provider selected="true" editor-type-id="text-editor">
562 
+        <state relative-caret-position="135">
563 
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
500 564 
           <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" />
565 
+            <element signature="imports" expanded="true" />
507 566 
           </folding>
508 567 
         </state>
509 568 
       </provider>
510 569 
     </entry>
511 
-    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
570 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserRepository.java">
512 571 
       <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" />
572 
+        <state relative-caret-position="135">
573 
+          <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
574 
+          <folding>
575 
+            <element signature="imports" expanded="true" />
576 
+          </folding>
515 577 
         </state>
516 578 
       </provider>
517 579 
     </entry>
518 
-    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
580 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Chat.java">
519 581 
       <provider selected="true" editor-type-id="text-editor">
520 582 
         <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" />
583 
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
584 
+          <folding>
585 
+            <element signature="imports" expanded="true" />
586 
+          </folding>
522 587 
         </state>
523 588 
       </provider>
524 589 
     </entry>
525 
-    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
590 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
526 591 
       <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" />
592 
+        <state relative-caret-position="30">
593 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
594 
+        </state>
595 
+      </provider>
596 
+    </entry>
597 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatRepository.java">
598 
+      <provider selected="true" editor-type-id="text-editor">
599 
+        <state relative-caret-position="60">
600 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
601 
+          <folding>
602 
+            <element signature="imports" expanded="true" />
603 
+          </folding>
604 
+        </state>
605 
+      </provider>
606 
+    </entry>
607 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Controller.java">
608 
+      <provider selected="true" editor-type-id="text-editor">
609 
+        <state relative-caret-position="30">
610 
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
611 
+        </state>
612 
+      </provider>
613 
+    </entry>
614 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
615 
+      <provider selected="true" editor-type-id="text-editor">
616 
+        <state relative-caret-position="30">
617 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
618 
+        </state>
619 
+      </provider>
620 
+    </entry>
621 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
622 
+      <provider selected="true" editor-type-id="text-editor">
623 
+        <state relative-caret-position="30">
624 
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
625 
+        </state>
626 
+      </provider>
627 
+    </entry>
628 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageRepository.java">
629 
+      <provider selected="true" editor-type-id="text-editor">
630 
+        <state relative-caret-position="60">
631 
+          <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
632 
+          <folding>
633 
+            <element signature="imports" expanded="true" />
634 
+          </folding>
635 
+        </state>
636 
+      </provider>
637 
+    </entry>
638 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.java">
639 
+      <provider selected="true" editor-type-id="text-editor">
640 
+        <state relative-caret-position="210">
641 
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
642 
+          <folding>
643 
+            <element signature="e#226#227#0" expanded="true" />
644 
+            <element signature="e#261#262#0" expanded="true" />
645 
+          </folding>
529 646 
         </state>
530 647 
       </provider>
531 648 
     </entry>
532 649 
     <entry file="file://$PROJECT_DIR$/pom.xml">
533 650 
       <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" />
651 
+        <state relative-caret-position="720">
652 
+          <caret line="48" selection-start-line="48" selection-end-line="48" />
653 
+        </state>
654 
+      </provider>
655 
+    </entry>
656 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Message.java">
657 
+      <provider selected="true" editor-type-id="text-editor">
658 
+        <state relative-caret-position="60">
659 
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
660 
+        </state>
661 
+      </provider>
662 
+    </entry>
663 
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
664 
+      <provider selected="true" editor-type-id="text-editor">
665 
+        <state relative-caret-position="150">
666 
+          <caret line="10" column="50" lean-forward="true" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
667 
+          <folding>
668 
+            <element signature="imports" expanded="true" />
669 
+          </folding>
536 670 
         </state>
537 671 
       </provider>
538 672 
     </entry>
 
@@ -576,7 +710,7 @@
576 710 
       </state>
577 711 
       <state key="JdkListConfigurable.UI">
578 712 
         <settings>
579 
-          <last-edited>10</last-edited>
713 
+          <last-edited>1.8</last-edited>
580 714 
           <splitter-proportions>
581 715 
             <option name="proportions">
582 716 
               <list>
 
@@ -593,7 +727,6 @@
593 727 
             <option name="proportions">
594 728 
               <list>
595 729 
                 <option value="0.2" />
596 
-                <option value="0.6" />
597 730 
               </list>
598 731 
             </option>
599 732 
           </splitter-proportions>
 
@@ -613,6 +746,7 @@
613 746 
       </state>
614 747 
       <state key="ProjectLibrariesConfigurable.UI">
615 748 
         <settings>
749 
+          <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited>
616 750 
           <splitter-proportions>
617 751 
             <option name="proportions">
618 752 
               <list>

+ 0
- 55
ZipTeamOrange/src/main/java/User.java Näytä tiedosto 

@@ -1,55 +0,0 @@
1 
-public class User {
2 
-    private int userId;
3 
-    private String name;
4 
-    private String email;
5 
-    private String password;
6 
-    private String picture;
7 
-
8 
-    public User(){
9 
-
10 
-    }
11 
-
12 
-    public User(String name, String email, String password){
13 
-        this.name = name;
14 
-        this.email = email;
15 
-        this.password = password;
16 
-    }
17 
-
18 
-    public User(int userId, String name, String email, String password){
19 
-        this.userId = userId;
20 
-        this.name = name;
21 
-        this.email = email;
22 
-        this.password = password;
23 
-    }
24 
-
25 
-    public User(int userId, String name, String email, String password, String picture){
26 
-        this.userId = userId;
27 
-        this.name = name;
28 
-        this.email = email;
29 
-        this.password = password;
30 
-        this.picture = picture;
31 
-    }
32 
-
33 
-
34 
-    public int getUserId() {
35 
-        return userId;
36 
-    }
37 
-
38 
-    public String getName() {
39 
-        return name;
40 
-    }
41 
-
42 
-    public String getEmail() {
43 
-        return email;
44 
-    }
45 
-
46 
-    public String getPassword() {
47 
-        return password;
48 
-    }
49 
-
50 
-    public String getPicture() {
51 
-        return picture;
52 
-    }
53 
-
54 
-
55 
-}

ZipTeamOrange/src/main/java/Chat.java → ZipTeamOrange/src/main/java/com/zipteam/Chat.java Näytä tiedosto 

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

ZipTeamOrange/src/main/java/ChatController.java → ZipTeamOrange/src/main/java/com/zipteam/ChatController.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 public class ChatController extends Controller{
2 4
3 5 
     private Chat chat;

ZipTeamOrange/src/main/java/ChatRepository.java → ZipTeamOrange/src/main/java/com/zipteam/ChatRepository.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 import org.springframework.data.jpa.repository.JpaRepository;
2 4
3 5 
 import java.util.List;

ZipTeamOrange/src/main/java/Controller.java → ZipTeamOrange/src/main/java/com/zipteam/Controller.java Näytä tiedosto 

@@ -1,4 +1,4 @@
1 
-
1 
+package com.zipteam;
2 2
3 3 
 public abstract class Controller {
4 4

ZipTeamOrange/src/main/java/Main.java → ZipTeamOrange/src/main/java/com/zipteam/Main.java Näytä tiedosto 

@@ -1,2 +1,4 @@
1 
+package com.zipteam;
2 
+
1 3 
 public class Main {
2 4 
 }

ZipTeamOrange/src/main/java/Message.java → ZipTeamOrange/src/main/java/com/zipteam/Message.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 import java.util.Date;
2 4
3 5 
 public class Message {

ZipTeamOrange/src/main/java/MessageController.java → ZipTeamOrange/src/main/java/com/zipteam/MessageController.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 public class MessageController extends Controller{
2 4
3 5 
     private Message message;

ZipTeamOrange/src/main/java/MessageRepository.java → ZipTeamOrange/src/main/java/com/zipteam/MessageRepository.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 import org.springframework.data.jpa.repository.JpaRepository;
2 4
3 5 
 import java.util.List;

+ 72
- 0
ZipTeamOrange/src/main/java/com/zipteam/User.java Näytä tiedosto 

@@ -0,0 +1,72 @@
1 
+package com.zipteam;
2 
+
3 
+import javax.persistence.Entity;
4 
+import javax.persistence.GeneratedValue;
5 
+import javax.persistence.GenerationType;
6 
+import javax.persistence.Id;
7 
+
8 
+@Entity
9 
+public class User {
10 
+    @Id
11 
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
12 
+    private int userId;
13 
+
14 
+    private String name;
15 
+    private String email;
16 
+    private String password;
17 
+    private String picture;
18 
+
19 
+    public User(){ }
20 
+
21 
+    public User(String name, String email, String password){
22 
+        this.name = name;
23 
+        this.email = email;
24 
+        this.password = password;
25 
+    }
26 
+
27 
+//    public User(int userId, String name, String email, String password){
28 
+//        this.userId = userId;
29 
+//        this.name = name;
30 
+//        this.email = email;
31 
+//        this.password = password;
32 
+//    }
33 
+//
34 
+//    public User(int userId, String name, String email, String password, String picture){
35 
+//        this.userId = userId;
36 
+//        this.name = name;
37 
+//        this.email = email;
38 
+//        this.password = password;
39 
+//        this.picture = picture;
40 
+//    }
41 
+
42 
+
43 
+    public int getUserId() {
44 
+        return userId;
45 
+    }
46 
+
47 
+    public String getName() {
48 
+        return name;
49 
+    }
50 
+
51 
+    public String getEmail() {
52 
+        return email;
53 
+    }
54 
+
55 
+    public String getPassword() {
56 
+        return password;
57 
+    }
58 
+
59 
+    public String getPicture() {
60 
+        return picture;
61 
+    }
62 
+
63 
+    @Override
64 
+    public String toString() {
65 
+        return "User{" +
66 
+                "id=" + userId +
67 
+                ", name='" + name + '\'' +
68 
+                '}';
69 
+    }
70 
+
71 
+
72 
+}

ZipTeamOrange/src/main/java/UserController.java → ZipTeamOrange/src/main/java/com/zipteam/UserController.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 public class UserController extends Controller{
2 4
3 5 
     private User user;

ZipTeamOrange/src/main/java/UserRepository.java → ZipTeamOrange/src/main/java/com/zipteam/UserRepository.java Näytä tiedosto 

@@ -1,3 +1,5 @@
1 
+package com.zipteam;
2 
+
1 3 
 import org.springframework.data.jpa.repository.JpaRepository;
2 4
3 5 
 import java.util.List;