X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FConfiguration.java;h=0e6b05fcaf01074b84d6a7f1d086a8fb3f76e048;hb=a9fcc2db25e1349d2a5f926eae7a71cea99efb7a;hp=66047c6df070bfb75d7b1cf5d2e560c2a3922390;hpb=b79b32bb7a7f0f7a70343acadb8c33e094a3c485;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/Configuration.java b/forester/java/src/org/forester/archaeopteryx/Configuration.java index 66047c6..0e6b05f 100644 --- a/forester/java/src/org/forester/archaeopteryx/Configuration.java +++ b/forester/java/src/org/forester/archaeopteryx/Configuration.java @@ -52,7 +52,7 @@ import org.forester.util.ForesterUtil; public final class Configuration { public enum UI { - NATIVE, SYSTEM, NIMBUS, UNKNOWN + NATIVE, CROSSPLATFORM, NIMBUS, UNKNOWN } static final String VALIDATE_AGAINST_PHYLOXML_XSD_SCHEMA = "validate_against_phyloxml_xsd_schema"; private static final String WEB_LINK_KEY = "web_link"; @@ -464,7 +464,7 @@ public final class Configuration { return _graphics_export_y; } - int getDefaultBootstrapSamples() { + public int getDefaultBootstrapSamples() { return _default_bootstrap_samples; } @@ -585,10 +585,8 @@ public final class Configuration { } final boolean isUseNativeUI() { - if ( _ui == UI.UNKNOWN ) { - if ( Util.isMac() && Util.isJava15() ) { - _ui = UI.NATIVE; - } + if ( ( _ui == UI.UNKNOWN ) && Util.isMac() && Util.isJava15() ) { + _ui = UI.NATIVE; } return _ui == UI.NATIVE; } @@ -792,7 +790,7 @@ public final class Configuration { _ui = UI.NATIVE; } else if ( my_str.equals( "no" ) || my_str.equals( "false" ) ) { - _ui = UI.SYSTEM; + _ui = UI.CROSSPLATFORM; } else if ( my_str.equals( "?" ) ) { _ui = UI.UNKNOWN;