JAL-1517 source formatting

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index e25818e..0c8afaa 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.viewmodel;
@@ -212,15 +214,18 @@ public abstract class AlignmentViewport implements AlignViewportI
     // calculation till later or to do all calculations in thread.
     // via changecolour
     globalColourScheme = cs;
-    boolean recalc=false;
-    if (cs!=null)
+    boolean recalc = false;
+    if (cs != null)
     {
       cs.setConservationApplied(recalc = getConservationSelected());
-      if (getAbovePIDThreshold() || cs instanceof PIDColourScheme || cs instanceof Blosum62ColourScheme)
+      if (getAbovePIDThreshold() || cs instanceof PIDColourScheme
+              || cs instanceof Blosum62ColourScheme)
       {
         recalc = true;
         cs.setThreshold(threshold, ignoreGapsInConsensusCalculation);
-      } else {
+      }
+      else
+      {
         cs.setThreshold(0, ignoreGapsInConsensusCalculation);
       }
       if (recalc)
@@ -245,7 +250,7 @@ public abstract class AlignmentViewport implements AlignViewportI
                 || cs instanceof Blosum62ColourScheme)
         {
           sg.cs.setThreshold(threshold, getIgnoreGapsConsensus());
-          recalc=true;
+          recalc = true;
         }
         else
         {
@@ -255,16 +260,19 @@ public abstract class AlignmentViewport implements AlignViewportI
         if (getConservationSelected())
         {
           sg.cs.setConservationApplied(true);
-          recalc=true;
+          recalc = true;
         }
         else
         {
           sg.cs.setConservation(null);
           // sg.cs.setThreshold(0, getIgnoreGapsConsensus());
         }
-        if (recalc) {
+        if (recalc)
+        {
           sg.recalcConservation();
-        } else {
+        }
+        else
+        {
           sg.cs.alignmentChanged(sg, hiddenRepSequences);
         }
       }
@@ -300,13 +308,15 @@ public abstract class AlignmentViewport implements AlignViewportI
    * view
    */
   protected Hashtable[] hStrucConsensus = null;
-  
+
   protected Conservation hconservation = null;
+
   @Override
   public void setConservation(Conservation cons)
   {
     hconservation = cons;
   }
+
   /**
    * percentage gaps allowed in a column before all amino acid properties should
    * be considered unconserved
@@ -1371,15 +1381,15 @@ public abstract class AlignmentViewport implements AlignViewportI
       {
         conservation = new AlignmentAnnotation("Conservation",
                 "Conservation of total alignment less than "
-                        + getConsPercGaps() + "% gaps",
-                new Annotation[1], 0f, 11f,
-                AlignmentAnnotation.BAR_GRAPH);
+                        + getConsPercGaps() + "% gaps", new Annotation[1],
+                0f, 11f, AlignmentAnnotation.BAR_GRAPH);
         conservation.hasText = true;
         conservation.autoCalculated = true;
         alignment.addAnnotation(conservation);
       }
     }
   }
+
   private void initQuality()
   {
     if (showQuality)
@@ -1388,21 +1398,20 @@ public abstract class AlignmentViewport implements AlignViewportI
       {
         quality = new AlignmentAnnotation("Quality",
                 "Alignment Quality based on Blosum62 scores",
-                new Annotation[1], 0f, 11f,
-                AlignmentAnnotation.BAR_GRAPH);
+                new Annotation[1], 0f, 11f, AlignmentAnnotation.BAR_GRAPH);
         quality.hasText = true;
         quality.autoCalculated = true;
         alignment.addAnnotation(quality);
       }
     }
   }
+
   private void initRNAStructure()
   {
-    if (alignment.hasRNAStructure() && strucConsensus==null)
+    if (alignment.hasRNAStructure() && strucConsensus == null)
     {
       strucConsensus = new AlignmentAnnotation("StrucConsensus", "PID",
-              new Annotation[1], 0f, 100f,
-              AlignmentAnnotation.BAR_GRAPH);
+              new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
       strucConsensus.hasText = true;
       strucConsensus.autoCalculated = true;
 
@@ -1412,6 +1421,7 @@ public abstract class AlignmentViewport implements AlignViewportI
       }
     }
   }
+
   /*
    * (non-Javadoc)
    * 
@@ -1512,7 +1522,7 @@ public abstract class AlignmentViewport implements AlignViewportI
         if (aan[an].autoCalculated && aan[an].groupRef != null)
         {
           oldrfs.add(aan[an].groupRef);
-          alignment.deleteAnnotation(aan[an],false);
+          alignment.deleteAnnotation(aan[an], false);
         }
       }
     }
@@ -1552,11 +1562,12 @@ public abstract class AlignmentViewport implements AlignViewportI
   @Override
   public Color getSequenceColour(SequenceI seq)
   {
-    Color sqc=Color.white;
+    Color sqc = Color.white;
     if (sequenceColours != null)
     {
       sqc = (Color) sequenceColours.get(seq);
-      if (sqc == null) {
+      if (sqc == null)
+      {
         sqc = Color.white;
       }
     }