X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FOptions.java;h=3eb403e4fd822b4b45f491659e33caf7baba6946;hb=b0fd64a5d558885627ba7a7295d9ef612fe76cd0;hp=6d550141a05313b79e0f192958291ef66e38303a;hpb=54d8e3a926c3cf3477199c8b85aca478230e223c;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/Options.java b/forester/java/src/org/forester/archaeopteryx/Options.java
index 6d55014..3eb403e 100644
--- a/forester/java/src/org/forester/archaeopteryx/Options.java
+++ b/forester/java/src/org/forester/archaeopteryx/Options.java
@@ -184,7 +184,7 @@ final public class Options {
     final private void init() {
         _default_node_shape = NodeShape.CIRCLE;
         _default_node_fill = NodeFill.GRADIENT;
-        _default_node_shape_size = Constants.DEFAULT_NODE_SHAPE_SIZE_DEFAULT;
+        _default_node_shape_size = AptxConstants.DEFAULT_NODE_SHAPE_SIZE_DEFAULT;
         _internal_number_are_confidence_for_nh_parsing = false;
         _show_scale = false;
         _antialias_screen = true;
@@ -196,12 +196,12 @@ final public class Options {
         _show_default_node_shapes_external = false;
         _show_default_node_shapes_for_marked_nodes = false;
         if ( AptxUtil.isUsOrCanada() ) {
-            _print_size_x = Constants.US_LETTER_SIZE_X;
-            _print_size_y = Constants.US_LETTER_SIZE_Y;
+            _print_size_x = AptxConstants.US_LETTER_SIZE_X;
+            _print_size_y = AptxConstants.US_LETTER_SIZE_Y;
         }
         else {
-            _print_size_x = Constants.A4_SIZE_X;
-            _print_size_y = Constants.A4_SIZE_Y;
+            _print_size_x = AptxConstants.A4_SIZE_X;
+            _print_size_y = AptxConstants.A4_SIZE_Y;
         }
         _min_confidence_value = MIN_CONFIDENCE_DEFAULT;
         _print_black_and_white = false;
@@ -212,17 +212,17 @@ final public class Options {
         _match_whole_terms_only = false;
         _search_with_regex = false;
         _search_case_sensitive = false;
-        _print_line_width = Constants.PDF_LINE_WIDTH_DEFAULT;
+        _print_line_width = AptxConstants.PDF_LINE_WIDTH_DEFAULT;
         _show_overview = true;
         _ov_placement = OVERVIEW_PLACEMENT_TYPE.UPPER_LEFT;
         _node_label_direction = NODE_LABEL_DIRECTION.HORIZONTAL;
         _inverse_search_result = false;
         _scale_bar_length = 0.0;
-        _number_of_digits_after_comma_for_branch_length_values = Constants.NUMBER_OF_DIGITS_AFTER_COMMA_FOR_BRANCH_LENGTH_VALUES_DEFAULT;
-        _number_of_digits_after_comma_for_confidence_values = Constants.NUMBER_OF_DIGITS_AFTER_COMMA_FOR_CONFIDENCE_VALUES_DEFAULT;
+        _number_of_digits_after_comma_for_branch_length_values = AptxConstants.NUMBER_OF_DIGITS_AFTER_COMMA_FOR_BRANCH_LENGTH_VALUES_DEFAULT;
+        _number_of_digits_after_comma_for_confidence_values = AptxConstants.NUMBER_OF_DIGITS_AFTER_COMMA_FOR_CONFIDENCE_VALUES_DEFAULT;
         _nh_parsing_replace_underscores = false;
         _taxonomy_extraction = TAXONOMY_EXTRACTION.NO;
-        _cladogram_type = Constants.CLADOGRAM_TYPE_DEFAULT;
+        _cladogram_type = AptxConstants.CLADOGRAM_TYPE_DEFAULT;
         _show_domain_labels = true;
         _show_annotation_ref_source = true;
         setAbbreviateScientificTaxonNames( false );
@@ -570,16 +570,16 @@ final public class Options {
             instance.setBackgroundColorGradient( configuration.isBackgroundColorGradient() );
             if ( configuration.getNumberOfDigitsAfterCommaForBranchLengthValues() >= 0 ) {
                 instance.setNumberOfDigitsAfterCommaForBranchLength( configuration
-                                                                     .getNumberOfDigitsAfterCommaForBranchLengthValues() );
+                        .getNumberOfDigitsAfterCommaForBranchLengthValues() );
             }
             if ( configuration.getNumberOfDigitsAfterCommaForConfidenceValues() >= 0 ) {
                 instance.setNumberOfDigitsAfterCommaForConfidenceValues( configuration
-                                                                         .getNumberOfDigitsAfterCommaForConfidenceValues() );
+                        .getNumberOfDigitsAfterCommaForConfidenceValues() );
             }
             instance.setTaxonomyExtraction( configuration.getTaxonomyExtraction() );
             instance.setReplaceUnderscoresInNhParsing( configuration.isReplaceUnderscoresInNhParsing() );
             instance.setInternalNumberAreConfidenceForNhParsing( configuration
-                                                                 .isInternalNumberAreConfidenceForNhParsing() );
+                    .isInternalNumberAreConfidenceForNhParsing() );
             instance.setEditable( configuration.isEditable() );
             instance.setColorLabelsSameAsParentBranch( configuration.isColorLabelsSameAsParentBranch() );
             instance.setShowDomainLabels( configuration.isShowDomainLabels() );
@@ -599,7 +599,7 @@ final public class Options {
             }
             if ( !ForesterUtil.isEmpty( configuration.getBaseFontFamilyName() ) ) {
                 instance.setBaseFont( new Font( configuration.getBaseFontFamilyName(), Font.PLAIN, instance
-                                                .getBaseFont().getSize() ) );
+                        .getBaseFont().getSize() ) );
             }
             if ( configuration.getPhylogenyGraphicsType() != null ) {
                 instance.setPhylogenyGraphicsType( configuration.getPhylogenyGraphicsType() );