13-15

1 files changed, 20 insertions, 2 deletions

diff --git a/src/main/java/space/m0e/quga/oop/lab56maven/Main.java b/src/main/java/space/m0e/quga/oop/lab56maven/Main.java
index ae203eb..9aa199b 100644
--- a/src/main/java/space/m0e/quga/oop/lab56maven/Main.java
+++ b/src/main/java/space/m0e/quga/oop/lab56maven/Main.java
@@ -12,6 +12,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import  space.m0e.quga.oop.lab56maven.dialogs.InsertDialog;
+import space.m0e.quga.oop.lab56maven.dialogs.SearchDialog;
 import  space.m0e.quga.oop.lab56maven.entities.common.Ability;
 import  space.m0e.quga.oop.lab56maven.entities.macro.Fortress;
 import  space.m0e.quga.oop.lab56maven.entities.macro.ThroneRoom;
@@ -99,8 +100,12 @@ public class Main extends Application {
                     });
                 }
 
-                case M -> {
-
+                case F -> {
+                    try {
+                        SearchDialog.display();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 }
 
                 case TAB -> {
@@ -112,6 +117,19 @@ public class Main extends Application {
                 }
             }
         });
+
+        root.setOnMouseClicked(event -> {
+            switch (event.getButton()) {
+                case SECONDARY -> {
+                    String result = Immigrant.findImmigrants(immigrant -> fortresses.stream().noneMatch(fortress1 -> fortress1.getDwarves().contains(immigrant)));
+                    Alert alert = new Alert(Alert.AlertType.INFORMATION);
+                    alert.setTitle("Search result");
+                    alert.setContentText(result);
+                    alert.setHeaderText("Dwarves outside MacroObjects:");
+                    alert.showAndWait();
+                }
+            }
+        });
         stage.setTitle("Hello!");
         stage.setScene(scene);
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);