X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=ec4ef7b2552f02a83bd35ae0d69f57d7e42fa911;hb=bea1d9b563d2fea018de3dbde9112dd59149126e;hp=e88007a8bda8bfbe5a8a6e5d4d9625782e71e3a4;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index e88007a..ec4ef7b 100755
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -31,6 +31,7 @@ import jalview.analysis.scoremodels.ScoreModels;
 import jalview.api.analysis.ScoreModelI;
 import jalview.api.analysis.SimilarityParamsI;
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.commands.CommandI;
 import jalview.commands.OrderCommand;
 import jalview.datamodel.Alignment;
@@ -189,11 +190,12 @@ public class TreePanel extends GTreePanel
   {
     final PropertyChangeListener listener = new PropertyChangeListener()
     {
+      @SuppressWarnings("unchecked")
       @Override
       public void propertyChange(PropertyChangeEvent evt)
       {
-        if (evt.getPropertyName().equals("alignment"))
-        {
+        switch (evt.getPropertyName()) {
+        case AlignmentViewport.PROPERTY_ALIGNMENT:
           if (tree == null)
           {
             System.out.println("tree is null");
@@ -206,12 +208,14 @@ public class TreePanel extends GTreePanel
           {
             System.out.println(
                     "new alignment sequences vector value is null");
+            return;
           }
 
           tree.updatePlaceHolders((List<SequenceI>) evt.getNewValue());
           treeCanvas.nameHash.clear(); // reset the mapping between canvas
           // rectangles and leafnodes
           repaint();
+          break;
         }
       }
     };
@@ -321,9 +325,8 @@ public class TreePanel extends GTreePanel
       }
       else
       {
-        ScoreModelI sm = ScoreModels.getInstance()
-                .getScoreModel(scoreModelName,
-                        treeCanvas.getAssociatedPanel());
+        ScoreModelI sm = ScoreModels.getInstance().getScoreModel(
+                scoreModelName, treeCanvas.getAssociatedPanel());
         TreeBuilder njtree = treeType.equals(TreeBuilder.NEIGHBOUR_JOINING)
                 ? new NJTree(av, sm, similarityParams)
                 : new AverageDistanceTree(av, sm, similarityParams);
@@ -459,7 +462,7 @@ public class TreePanel extends GTreePanel
     AlignmentView originalData = tree.getOriginalData();
     if (originalData == null)
     {
-      Cache.info(
+      Console.info(
               "Unexpected call to originalSeqData_actionPerformed - should have hidden this menu action.");
       return;
     }
@@ -589,9 +592,8 @@ public class TreePanel extends GTreePanel
     }
     else
     {
-      treeCanvas.getAssociatedPanel().alignFrame
-              .addHistoryItem(
-                      sortAlignmentIn(treeCanvas.getAssociatedPanel()));
+      treeCanvas.getAssociatedPanel().alignFrame.addHistoryItem(
+              sortAlignmentIn(treeCanvas.getAssociatedPanel()));
     }
 
   }
@@ -696,7 +698,8 @@ public class TreePanel extends GTreePanel
     String tree = MessageManager.getString("label.tree");
     ImageExporter exporter = new ImageExporter(writer, null, imageFormat,
             tree);
-    exporter.doExport(null, this, width, height, tree.toLowerCase(Locale.ROOT));
+    exporter.doExport(null, this, width, height,
+            tree.toLowerCase(Locale.ROOT));
   }
 
   /**
@@ -788,8 +791,8 @@ public class TreePanel extends GTreePanel
     /*
      * i18n description of Neighbour Joining or Average Distance method
      */
-    String treecalcnm = MessageManager
-            .getString("label.tree_calc_" + treeType.toLowerCase(Locale.ROOT));
+    String treecalcnm = MessageManager.getString(
+            "label.tree_calc_" + treeType.toLowerCase(Locale.ROOT));
 
     /*
      * short score model name (long description can be too long)
@@ -818,8 +821,7 @@ public class TreePanel extends GTreePanel
       int width = treeCanvas.getWidth();
       int height = treeCanvas.getHeight();
 
-      FileOutputStream out = new FileOutputStream(
-              outFile);
+      FileOutputStream out = new FileOutputStream(outFile);
       EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width,
               height);
       pg.setAccurateTextMode(!textOption);
@@ -833,7 +835,7 @@ public class TreePanel extends GTreePanel
       ex.printStackTrace();
     }
   }
-  
+
   public AlignViewport getViewport()
   {
     return av;