From 0c49ebdccd74ed51ded3e6c848820a12ca3bc19a Mon Sep 17 00:00:00 2001 From: cmzmasek Date: Mon, 21 May 2012 06:39:49 +0000 Subject: [PATCH] in progress --- forester/java/src/org/forester/archaeopteryx/MainFrame.java | 10 ++++++++-- .../src/org/forester/archaeopteryx/MainFrameApplication.java | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrame.java b/forester/java/src/org/forester/archaeopteryx/MainFrame.java index 5af1879..e2ba175 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainFrame.java +++ b/forester/java/src/org/forester/archaeopteryx/MainFrame.java @@ -46,6 +46,7 @@ import javax.swing.JRadioButtonMenuItem; import org.forester.archaeopteryx.Options.CLADOGRAM_TYPE; import org.forester.archaeopteryx.Options.NODE_LABEL_DIRECTION; import org.forester.archaeopteryx.Options.PHYLOGENY_GRAPHICS_TYPE; +import org.forester.archaeopteryx.tools.ProcessPool; import org.forester.phylogeny.Phylogeny; import org.forester.phylogeny.PhylogenyNodeI.NH_CONVERSION_SUPPORT_VALUE_STYLE; import org.forester.phylogeny.data.NodeVisualization.NodeFill; @@ -209,9 +210,14 @@ public abstract class MainFrame extends JFrame implements ActionListener { Configuration _configuration; JMenuItem _remove_branch_color_item; Options _options; - + final ProcessPool _process_pool; + MainFrame() { - // Empty constructor. + _process_pool = new ProcessPool(); + } + + ProcessPool getProcessPool() { + return _process_pool; } /** diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java index 551c07c..55ddbc1 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java +++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java @@ -234,6 +234,7 @@ public final class MainFrameApplication extends MainFrame { JMenuItem _read_values_jmi; private MainFrameApplication( final Phylogeny[] phys, final Configuration config, final String title ) { + this( phys, config, title, null ); } @@ -241,6 +242,7 @@ public final class MainFrameApplication extends MainFrame { final Configuration config, final String title, final File current_dir ) { + super(); _configuration = config; if ( _configuration == null ) { throw new IllegalArgumentException( "configuration is null" ); -- 1.7.10.2