X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FAWTConsole.java;h=cf44dcbf8cdc30537aa5fd33c7761d4130d95fd0;hb=1d1edb58c9ee8baec12686a512eb18d97b9bdba1;hp=871b4806e86f8b7b0c55f74129c1c0e6ade7235d;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git

diff --git a/src/jalview/util/AWTConsole.java b/src/jalview/util/AWTConsole.java
index 871b480..cf44dcb 100644
--- a/src/jalview/util/AWTConsole.java
+++ b/src/jalview/util/AWTConsole.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -30,12 +30,28 @@ package jalview.util;
 //
 // RJHM van den Bergh , rvdb@comweb.nl
 
-import java.io.*;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GraphicsEnvironment;
+import java.awt.Panel;
+import java.awt.TextArea;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
 
-public class AWTConsole extends WindowAdapter implements WindowListener,
-        ActionListener, Runnable
+import jalview.bin.Jalview;
+
+public class AWTConsole extends WindowAdapter
+        implements WindowListener, ActionListener, Runnable
 {
   private Frame frame;
 
@@ -58,10 +74,10 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
     // create all components and add them
     frame = new Frame("Java Console");
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-    Dimension frameSize = new Dimension((int) (screenSize.width / 2),
-            (int) (screenSize.height / 2));
-    int x = (int) (frameSize.width / 2);
-    int y = (int) (frameSize.height / 2);
+    Dimension frameSize = new Dimension(screenSize.width / 2,
+            screenSize.height / 2);
+    int x = frameSize.width / 2;
+    int y = frameSize.height / 2;
     frame.setBounds(x, y, frameSize.width, frameSize.height);
 
     textArea = new TextArea();
@@ -128,7 +144,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
             .getLocalGraphicsEnvironment();
     String[] fontNames = ge.getAvailableFontFamilyNames();
     for (int n = 0; n < fontNames.length; n++)
+    {
       System.out.println(fontNames[n]);
+    }
     // Testing part: simple an error thrown anywhere in this JVM will be printed
     // on the Console
     // We do it with a seperate Thread becasue we don't wan't to break a Thread
@@ -139,6 +157,7 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
     errorThrower.start();
   }
 
+  @Override
   public synchronized void windowClosed(WindowEvent evt)
   {
     quit = true;
@@ -157,20 +176,23 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
     } catch (Exception e)
     {
     }
-    System.exit(0);
+    Jalview.exit("Window closing. Bye!", 0);
   }
 
+  @Override
   public synchronized void windowClosing(WindowEvent evt)
   {
     frame.setVisible(false); // default behaviour of JFrame
     frame.dispose();
   }
 
+  @Override
   public synchronized void actionPerformed(ActionEvent evt)
   {
     textArea.setText("");
   }
 
+  @Override
   public synchronized void run()
   {
     try
@@ -189,7 +211,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
           textArea.append(input);
         }
         if (quit)
+        {
           return;
+        }
       }
 
       while (Thread.currentThread() == reader2)
@@ -206,7 +230,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
           textArea.append(input);
         }
         if (quit)
+        {
           return;
+        }
       }
     } catch (Exception e)
     {
@@ -223,7 +249,8 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
       } catch (InterruptedException ie)
       {
       }
-      throw new NullPointerException(MessageManager.getString("exception.application_test_npe"));
+      throw new NullPointerException(
+              MessageManager.getString("exception.application_test_npe"));
     }
 
   }
@@ -236,7 +263,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
     {
       int available = in.available();
       if (available == 0)
+      {
         break;
+      }
       byte b[] = new byte[available];
       in.read(b);
       input = input + new String(b, 0, b.length);
@@ -244,6 +273,11 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
     return input;
   }
 
+  /**
+   * 
+   * @param arg
+   * @j2sIgnore
+   */
   public static void main(String[] arg)
   {
     new AWTConsole(); // create console with not reference