openjdk7 returns null for default value selected format if it hasn't been touched

[jalview.git] / src / jalview / gui / PaintRefresher.java

diff --git a/src/jalview/gui/PaintRefresher.java b/src/jalview/gui/PaintRefresher.java
index 219fbf8..014f076 100755 (executable)
--- a/src/jalview/gui/PaintRefresher.java
+++ b/src/jalview/gui/PaintRefresher.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * 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.
- * 
+ *  
  * 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 
@@ -180,14 +180,18 @@ public class PaintRefresher
       {
         if (i < comp.getHeight())
         {
-          // TODO: the following does not trigger any recalculation of height/etc, or maintain the dataset
-          if (comp.getDataset()!=source.getDataset())
+          // TODO: the following does not trigger any recalculation of
+          // height/etc, or maintain the dataset
+          if (comp.getDataset() != source.getDataset())
           {
-            // raise an implementation warning here - not sure if this situation will ever occur
-            System.err.println("IMPLEMENTATION PROBLEM: DATASET out of sync due to an insert whilst calling PaintRefresher.validateSequences(AlignmentI, ALignmentI)");
+            // raise an implementation warning here - not sure if this situation
+            // will ever occur
+            System.err
+                    .println("IMPLEMENTATION PROBLEM: DATASET out of sync due to an insert whilst calling PaintRefresher.validateSequences(AlignmentI, ALignmentI)");
           }
           List<SequenceI> alsq;
-          synchronized (alsq=comp.getSequences()) {
+          synchronized (alsq = comp.getSequences())
+          {
             alsq.add(i, a1[i]);
           }
         }
@@ -234,16 +238,24 @@ public class PaintRefresher
 
   static AlignmentPanel[] getAssociatedPanels(String id)
   {
-    if (components==null) { return new AlignmentPanel[0]; };
+    if (components == null)
+    {
+      return new AlignmentPanel[0];
+    }
+    ;
     Vector comps = (Vector) components.get(id);
-    if (comps==null) { return new AlignmentPanel[0]; };
+    if (comps == null)
+    {
+      return new AlignmentPanel[0];
+    }
+    ;
     Vector tmp = new Vector();
     int i, iSize = comps.size();
     for (i = 0; i < iSize; i++)
     {
       if (comps.elementAt(i) instanceof AlignmentPanel)
       {
-        tmp.addElement(((AlignmentPanel) comps.elementAt(i)));
+        tmp.addElement(comps.elementAt(i));
       }
     }
     AlignmentPanel[] result = new AlignmentPanel[tmp.size()];