From 666d9b712870398092bb010a8c4a4d9889ab6080 Mon Sep 17 00:00:00 2001
From: Alex_D <shram.monolit@mail.ru>
Date: Mon, 20 Mar 2023 21:33:46 +0300
Subject: [PATCH] Fixed EOF (ctrl + D)

---
 .idea/workspace.xml                           | 85 +++++++++++--------
 src/main/java/client/ui/ConsoleUI.java        |  5 +-
 .../java/server/services/CommandExecutor.java |  2 +
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e527be4..7403a2f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6ea2767c-74c4-4051-9819-b05d03d800e2" name="Changes" comment="Added checkid from csv file.">
+    <list default="true" id="6ea2767c-74c4-4051-9819-b05d03d800e2" name="Changes" comment="Added UML and small fix of UI">
+      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/intellij-javadocs-4.0.1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/server/controller/HumanControllerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/server/controller/HumanControllerImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/server/dao/HumanDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/server/dao/HumanDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/server/db/DataBaseProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/server/db/DataBaseProvider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/client/ui/ConsoleUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/client/ui/ConsoleUI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/server/services/CommandExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/server/services/CommandExecutor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/server/validation/Validation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/server/validation/Validation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/database.csv" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/database.csv" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,24 +42,24 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;E:/code/user_app&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "E:/code/lab-5-num-125595/src/main/resources",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="E:\code\lab-5-num-125595\src\main\resources" />
@@ -72,6 +71,7 @@
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="App" />
       <module name="lab-5-num-125595" />
+      <option name="PROGRAM_PARAMETERS" value="~/src/main/resources/database.csv" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -102,6 +102,11 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <list>
+      <item itemvalue="Application.App" />
+      <item itemvalue="Application.Parser" />
+      <item itemvalue="Application.ScriptExecuter" />
+    </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.App" />
@@ -149,13 +154,6 @@
       <workItem from="1679235987708" duration="9198000" />
       <workItem from="1679314120520" duration="11021000" />
     </task>
-    <task id="LOCAL-00013" summary="Colorful output of HumanBeing">
-      <created>1676401780823</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1676401780823</updated>
-    </task>
     <task id="LOCAL-00014" summary="Added remove_by_id method. Catched some exceptions">
       <created>1676412932800</created>
       <option name="number" value="00014" />
@@ -492,7 +490,14 @@
       <option name="project" value="LOCAL" />
       <updated>1679327290349</updated>
     </task>
-    <option name="localTasksCounter" value="62" />
+    <task id="LOCAL-00062" summary="Added UML and small fix of UI">
+      <created>1679329415417</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1679329415417</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -503,7 +508,19 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="master" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
           </value>
         </entry>
       </map>
@@ -511,7 +528,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Car class changed" />
     <MESSAGE value="workspace.xml" />
     <MESSAGE value="Saving to CSV fix" />
     <MESSAGE value="Small visual fixes" />
@@ -536,6 +552,7 @@
     <MESSAGE value="Removed javadoc" />
     <MESSAGE value="Made tilda resolving in path" />
     <MESSAGE value="Added checkid from csv file." />
-    <option name="LAST_COMMIT_MESSAGE" value="Added checkid from csv file." />
+    <MESSAGE value="Added UML and small fix of UI" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added UML and small fix of UI" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/client/ui/ConsoleUI.java b/src/main/java/client/ui/ConsoleUI.java
index 020c7e0..ab94250 100644
--- a/src/main/java/client/ui/ConsoleUI.java
+++ b/src/main/java/client/ui/ConsoleUI.java
@@ -1,5 +1,6 @@
 package client.ui;
 
+import server.exception.CommandException;
 import server.services.BuilderType;
 import server.services.CommandExecutor;
 
@@ -8,6 +9,8 @@
 import java.io.InputStreamReader;
 import java.util.Objects;
 
+import static client.ui.ConsoleColors.error;
+
 /**
  * The type Console ui.
  */
@@ -34,7 +37,7 @@ public void start() {
         String command;
 
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
-            while (!Objects.equals(command = reader.readLine(), "exit")) {
+            while (!Objects.equals(command = reader.readLine(), "exit") && !Objects.equals(command, null)) {
                 executor.executeCommand(command, reader, null, BuilderType.CMD);
             }
         } catch (IOException e) {
diff --git a/src/main/java/server/services/CommandExecutor.java b/src/main/java/server/services/CommandExecutor.java
index 8ac1ce7..2d87a04 100644
--- a/src/main/java/server/services/CommandExecutor.java
+++ b/src/main/java/server/services/CommandExecutor.java
@@ -4,6 +4,7 @@
 import server.controller.HumanControllerImpl;
 import server.exception.ApplicationException;
 import server.exception.ArgumentException;
+import server.exception.CommandException;
 import server.model.dto.HumanBeingRequestDTO;
 import server.services.builders.HumanBeingRequestDTOBuilder;
 
@@ -80,6 +81,7 @@ private void executeScript(String scriptName, BufferedReader reader) {
     public void executeCommand(String command, BufferedReader reader, BufferedReader reader2, BuilderType builderType) {
         long id;
         try {
+            System.out.println(command);
             String[] compositeCommand = command.split(" ");
             history.addCommandToHistory(compositeCommand[0]);
             if (compositeCommand.length > 1) {