X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FConfiguration.java;h=3418951a898498a915f6126c6be3474c39caa9e4;hb=f6b29c53c14e1ef16e4cd614c7f9465e0073309e;hp=b4a4398472547c3cc2a0b74a5897f0e2c88d3e79;hpb=12fb7d9470cefe81e135eb79a17288ca055ec0ed;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/Configuration.java b/forester/java/src/org/forester/archaeopteryx/Configuration.java index b4a4398..3418951 100644 --- a/forester/java/src/org/forester/archaeopteryx/Configuration.java +++ b/forester/java/src/org/forester/archaeopteryx/Configuration.java @@ -988,20 +988,6 @@ public final class Configuration { setMaxBaseFontSize( i ); } } - else if ( key.equals( "graphics_export_x" ) ) { - // final String str = ( ( String ) st.nextElement() ).trim(); - // final int i = parseInt( str ); - // if ( i > 0 ) { - // setGraphicsExportX( i ); - // } - } - else if ( key.equals( "graphics_export_y" ) ) { - //final String str = ( ( String ) st.nextElement() ).trim(); - // final int i = parseInt( str ); - //if ( i > 0 ) { - // setGraphicsExportY( i ); - //} - } else if ( key.equals( "pdf_export_line_width" ) ) { final String str = ( ( String ) st.nextElement() ).trim(); final float f = parseFloat( str ); @@ -1083,22 +1069,14 @@ public final class Configuration { if ( type_str.equalsIgnoreCase( Options.CLADOGRAM_TYPE.NON_LINED_UP.toString() ) ) { setCladogramType( Options.CLADOGRAM_TYPE.NON_LINED_UP ); } - else if ( type_str.equalsIgnoreCase( Options.CLADOGRAM_TYPE.EXT_NODE_SUM_DEP.toString() ) ) { - setCladogramType( Options.CLADOGRAM_TYPE.EXT_NODE_SUM_DEP ); - } - else if ( type_str.equalsIgnoreCase( Options.CLADOGRAM_TYPE.TOTAL_NODE_SUM_DEP.toString() ) ) { - setCladogramType( Options.CLADOGRAM_TYPE.TOTAL_NODE_SUM_DEP ); + else if ( type_str.equalsIgnoreCase( Options.CLADOGRAM_TYPE.LINED_UP.toString() ) ) { + setCladogramType( Options.CLADOGRAM_TYPE.LINED_UP ); } else { ForesterUtil.printWarningMessage( AptxConstants.PRG_NAME, "unknown value [" + type_str + "] for [cladogram_type]" ); } } - else if ( key.equals( "non_lined_up_cladogram" ) ) { - ForesterUtil - .printWarningMessage( AptxConstants.PRG_NAME, - "configuration key [non_lined_up_cladogram] is deprecated, use [cladogram_type] instead" ); - } else if ( key.equals( "hide_controls_and_menus" ) ) { _hide_controls_and_menus = parseBoolean( ( String ) st.nextElement() ); }