From b692c87610ed9bdae017fe60ee89f36a2dc152bb Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Sat, 5 Jan 2013 03:20:46 +0000 Subject: [PATCH] removed save as NHX --- .../archaeopteryx/MainFrameApplication.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java index ca14a87..f0d85ca 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java +++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java @@ -302,7 +302,6 @@ public final class MainFrameApplication extends MainFrame { _save_filechooser.setCurrentDirectory( new File( "." ) ); _save_filechooser.setMultiSelectionEnabled( false ); _save_filechooser.setFileFilter( MainFrameApplication.xmlfilter ); - _save_filechooser.addChoosableFileFilter( MainFrameApplication.nhxfilter ); _save_filechooser.addChoosableFileFilter( MainFrameApplication.nhfilter ); _save_filechooser.addChoosableFileFilter( MainFrameApplication.nexusfilter ); _save_filechooser.addChoosableFileFilter( _save_filechooser.getAcceptAllFileFilter() ); @@ -2474,18 +2473,6 @@ public final class MainFrameApplication extends MainFrame { return exception; } - private boolean writeAsNHX( final Phylogeny t, boolean exception, final File file ) { - try { - final PhylogenyWriter writer = new PhylogenyWriter(); - writer.toNewHampshireX( t, file ); - } - catch ( final Exception e ) { - exception = true; - exceptionOccuredDuringSaveAs( e ); - } - return exception; - } - private boolean writeAsPhyloXml( final Phylogeny t, boolean exception, final File file ) { try { final PhylogenyWriter writer = new PhylogenyWriter(); @@ -2560,9 +2547,6 @@ public final class MainFrameApplication extends MainFrame { if ( _save_filechooser.getFileFilter() == MainFrameApplication.nhfilter ) { exception = writeAsNewHampshire( t, exception, file ); } - else if ( _save_filechooser.getFileFilter() == MainFrameApplication.nhxfilter ) { - exception = writeAsNHX( t, exception, file ); - } else if ( _save_filechooser.getFileFilter() == MainFrameApplication.xmlfilter ) { exception = writeAsPhyloXml( t, exception, file ); } @@ -2576,9 +2560,6 @@ public final class MainFrameApplication extends MainFrame { || file_name.endsWith( ".tree" ) ) { exception = writeAsNewHampshire( t, exception, file ); } - else if ( file_name.endsWith( ".nhx" ) ) { - exception = writeAsNHX( t, exception, file ); - } else if ( file_name.endsWith( ".nex" ) || file_name.endsWith( ".nexus" ) ) { exception = writeAsNexus( t, exception, file ); } -- 1.7.10.2