Changeset 1102 for trunk/src/org/expeditee/agents/SearchAgent.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/agents/SearchAgent.java (modified) (4 diffs)

trunk/src/org/expeditee/agents/SearchAgent.java

@@ -21 +21 @@
 import java.util.Collection;
 
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameCreator;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.io.Conversion;
@@ -126 +126 @@
         }
 
-        public static boolean searchFrame(FrameCreator results, String frameName,
-                        String pattern, String replacementString) {
-                int oldMode = FrameGraphics.getMode();
-                FrameGraphics.forceXRayMode(false);
+        public static boolean searchFrame(FrameCreator results, String frameName, String pattern, String replacementString)
+        {
+                boolean wasXrayMode = DisplayController.isXRayMode();
+                if (!wasXrayMode) DisplayController.ToggleXRayMode();
                 Frame frameToSearch = FrameIO.LoadFrame(frameName);
-                FrameGraphics.setMode(oldMode, false);
+                if (!wasXrayMode) DisplayController.ToggleXRayMode();
                 if (frameToSearch == null)
                         return false;
@@ -142 +142 @@
                         }
                 }
-                FrameGraphics.requestRefresh(true);
+                DisplayController.requestRefresh(true);
                 FrameIO.SaveFrame(frameToSearch, false);
                 return true;
@@ -177 +177 @@
                                 _results.addText(surrogate.toString(), null,
                                                 frameName, null, false);
-                                FrameGraphics.requestRefresh(true);
+                                DisplayController.requestRefresh(true);
                         }
                 }