X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FArchaeopteryxE.java;h=d186d16d176b295ff39f185e29dde1b58c2cb073;hb=10f90f7787d4b1287a910d4e6ae895da14866929;hp=576d952f0e5ff9f02109e6600ee4bad1b56a0c7c;hpb=f2560d91ad4d0e4fb8b150f5ebeefb405d669bde;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/ArchaeopteryxE.java b/forester/java/src/org/forester/archaeopteryx/ArchaeopteryxE.java index 576d952..d186d16 100644 --- a/forester/java/src/org/forester/archaeopteryx/ArchaeopteryxE.java +++ b/forester/java/src/org/forester/archaeopteryx/ArchaeopteryxE.java @@ -53,8 +53,8 @@ import org.forester.util.ForesterUtil; // public class ArchaeopteryxE extends JApplet implements ActionListener { - private final static String NAME = "ArchaeopteryxE"; - private static final long serialVersionUID = -1220055577935759443L; + private final static String NAME = "ArchaeopteryxE"; + private static final long serialVersionUID = -1220055577935759443L; private Configuration _configuration; private MainPanelApplets _main_panel; private JMenuBar _jmenubar; @@ -121,10 +121,10 @@ public class ArchaeopteryxE extends JApplet implements ActionListener { private JMenuItem _choose_node_size_mi; private JCheckBoxMenuItem _taxonomy_colorize_node_shapes_cbmi; private JCheckBoxMenuItem _show_confidence_stddev_cbmi; - private final LinkedList _textframes = new LinkedList(); - private String _ext_node_data_buffer = ""; - private int _ext_node_data_buffer_change_counter = 0; + private final LinkedList _textframes = new LinkedList(); + // private String _ext_node_data_buffer = ""; + // private int _ext_node_data_buffer_change_counter = 0; @Override public void actionPerformed( final ActionEvent e ) { final Object o = e.getSource(); @@ -336,7 +336,15 @@ public class ArchaeopteryxE extends JApplet implements ActionListener { * @return current external node data as String */ public String getCurrentExternalNodesDataBuffer() { - return _ext_node_data_buffer; + return getCurrentTreePanel().getCurrentExternalNodesDataBufferAsString(); + } + + public int getCurrentExternalNodesDataBufferChangeCounter() { + return getCurrentTreePanel().getCurrentExternalNodesDataBufferChangeCounter(); + } + + public int getCurrentExternalNodesDataBufferLength() { + return getCurrentTreePanel().getCurrentExternalNodesDataBufferAsString().length(); } /** @@ -401,18 +409,10 @@ public class ArchaeopteryxE extends JApplet implements ActionListener { return dataImg; } - public int getExtNodeDataBufferChangeCounter() { - return _ext_node_data_buffer_change_counter; - } - public Options getOptions() { return _options; } - public void increaseExtNodeDataBufferChangeCounter() { - _ext_node_data_buffer_change_counter++; - } - @Override public void init() { final String config_filename = getParameter( Constants.APPLET_PARAM_NAME_FOR_CONFIG_FILE_URL ); @@ -763,6 +763,10 @@ public class ArchaeopteryxE extends JApplet implements ActionListener { } } + void clearCurrentExternalNodesDataBuffer() { + getCurrentTreePanel().clearCurrentExternalNodesDataBuffer(); + } + void customizeCheckBoxMenuItem( final JCheckBoxMenuItem item, final boolean is_selected ) { if ( item != null ) { item.setFont( MainFrame.menu_font ); @@ -916,16 +920,6 @@ public class ArchaeopteryxE extends JApplet implements ActionListener { _configuration = configuration; } - void setCurrentExternalNodesDataBuffer( final String s ) { - increaseExtNodeDataBufferChangeCounter(); - if ( !ForesterUtil.isEmpty( s ) ) { - _ext_node_data_buffer = s.trim(); - } - else { - _ext_node_data_buffer = ""; - } - } - void setOptions( final Options options ) { _options = options; }