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

[jalview.git] / src / jalview / datamodel / Annotation.java

diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java
index 8de8eb2..ae29417 100755 (executable)
--- a/src/jalview/datamodel/Annotation.java
+++ b/src/jalview/datamodel/Annotation.java
@@ -51,7 +51,9 @@ public class Annotation
    */
   public char secondaryStructure = ' ';
 
-  /** Score for the position - used in histograms, line graphs and for shading */
+  /**
+   * Score for the position - used in histograms, line graphs and for shading
+   */
   public float value;
 
   /** Colour for position */
@@ -206,10 +208,10 @@ public class Annotation
   public boolean isWhitespace()
   {
     return ((value == 0f)
-            && ((description == null) || (description.trim()
-                    .length() == 0))
-            && ((displayCharacter == null) || (displayCharacter
-                    .trim().length() == 0))
-            && (secondaryStructure == '\0' || (secondaryStructure == ' ')) && colour == null);
+            && ((description == null) || (description.trim().length() == 0))
+            && ((displayCharacter == null)
+                    || (displayCharacter.trim().length() == 0))
+            && (secondaryStructure == '\0' || (secondaryStructure == ' '))
+            && colour == null);
   }
 }