From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Thu, 16 Oct 2014 17:24:59 +0000 (+0000)
Subject: in progress
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=31a3cd8e86021dc25295567db88c11e833d14291;p=jalview.git

in progress
---

diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
index 0f04f1e..9e88db2 100644
--- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
@@ -2452,13 +2452,23 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         else {
             fc.setFont( getMainPanel().getTreeFontSet().getLargeFont() );
         }
-        fc.showDialog( this, "Select Font" );
-        if ( ( fc.getFont() != null ) && !ForesterUtil.isEmpty( fc.getFont().getFamily().trim() ) ) {
-            List<PhylogenyNode> nodes = new ArrayList<PhylogenyNode>();
-            if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
-                nodes = getFoundNodesAsListOfPhylogenyNodes();
-            }
+        List<PhylogenyNode> nodes = new ArrayList<PhylogenyNode>();
+        if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
+            nodes = getFoundNodesAsListOfPhylogenyNodes();
+        }
+        if ( !nodes.contains( node ) ) {
             nodes.add( node );
+        }
+        final int count = nodes.size();
+        String title = "Change the font for ";
+        if ( count == 1 ) {
+            title += "one node";
+        }
+        else {
+            title += ( count + " nodes" );
+        }
+        fc.showDialog( this, title );
+        if ( ( fc.getFont() != null ) && !ForesterUtil.isEmpty( fc.getFont().getFamily().trim() ) ) {
             for( final PhylogenyNode n : nodes ) {
                 if ( n.getNodeData().getNodeVisualData() == null ) {
                     n.getNodeData().setNodeVisualData( new NodeVisualData() );
@@ -2484,6 +2494,33 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         repaint();
     }
 
+    private void colorNodeFont( final PhylogenyNode node ) {
+        _color_chooser.setPreviewPanel( new JPanel() );
+        NodeColorizationActionListener al;
+        int count = 1;
+        if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
+            final List<PhylogenyNode> additional_nodes = getFoundNodesAsListOfPhylogenyNodes();
+            al = new NodeColorizationActionListener( _color_chooser, node, additional_nodes );
+            count = additional_nodes.size();
+            if ( !additional_nodes.contains( node ) ) {
+                count++;
+            }
+        }
+        else {
+            al = new NodeColorizationActionListener( _color_chooser, node );
+        }
+        String title = "Change the (node and font) color for ";
+        if ( count == 1 ) {
+            title += "one node";
+        }
+        else {
+            title += ( count + " nodes" );
+        }
+        final JDialog dialog = JColorChooser.createDialog( this, title, true, _color_chooser, al, null );
+        setEdited( true );
+        dialog.setVisible( true );
+    }
+
     final private void colorizeNodes( final Color c,
                                       final PhylogenyNode node,
                                       final List<PhylogenyNode> additional_nodes ) {
@@ -2524,21 +2561,6 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
         repaint();
     }
 
-    private void colorNodeFont( final PhylogenyNode node ) {
-        _color_chooser.setPreviewPanel( new JPanel() );
-        NodeColorizationActionListener al;
-        if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
-            final List<PhylogenyNode> additional_nodes = getFoundNodesAsListOfPhylogenyNodes();
-            al = new NodeColorizationActionListener( _color_chooser, node, additional_nodes );
-        }
-        else {
-            al = new NodeColorizationActionListener( _color_chooser, node );
-        }
-        final JDialog dialog = JColorChooser.createDialog( this, "Node colorization", true, _color_chooser, al, null );
-        setEdited( true );
-        dialog.setVisible( true );
-    }
-
     final private void colorSubtree( final PhylogenyNode node ) {
         if ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED ) {
             JOptionPane.showMessageDialog( this,