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 2932707..1236c5a 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -195,7 +195,7 @@ public class Finder extends GFinder
    */
   boolean getFocusedViewport()
   {
-    if (focusfixed || Desktop.getDesktopPane() == null)
+    if (focusFixed || Desktop.getDesktopPane() == null)
     {
       if (ap != null && av != null)
       {
@@ -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",