X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcontroller%2FAlignViewController.java;h=24fc18194708981efe7c6d1c19162905308e2743;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=bc7f21269a8e46c0b34ee604a8227ea8509d7a34;hpb=7c70cb09e9de68ab567e38520d6d09f0c17a3939;p=jalview.git

diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java
index bc7f212..24fc181 100644
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@ -85,10 +85,11 @@ public class AlignViewController implements AlignViewControllerI
     SequenceGroup[] gps = null;
     if (sg != null && (cs == null || cs.isEmpty()))
     {
-      gps = jalview.analysis.Grouping.makeGroupsFrom(viewport
-              .getSequenceSelection(), viewport.getAlignmentView(true)
-              .getSequenceStrings(viewport.getGapCharacter()), viewport
-              .getAlignment().getGroups());
+      gps = jalview.analysis.Grouping.makeGroupsFrom(
+              viewport.getSequenceSelection(),
+              viewport.getAlignmentView(true)
+                      .getSequenceStrings(viewport.getGapCharacter()),
+              viewport.getAlignment().getGroups());
     }
     else
     {
@@ -96,8 +97,8 @@ public class AlignViewController implements AlignViewControllerI
       {
         gps = jalview.analysis.Grouping.makeGroupsFromCols(
                 (sg == null) ? viewport.getAlignment().getSequencesArray()
-                        : sg.getSequences().toArray(new SequenceI[0]), cs,
-                viewport.getAlignment().getGroups());
+                        : sg.getSequences().toArray(new SequenceI[0]),
+                cs, viewport.getAlignment().getGroups());
       }
     }
     if (gps != null)
@@ -170,8 +171,9 @@ public class AlignViewController implements AlignViewControllerI
     // JBPNote this routine could also mark rows, not just columns.
     // need a decent query structure to allow all types of feature searches
     BitSet bs = new BitSet();
-    SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null || extendCurrent) ? viewport
-            .getAlignment() : viewport.getSelectionGroup();
+    SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null
+            || extendCurrent) ? viewport.getAlignment()
+                    : viewport.getSelectionGroup();
 
     int nseq = findColumnsWithFeature(featureType, sqcol, bs);
 
@@ -189,14 +191,14 @@ public class AlignViewController implements AlignViewControllerI
       {
         viewport.setColumnSelection(cs);
         alignPanel.paintAlignment(true);
-        int columnCount = invert ? (sqcol.getEndRes() - sqcol.getStartRes() + 1)
-                - bs.cardinality()
+        int columnCount = invert
+                ? (sqcol.getEndRes() - sqcol.getStartRes() + 1)
+                        - bs.cardinality()
                 : bs.cardinality();
         avcg.setStatus(MessageManager.formatMessage(
-                "label.view_controller_toggled_marked",
-                new String[] {
-                    toggle ? MessageManager.getString("label.toggled")
-                            : MessageManager.getString("label.marked"),
+                "label.view_controller_toggled_marked", new String[]
+                { toggle ? MessageManager.getString("label.toggled")
+                        : MessageManager.getString("label.marked"),
                     String.valueOf(columnCount),
                     invert ? MessageManager
                             .getString("label.not_containing")
@@ -207,9 +209,9 @@ public class AlignViewController implements AlignViewControllerI
     }
     else
     {
-      avcg.setStatus(MessageManager.formatMessage(
-              "label.no_feature_of_type_found",
-              new String[] { featureType }));
+      avcg.setStatus(MessageManager
+              .formatMessage("label.no_feature_of_type_found", new String[]
+              { featureType }));
       if (!extendCurrent)
       {
         cs.clear();
@@ -358,8 +360,8 @@ public class AlignViewController implements AlignViewControllerI
     }
     SequenceI[] oldOrder = al.getSequencesArray();
     AlignmentSorter.sortByFeature(typ, gps, start, stop, al, method);
-    avcg.addHistoryItem(new OrderCommand(methodText, oldOrder, viewport
-            .getAlignment()));
+    avcg.addHistoryItem(new OrderCommand(methodText, oldOrder,
+            viewport.getAlignment()));
     alignPanel.paintAlignment(true);
 
   }
@@ -377,9 +379,10 @@ public class AlignViewController implements AlignViewControllerI
     boolean featuresFile = false;
     try
     {
-      featuresFile = new FeaturesFile(false, file, protocol).parse(viewport
-              .getAlignment().getDataset(), alignPanel.getFeatureRenderer()
-              .getFeatureColours(), false, relaxedIdMatching);
+      featuresFile = new FeaturesFile(false, file, protocol).parse(
+              viewport.getAlignment().getDataset(),
+              alignPanel.getFeatureRenderer().getFeatureColours(), false,
+              relaxedIdMatching);
     } catch (Exception ex)
     {
       ex.printStackTrace();
@@ -415,8 +418,9 @@ public class AlignViewController implements AlignViewControllerI
     }
     // JBPNote this routine could also mark rows, not just columns.
     BitSet bs = new BitSet();
-    SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null || extendCurrent) ? viewport
-            .getAlignment() : viewport.getSelectionGroup();
+    SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null
+            || extendCurrent) ? viewport.getAlignment()
+                    : viewport.getSelectionGroup();
 
     // this could be a lambda... - the remains of the method is boilerplate,
     // except for the different messages for reporting selection.
@@ -436,14 +440,14 @@ public class AlignViewController implements AlignViewControllerI
       {
         viewport.setColumnSelection(cs);
         alignPanel.paintAlignment(true);
-        int columnCount = invert ? (sqcol.getEndRes() - sqcol.getStartRes() + 1)
-                - bs.cardinality()
+        int columnCount = invert
+                ? (sqcol.getEndRes() - sqcol.getStartRes() + 1)
+                        - bs.cardinality()
                 : bs.cardinality();
         avcg.setStatus(MessageManager.formatMessage(
-                "label.view_controller_toggled_marked",
-                new String[] {
-                    toggle ? MessageManager.getString("label.toggled")
-                            : MessageManager.getString("label.marked"),
+                "label.view_controller_toggled_marked", new String[]
+                { toggle ? MessageManager.getString("label.toggled")
+                        : MessageManager.getString("label.marked"),
                     String.valueOf(columnCount),
                     invert ? MessageManager
                             .getString("label.not_containing")