Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

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

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index d735402..ec4ef7b 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -190,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");
@@ -207,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;
         }
       }
     };