programming/lab5 updates

Author: NF-coder

programming/sem2/lab5/src/Main.java

@@ -1,8 +1,10 @@
-import textWorkers.Invokers.CLInvoker;
+import core.Engine;
+import textWorkers.invokers.CLInvoker;
 
 public class Main {
     public static void main(String[] args) {
-        CLInvoker invoker = new CLInvoker();
-        invoker.mainCycle();
+        Engine engine = new Engine();
+        Engine.setActiveInvoker(new CLInvoker());
+        engine.start();
     }
 }

programming/sem2/lab5/src/commands/Add.java

@@ -3,16 +3,10 @@
 import java.util.ArrayDeque;
 import java.util.HashMap;
 
-import commands.converters.Converters;
-import commands.parsers.AdditionalParsers;
-import commands.parsers.EnumsParser;
 import exceptions.UnacceptableValue;
-import objects.enums.Climate;
-import objects.enums.Government;
-import objects.enums.StandardOfLiving;
 import commands.utils.AddUtils;
 import objects.City;
-import workers.Reciver;
+import core.Structure;
 
 public class Add extends BasicCommand{
     public Add(){
@@ -22,24 +16,18 @@ public Add(){
     }
 
     public final void execute(HashMap<String, String> args){
-        Reciver reciver = new Reciver();
-        ArrayDeque<City> allEntitys = reciver.getAllEntities();
-
+        Structure structure = new Structure();
+        ArrayDeque<City> allEntities = structure.getAllEntities();
         try {
             City city = new City(
-                    AddUtils.findFreeId(allEntitys),
+                    AddUtils.findFreeId(allEntities),
                     args.get("name"),
-                    AdditionalParsers.parseCoordinates(),
                     AddUtils.generateLocalDateTime(),
-                    Converters.StringToPrimitiveDouble(args.get("area")),
-                    Converters.StringToPrimitiveLong(args.get("population")),
-                    Converters.StringToPrimitiveFloat(args.get("metersAboveSeaLevel")),
-                    EnumsParser.parse(Climate.class, "тип климата"),
-                    EnumsParser.parse(Government.class, "тип правительства"),
-                    EnumsParser.parse(StandardOfLiving.class, "стандарт качества жизни"),
-                    AdditionalParsers.parseHuman()
+                    args.get("area"),
+                    args.get("population"),
+                    args.get("metersAboveSeaLevel")
             );
-            reciver.addEntity(
+            structure.addEntity(
                     city
             );
         }

programming/sem2/lab5/src/commands/AverageOfMetersAboveSeaLevel.java

@@ -0,0 +1,16 @@
+package commands;
+
+import core.Structure;
+
+import java.util.HashMap;
+
+public class AverageOfMetersAboveSeaLevel extends BasicCommand{
+    public AverageOfMetersAboveSeaLevel(){
+        super("average_of_meters_above_sea_level", "Выводит среднюю высоту над уровнем моря");
+    }
+
+    public final void execute(HashMap<String, String> args){
+        Structure structure = new Structure();
+        System.out.println(structure.averageOfMetersAboveSeaLevel());
+    }
+}

programming/sem2/lab5/src/commands/Clear.java

@@ -1,7 +1,6 @@
 package commands;
 
-import workers.Engine;
-import workers.Reciver;
+import core.Structure;
 
 import java.util.HashMap;
 
@@ -11,8 +10,8 @@ public Clear(){
     }
 
     public final void execute(HashMap<String, String> args){
-        Reciver reciver = new Reciver();
-        reciver.clearCollection();
+        Structure structure = new Structure();
+        structure.clearCollection();
         System.out.println("Success");
     }
 }

programming/sem2/lab5/src/commands/Execute.java

@@ -1,18 +1,30 @@
 package commands;
 
+import core.Engine;
 import exceptions.FileProcessorException;
-import textWorkers.Invokers.FileInvoker;
+import textWorkers.invokers.CLInvoker;
+import textWorkers.invokers.FileInvoker;
 
 import java.util.HashMap;
 
 public class Execute extends BasicCommand {
     public Execute() {
         super("execute_script", "Takes commands from file." +
-                "\n\t Example: execute_script -filename [String]");
+                "\n\t Example: execute_script -abspath [String]");
     }
 
-    public final void execute(HashMap<String, String> args) {
-        FileInvoker invoker = new FileInvoker();
-        invoker.mainCycle();
+    public final void execute(HashMap<String, String> args){
+        try {
+            Engine.setActiveInvoker(new FileInvoker(args.get("abspath")));
+            new Engine().start();
+
+        }
+        catch (FileProcessorException exc){
+            System.out.print("fpe ");
+            System.out.println(exc);
+        }
+        finally {
+            Engine.setActiveInvoker(new CLInvoker());
+        }
     }
 }

programming/sem2/lab5/src/commands/Exit.java

@@ -1,7 +1,5 @@
 package commands;
 
-import workers.Engine;
-
 import java.util.HashMap;
 
 public class Exit extends BasicCommand{

programming/sem2/lab5/src/commands/FilterStartsWithName.java

@@ -0,0 +1,22 @@
+package commands;
+
+import core.Structure;
+import objects.City;
+
+import java.util.HashMap;
+
+public class FilterStartsWithName extends BasicCommand{
+    public FilterStartsWithName(){
+        super("filter_starts_with_name", "Выводит элементы, значение поля name которых начинается с заданной подстроки"  +
+                "\n\t Example: filter_starts_with_name -name [String]");
+    }
+
+    public final void execute(HashMap<String, String> args){
+        Structure structure = new Structure();
+        for (City elem: structure.getAllEntities()){
+            if (elem.getName().indexOf(args.get("name")) == 0) {
+                System.out.println(elem);
+            }
+        }
+    }
+}

programming/sem2/lab5/src/commands/Help.java

@@ -2,10 +2,7 @@
 
 import java.util.HashMap;
 
-import commands.BasicCommand;
-
-import commands.Info;
-import workers.Engine;
+import core.Engine;
 
 public class Help extends BasicCommand{
     public Help(){

programming/sem2/lab5/src/commands/Info.java

@@ -1,6 +1,6 @@
 package commands;
 
-import workers.Reciver;
+import core.Structure;
 
 import java.util.HashMap;
 
@@ -10,7 +10,7 @@ public Info(){
     }
 
     public final void execute(HashMap<String, String> args){
-        Reciver reciver = new Reciver();
-        System.out.println(reciver);
+        Structure structure = new Structure();
+        System.out.println(structure);
     }
 }

programming/sem2/lab5/src/commands/RemoveAllByStandardOfLiving.java

@@ -0,0 +1,19 @@
+package commands;
+
+import core.Structure;
+
+import java.util.HashMap;
+
+public class RemoveAllByStandardOfLiving extends BasicCommand{
+    public RemoveAllByStandardOfLiving(){
+        super("remove_all_by_standard_of_living", "Удаляет все элементы с заданным качеством жизни"  +
+                "\n\t Example: remove_all_by_standard_of_living -standardOfLiving [String]");
+    }
+
+    public final void execute(HashMap<String, String> args){
+        Structure structure = new Structure();
+        structure.removeAllByStandardOfLiving(
+                args.get("standardOfLiving")
+        );
+    }
+}