Merge branch 'develop' into features/JAL-2446NCList

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

diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java
index 25ee7d2..191f6e8 100644 (file)
--- a/src/jalview/analysis/Finder.java
+++ b/src/jalview/analysis/Finder.java
@@ -207,9 +207,8 @@ public class Finder
         {
           resIndex = regex.matchedFrom();
 
-          if ((selection != null && selection.getSize() > 0)
-                  && (resIndex + spaces.get(resIndex) < selection
-                          .getStartRes()))
+          if ((selection != null && selection.getSize() > 0) && (resIndex
+                  + spaces.get(resIndex) < selection.getStartRes()))
           {
             continue;
           }
@@ -218,9 +217,9 @@ public class Finder
           int eres = seq.findPosition(regex.matchedTo() - 1
                   + (spaces.get(regex.matchedTo() - 1)));
           // only add result if not contained in previous result
-          if (lastm == null
-                  || (lastm.getSequence() != seq || (!(lastm.getStart() <= sres && lastm
-                          .getEnd() >= eres))))
+          if (lastm == null || (lastm.getSequence() != seq
+                  || (!(lastm.getStart() <= sres
+                          && lastm.getEnd() >= eres))))
           {
             lastm = searchResults.addResult(seq, sres, eres);
           }