X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FTreePanel.java;h=befe375f2e7154c8fae8c99fa7063e257fe23c8e;hb=0cbfc79c69ccbfca7ac42a1381d62d449bf1adf6;hp=fa7484ff4a81df0c777d924004a23a7c5d3ea3d5;hpb=f95ddfc23b184985166c2838f452c20b1a2c8307;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
index fa7484f..befe375 100644
--- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
@@ -411,7 +411,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         }
         setNodeInPreorderToNull();
         _phylogeny.externalNodesHaveChanged();
-        _phylogeny.hashIDs();
+        _phylogeny.clearHashIdToNodeMap();
         _phylogeny.recalculateNumberOfExternalDescendants( true );
         resetNodeIdToDistToLeafMap();
         setEdited( true );
@@ -882,7 +882,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         setCopiedAndPastedNodes( null );
         setCutOrCopiedTree( _phylogeny.copy( node ) );
         _phylogeny.deleteSubtree( node, true );
-        _phylogeny.hashIDs();
+        _phylogeny.clearHashIdToNodeMap();
         _phylogeny.recalculateNumberOfExternalDescendants( true );
         resetNodeIdToDistToLeafMap();
         setEdited( true );
@@ -948,7 +948,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
             _phylogeny.deleteSubtree( node, true );
         }
         _phylogeny.externalNodesHaveChanged();
-        _phylogeny.hashIDs();
+        _phylogeny.clearHashIdToNodeMap();
         _phylogeny.recalculateNumberOfExternalDescendants( true );
         resetNodeIdToDistToLeafMap();
         setEdited( true );
@@ -4243,7 +4243,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         getCopiedAndPastedNodes().addAll( node_ids );
         setNodeInPreorderToNull();
         _phylogeny.externalNodesHaveChanged();
-        _phylogeny.hashIDs();
+        _phylogeny.clearHashIdToNodeMap();
         _phylogeny.recalculateNumberOfExternalDescendants( true );
         resetNodeIdToDistToLeafMap();
         setEdited( true );
@@ -4546,11 +4546,9 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
             }
         }
         if ( getMainPanel().getOptions().isAntialiasScreen() ) {
-            if ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.RECTANGULAR 
-            && !getMainPanel().getOptions().isShowDefaultNodeShapes()       
-            && ( getControlPanel() != null && !getControlPanel().isShowDomainArchitectures() )
-            
-            ) {
+            if ( ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.RECTANGULAR )
+                    && !getMainPanel().getOptions().isShowDefaultNodeShapes()
+                    && ( ( getControlPanel() != null ) && !getControlPanel().isShowDomainArchitectures() ) ) {
                 _rendering_hints.put( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
             }
             else {
@@ -4958,7 +4956,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
             node.swapChildren();
             setNodeInPreorderToNull();
             _phylogeny.externalNodesHaveChanged();
-            _phylogeny.hashIDs();
+            _phylogeny.clearHashIdToNodeMap();
             _phylogeny.recalculateNumberOfExternalDescendants( true );
             resetNodeIdToDistToLeafMap();
             setEdited( true );
@@ -4982,7 +4980,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
             PhylogenyMethods.sortNodeDescendents( node, pri );
             setNodeInPreorderToNull();
             _phylogeny.externalNodesHaveChanged();
-            _phylogeny.hashIDs();
+            _phylogeny.clearHashIdToNodeMap();
             _phylogeny.recalculateNumberOfExternalDescendants( true );
             resetNodeIdToDistToLeafMap();
             setEdited( true );