From effdf27e7799d6fba06969311fb85e871dff0e26 Mon Sep 17 00:00:00 2001
From: Unknown <marcel.lange@haw-hamburg.de>
Date: Tue, 14 Nov 2017 15:09:46 +0100
Subject: [PATCH] Neue Befehle

Befehle werden jetzt mit $COMMANDLIST ausgegeben
---
 .idea/workspace.xml            | 62 +++++++++++++++++++++++++++++-----
 src/Server/AccountHandler.java |  2 +-
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a8d6b1..42ff6a1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="6dee44cd-f2ba-4a3d-b786-4b9b5703680b" name="Default" comment="" />
+    <list default="true" id="6dee44cd-f2ba-4a3d-b786-4b9b5703680b" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Server/AccountHandler.java" afterPath="$PROJECT_DIR$/src/Server/AccountHandler.java" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -12,11 +15,31 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="Server.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Server.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Server/Server.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+            <state relative-caret-position="-289">
+              <caret line="10" column="7" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ChatRoom.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Server/ChatRoom.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-187">
+              <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccountHandler.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Server/AccountHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-867">
+              <caret line="50" column="148" lean-forward="false" selection-start-line="50" selection-start-column="148" selection-end-line="50" selection-end-column="148" />
               <folding />
             </state>
           </provider>
@@ -32,6 +55,13 @@
       <projects_view />
     </option>
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/Server/AccountHandler.java" />
+      </list>
+    </option>
+  </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsGulpfileManager">
@@ -249,12 +279,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1510667284836</updated>
-      <workItem from="1510667287155" duration="97000" />
+      <workItem from="1510667287155" duration="938000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="97000" />
+    <option name="totallyTimeSpent" value="938000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -310,8 +340,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Server/Server.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="20" column="7" lean-forward="true" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+        <state relative-caret-position="-289">
+          <caret line="10" column="7" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Server/ChatRoom.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-187">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Server/AccountHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-867">
+          <caret line="50" column="148" lean-forward="false" selection-start-line="50" selection-start-column="148" selection-end-line="50" selection-end-column="148" />
           <folding />
         </state>
       </provider>
diff --git a/src/Server/AccountHandler.java b/src/Server/AccountHandler.java
index ab9fb57..ec5f5b4 100644
--- a/src/Server/AccountHandler.java
+++ b/src/Server/AccountHandler.java
@@ -48,7 +48,7 @@ public class AccountHandler implements Runnable {
     /**
      * List of chatrooms
      */
-    private String commands = "COMMANDLIST:\n$COMMANDLIST\n$DISCONNECT\n$USERLIST\n$ROOMLIST\n$ROOMJOIN<!>CHATROOM";
+    private String commands = "COMMANDLIST:\n$COMMANDLIST\n$DISCONNECT\n$USERLIST\n$ROOMLIST\n$ROOMJOIN<!>CHATROOM\n$CURRENTROOM\n$SETNAME<!>newname";
 
 
     /**