iterating nh parser

[jalview.git] / forester / java / src / org / forester / archaeopteryx / AptxUtil.java

diff --git a/forester/java/src/org/forester/archaeopteryx/AptxUtil.java b/forester/java/src/org/forester/archaeopteryx/AptxUtil.java
index e60bc2c..7dc6243 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/AptxUtil.java
+++ b/forester/java/src/org/forester/archaeopteryx/AptxUtil.java
@@ -21,7 +21,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
+
+
 
 package org.forester.archaeopteryx;
 
@@ -947,30 +949,52 @@ public final class AptxUtil {
         }
     }
 
-    final static void unexpectedError( final Error err ) {
-        err.printStackTrace();
+    final static void unexpectedError( final Error e ) {
+        System.err.println();
+        e.printStackTrace( System.err );
+        System.err.println();
         final StringBuffer sb = new StringBuffer();
-        for( final StackTraceElement s : err.getStackTrace() ) {
+        for( final StackTraceElement s : e.getStackTrace() ) {
             sb.append( s + "\n" );
         }
         JOptionPane
                 .showMessageDialog( null,
                                     "An unexpected (possibly severe) error has occured - terminating. \nPlease contact: "
-                                            + Constants.AUTHOR_EMAIL + " \nError: " + err + "\n" + sb,
+                                            + Constants.AUTHOR_EMAIL + " \nError: " + e.getLocalizedMessage() + "\n"
+                                            + sb,
                                     "Unexpected Severe Error [" + Constants.PRG_NAME + " " + Constants.VERSION + "]",
                                     JOptionPane.ERROR_MESSAGE );
         System.exit( -1 );
     }
 
-    final static void unexpectedException( final Exception ex ) {
-        ex.printStackTrace();
+    final static void outOfMemoryError( final OutOfMemoryError e ) {
+        System.err.println();
+        System.err.println( "Java memory allocation might be too small, try \"-Xmx2048m\" java command line option" );
+        System.err.println();
+        e.printStackTrace();
+        System.err.println();
+        JOptionPane.showMessageDialog( null,
+                                       "Java memory allocation might be too small, try \"-Xmx2048m\" java command line option"
+                                               + "\n\nError: " + e.getLocalizedMessage(),
+                                       "Out of Memory Error [" + Constants.PRG_NAME + " " + Constants.VERSION + "]",
+                                       JOptionPane.ERROR_MESSAGE );
+        System.exit( -1 );
+    }
+
+    final static void unexpectedException( final Exception e ) {
+        System.err.println();
+        e.printStackTrace( System.err );
+        System.err.println();
         final StringBuffer sb = new StringBuffer();
-        for( final StackTraceElement s : ex.getStackTrace() ) {
+        for( final StackTraceElement s : e.getStackTrace() ) {
             sb.append( s + "\n" );
         }
-        JOptionPane.showMessageDialog( null, "An unexpected exception has occured. \nPlease contact: "
-                + Constants.AUTHOR_EMAIL + " \nException: " + ex + "\n" + sb, "Unexpected Exception ["
-                + Constants.PRG_NAME + Constants.VERSION + "]", JOptionPane.ERROR_MESSAGE );
+        JOptionPane.showMessageDialog( null,
+                                       "An unexpected exception has occured. \nPlease contact: "
+                                               + Constants.AUTHOR_EMAIL + " \nException: " + e.getLocalizedMessage()
+                                               + "\n" + sb,
+                                       "Unexpected Exception [" + Constants.PRG_NAME + Constants.VERSION + "]",
+                                       JOptionPane.ERROR_MESSAGE );
     }
 
     final static String writePhylogenyToGraphicsByteArrayOutputStream( final ByteArrayOutputStream baos,