lab7

Author: NF-coder

programming/sem2/lab5_v2/client/pom.xml

@@ -17,6 +17,13 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.openjfx/javafx -->
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx</artifactId>
+            <version>17</version>
+            <type>pom</type>
+        </dependency>
     </dependencies>
 
     <artifactId>client</artifactId>
@@ -31,6 +38,14 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <configuration>
+                    <mainClass>ui.RegisterLayout</mainClass>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

programming/sem2/lab5_v2/client/src/commands/implementations/RemoveAllByStandardOfLiving.java

@@ -0,0 +1,26 @@
+package commands.implementations;
+
+import commands.BasicCommand;
+import core.Engine;
+
+import java.util.HashMap;
+import java.util.function.Consumer;
+
+public class RemoveAllByStandardOfLiving extends BasicCommand {
+    public RemoveAllByStandardOfLiving(Consumer<HashMap<String,String>> outHandler){
+        super("remove_all_by_standard_of_living", "Removes all cities with specified standard of life", outHandler);
+    }
+
+    @Override
+    public final void execute(HashMap<String, String> args, Engine engine) throws Exception{
+        engine.networkManager.send(
+                new shared.objects.NetworkRequestDTO(
+                        "remove_all_by_standard_of_living",
+                        args
+                )
+        );
+        this.getOutHandler().accept(
+                engine.networkManager.receive().result()
+        );
+    }
+}

…t/src/commands/implementations/Save.java …commands/implementations/RemoveById.javaprogramming/sem2/lab5_v2/client/src/commands/implementations/Save.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/RemoveById.java programming/sem2/lab5_v2/client/src/commands/implementations/Save.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/RemoveById.java

@@ -1,27 +1,27 @@
 package commands.implementations;
 
+
 import commands.BasicCommand;
 import core.Engine;
-import shared.objects.NetworkRequestDTO;
 
 import java.util.HashMap;
 import java.util.function.Consumer;
 
-public class Save extends BasicCommand {
-    public Save(Consumer<HashMap<String,String>> outHandler){
-        super("save", "saves collection to CSV file.", outHandler);
+public class RemoveById extends BasicCommand {
+    public RemoveById(Consumer<HashMap<String,String>> outHandler){
+        super("remove_by_id", "Clears all information about collection.", outHandler);
     }
 
     @Override
     public final void execute(HashMap<String, String> args, Engine engine) throws Exception{
         engine.networkManager.send(
-                new NetworkRequestDTO(
-                        "save",
+                new shared.objects.NetworkRequestDTO(
+                        "remove_by_id",
                         args
                 )
         );
         this.getOutHandler().accept(
                 engine.networkManager.receive().result()
         );
     }
-}
+}

…t/src/commands/implementations/Load.java …ommands/implementations/RemoveFirst.javaprogramming/sem2/lab5_v2/client/src/commands/implementations/Load.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/RemoveFirst.java programming/sem2/lab5_v2/client/src/commands/implementations/Load.java renamed to programming/sem2/lab5_v2/client/src/commands/implementations/RemoveFirst.java

@@ -2,21 +2,20 @@
 
 import commands.BasicCommand;
 import core.Engine;
-import shared.objects.NetworkRequestDTO;
 
 import java.util.HashMap;
 import java.util.function.Consumer;
 
-public class Load extends BasicCommand {
-    public Load(Consumer<HashMap<String,String>> outHandler){
-        super("load", "loads collection from CSV file.", outHandler);
+public class RemoveFirst extends BasicCommand {
+    public RemoveFirst(Consumer<HashMap<String,String>> outHandler){
+        super("remove_first", "Removes first element from collection.", outHandler);
     }
 
     @Override
     public final void execute(HashMap<String, String> args, Engine engine) throws Exception{
         engine.networkManager.send(
-                new NetworkRequestDTO(
-                        "load",
+                new shared.objects.NetworkRequestDTO(
+                        "remove_first",
                         args
                 )
         );

programming/sem2/lab5_v2/client/src/core/Engine.java

@@ -26,10 +26,10 @@ public final class Engine {
     private final BasicCommand[] commands = {
             new Help(printer), new Add(printer), new Info(printer),
             new Clear(printer), new Exit(), new Show(printer),
-            new Update(printer), new Execute(printer), new Save(printer),
+            new Update(printer), new Execute(printer),
             new AvgOfMetersAboveSea(printer), new FilterStartsWithName(printer),
-            new AddIfMax(printer), new RemoveGreater(printer), new Load(printer),
-            new Register(printer)
+            new AddIfMax(printer), new RemoveGreater(printer), new RemoveById(printer),
+            new Register(printer), new RemoveFirst(printer), new RemoveAllByStandardOfLiving(printer)
     };
 
     private final HashMap<String, BasicCommand> commandsHashMap = new HashMap<>();
@@ -77,6 +77,8 @@ public BasicCommand[] getCommands() {
      * @param args аргументы команды
      */
     public void runCommand(String commandName, HashMap<String, String> args) {
+        if (commandName.isEmpty()) return;
+
         BasicCommand command = this.commandsHashMap.get(commandName);
 
         if (command == null) {

programming/sem2/lab5_v2/client/src/script

@@ -1,3 +1,5 @@
+register -login 1 -password 2
+
 add -name city1 -area 100 -population 1000 -metersAboveSeaLevel 0 -login 1 -password 2
 2
 2
@@ -7,4 +9,8 @@ test name
 01.01.1971
 OCEANIC
 JUNTA
-HIGH
+HIGH
+
+show -login 1 -password 2
+
+remove_first -login 1 -password 2