Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / gui / Finder.java

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 93dcadf..1236c5a 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -139,7 +139,7 @@ public class Finder extends GFinder
     {
       title += " " + scope;
     }
-    Desktop.addInternalFrame(frame, title, MY_WIDTH, MY_HEIGHT);
+    Desktop.addInternalFrame(frame, title, Desktop.FRAME_MAKE_VISIBLE, MY_WIDTH, MY_HEIGHT, Desktop.FRAME_ALLOW_RESIZE, Desktop.FRAME_ALLOW_ANY_SIZE);
     frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
     searchBox.getComponent().requestFocus();
   }
@@ -195,7 +195,7 @@ public class Finder extends GFinder
    */
   boolean getFocusedViewport()
   {
-    if (focusFixed || Desktop.desktop == null)
+    if (focusFixed || Desktop.getDesktopPane() == null)
     {
       if (ap != null && av != null)
       {
@@ -207,7 +207,7 @@ public class Finder extends GFinder
     }
     // now checks further down the window stack to fix bug
     // https://mantis.lifesci.dundee.ac.uk/view.php?id=36008
-    JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+    JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames();
     for (int f = 0; f < frames.length; f++)
     {
       JInternalFrame alignFrame = frames[f];
@@ -336,9 +336,8 @@ public class Finder extends GFinder
         {
           if (idMatch.size() > 0 && searchResults.getCount() > 0)
           {
-            message.append(" ").append(
-                    MessageManager.getString("label.and").toLowerCase(Locale.ROOT))
-                    .append(" ");
+            message.append(" ").append(MessageManager.getString("label.and")
+                    .toLowerCase(Locale.ROOT)).append(" ");
           }
           message.append(MessageManager.formatMessage(
                   "label.subsequence_matches_found",