X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FAWTConsole.java;h=6fa7c5c7f6bd606388994e3cd7353e1d08dc1783;hb=ca160187a050f6d4e50158cd5b51f75c83a7179e;hp=045183dc6ceb46caf12bb82b71e8047d257e53e6;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/util/AWTConsole.java b/src/jalview/util/AWTConsole.java
index 045183d..6fa7c5c 100644
--- a/src/jalview/util/AWTConsole.java
+++ b/src/jalview/util/AWTConsole.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.util;
@@ -27,12 +30,29 @@ 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;
+import jalview.bin.Jalview.ExitCode;
+
+public class AWTConsole extends WindowAdapter
+ implements WindowListener, ActionListener, Runnable
{
private Frame frame;
@@ -55,10 +75,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();
@@ -119,23 +139,26 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
// testing part
// you may omit this part for your application
//
- System.out.println("Hello World 2");
- System.out.println("All fonts available to Graphic2D:\n");
+ jalview.bin.Console.outPrintln("Hello World 2");
+ jalview.bin.Console.outPrintln("All fonts available to Graphic2D:\n");
GraphicsEnvironment ge = GraphicsEnvironment
.getLocalGraphicsEnvironment();
String[] fontNames = ge.getAvailableFontFamilyNames();
for (int n = 0; n < fontNames.length; n++)
- System.out.println(fontNames[n]);
+ {
+ jalview.bin.Console.outPrintln(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
// used by the Console.
- System.out.println("\nLets throw an error on this console");
+ jalview.bin.Console.outPrintln("\nLets throw an error on this console");
errorThrower = new Thread(this);
errorThrower.setDaemon(true);
errorThrower.start();
}
+ @Override
public synchronized void windowClosed(WindowEvent evt)
{
quit = true;
@@ -154,20 +177,23 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
} catch (Exception e)
{
}
- System.exit(0);
+ Jalview.exit("Window closing. Bye!", ExitCode.OK);
}
+ @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
@@ -186,7 +212,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
textArea.append(input);
}
if (quit)
+ {
return;
+ }
}
while (Thread.currentThread() == reader2)
@@ -203,7 +231,9 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
textArea.append(input);
}
if (quit)
+ {
return;
+ }
}
} catch (Exception e)
{
@@ -221,7 +251,7 @@ public class AWTConsole extends WindowAdapter implements WindowListener,
{
}
throw new NullPointerException(
- "Application test: throwing an NullPointerException It should arrive at the console");
+ MessageManager.getString("exception.application_test_npe"));
}
}
@@ -234,7 +264,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);
@@ -242,6 +274,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