git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error things
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
archaeopteryx
/
MainFrame.java
diff --git
a/forester/java/src/org/forester/archaeopteryx/MainFrame.java
b/forester/java/src/org/forester/archaeopteryx/MainFrame.java
index
ded33a8
..
72f2e27
100644
(file)
--- a/
forester/java/src/org/forester/archaeopteryx/MainFrame.java
+++ b/
forester/java/src/org/forester/archaeopteryx/MainFrame.java
@@
-231,8
+231,6
@@
public abstract class MainFrame extends JFrame implements ActionListener {
InferenceManager _inference_manager;
final ProcessPool _process_pool;
private String _previous_node_annotation_ref;
InferenceManager _inference_manager;
final ProcessPool _process_pool;
private String _previous_node_annotation_ref;
- private String _ext_node_data_buffer = "";
- private int _ext_node_data_buffer_change_counter = 0;
MainFrame() {
_process_pool = ProcessPool.createInstance();
MainFrame() {
_process_pool = ProcessPool.createInstance();
@@
-500,11
+498,15
@@
public abstract class MainFrame extends JFrame implements ActionListener {
* @return current external node data as String
*/
public String getCurrentExternalNodesDataBuffer() {
* @return current external node data as String
*/
public String getCurrentExternalNodesDataBuffer() {
- return _ext_node_data_buffer;
+ return getCurrentTreePanel().getCurrentExternalNodesDataBufferAsString();
}
}
- public int getExtNodeDataBufferChangeCounter() {
- return _ext_node_data_buffer_change_counter;
+ public int getCurrentExternalNodesDataBufferChangeCounter() {
+ return getCurrentTreePanel().getCurrentExternalNodesDataBufferChangeCounter();
+ }
+
+ public int getCurrentExternalNodesDataBufferLength() {
+ return getCurrentTreePanel().getCurrentExternalNodesDataBufferAsString().length();
}
public InferenceManager getInferenceManager() {
}
public InferenceManager getInferenceManager() {
@@
-523,10
+525,6
@@
public abstract class MainFrame extends JFrame implements ActionListener {
return _process_pool;
}
return _process_pool;
}
- public void increaseExtNodeDataBufferChangeCounter() {
- _ext_node_data_buffer_change_counter++;
- }
-
public void showTextFrame( final String s, final String title ) {
checkTextFrames();
_textframes.addLast( TextFrame.instantiate( s, title, _textframes ) );
public void showTextFrame( final String s, final String title ) {
checkTextFrames();
_textframes.addLast( TextFrame.instantiate( s, title, _textframes ) );
@@
-966,16
+964,6
@@
public abstract class MainFrame extends JFrame implements ActionListener {
_configuration = configuration;
}
_configuration = configuration;
}
- void setCurrentExternalNodesDataBuffer( final String s ) {
- increaseExtNodeDataBufferChangeCounter();
- if ( !ForesterUtil.isEmpty( s ) ) {
- _ext_node_data_buffer = s.trim();
- }
- else {
- _ext_node_data_buffer = "";
- }
- }
-
void setInferenceManager( final InferenceManager i ) {
_inference_manager = i;
}
void setInferenceManager( final InferenceManager i ) {
_inference_manager = i;
}