X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FAWTConsole.java;h=9286794f0c9df36634ca7ae6f84f52fdf465d5d7;hb=71a3cc0202bd8b731f01e5706372e9bae047d592;hp=7a585bedd0bd87a296d1747de6513ae05360d5c1;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/util/AWTConsole.java b/src/jalview/util/AWTConsole.java index 7a585be..9286794 100644 --- a/src/jalview/util/AWTConsole.java +++ b/src/jalview/util/AWTConsole.java @@ -48,8 +48,8 @@ import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.io.PrintStream; -public class AWTConsole extends WindowAdapter implements WindowListener, - ActionListener, Runnable +public class AWTConsole extends WindowAdapter + implements WindowListener, ActionListener, Runnable { private Frame frame; @@ -72,10 +72,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(); @@ -142,7 +142,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 @@ -153,6 +155,7 @@ public class AWTConsole extends WindowAdapter implements WindowListener, errorThrower.start(); } + @Override public synchronized void windowClosed(WindowEvent evt) { quit = true; @@ -174,17 +177,20 @@ public class AWTConsole extends WindowAdapter implements WindowListener, System.exit(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 @@ -203,7 +209,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener, textArea.append(input); } if (quit) + { return; + } } while (Thread.currentThread() == reader2) @@ -220,7 +228,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener, textArea.append(input); } if (quit) + { return; + } } } catch (Exception e) { @@ -251,7 +261,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); @@ -259,6 +271,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