git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3066 Fix NullPointerException thrown when showing HMMER run dialog
[jalview.git]
/
src
/
jalview
/
gui
/
Console.java
diff --git
a/src/jalview/gui/Console.java
b/src/jalview/gui/Console.java
index
f0ef2f3
..
2e88eeb
100644
(file)
--- a/
src/jalview/gui/Console.java
+++ b/
src/jalview/gui/Console.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 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.
*
*
* This file is part of Jalview.
*
@@
-53,8
+53,8
@@
import org.apache.log4j.SimpleLayout;
* own applications RJHM van den Bergh , rvdb@comweb.nl
*/
* own applications RJHM van den Bergh , rvdb@comweb.nl
*/
-public class Console extends WindowAdapter implements WindowListener,
- ActionListener, Runnable
+public class Console extends WindowAdapter
+ implements WindowListener, ActionListener, Runnable
{
private JFrame frame;
{
private JFrame frame;
@@
-84,6
+84,10
@@
public class Console extends WindowAdapter implements WindowListener,
// are we attached to some parent Desktop
Desktop parent = null;
// are we attached to some parent Desktop
Desktop parent = null;
+ private int MIN_WIDTH = 300;
+
+ private int MIN_HEIGHT = 250;
+
public Console()
{
// create all components and add them
public Console()
{
// create all components and add them
@@
-243,7
+247,9
@@
public class Console extends WindowAdapter implements WindowListener,
.getLocalGraphicsEnvironment();
String[] fontNames = ge.getAvailableFontFamilyNames();
for (int n = 0; n < fontNames.length; n++)
.getLocalGraphicsEnvironment();
String[] fontNames = ge.getAvailableFontFamilyNames();
for (int n = 0; n < fontNames.length; n++)
+ {
System.out.println(fontNames[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
// 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
@@
-259,9
+265,13
@@
public class Console extends WindowAdapter implements WindowListener,
JFrame frame = new JFrame(string);
frame.setName(string);
if (x == -1)
JFrame frame = new JFrame(string);
frame.setName(string);
if (x == -1)
- x = (int) (i / 2);
+ {
+ x = i / 2;
+ }
if (y == -1)
if (y == -1)
- y = (int) (j / 2);
+ {
+ y = j / 2;
+ }
frame.setBounds(x, y, i, j);
return frame;
}
frame.setBounds(x, y, i, j);
return frame;
}
@@
-295,9
+305,10
@@
public class Console extends WindowAdapter implements WindowListener,
}
else
{
}
else
{
- frame = initFrame("Jalview Java Console", bounds.width,
- bounds.height, bounds.x, bounds.y);
+ frame = initFrame("Jalview Java Console", bounds.width, bounds.height,
+ bounds.x, bounds.y);
}
}
+ frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
// desktop.add(frame);
initConsole(false);
JalviewAppender jappender = new JalviewAppender();
// desktop.add(frame);
initConsole(false);
JalviewAppender jappender = new JalviewAppender();
@@
-345,6
+356,7
@@
public class Console extends WindowAdapter implements WindowListener,
// System.exit(0);
}
// System.exit(0);
}
+ @Override
public synchronized void windowClosed(WindowEvent evt)
{
frame.setVisible(false);
public synchronized void windowClosed(WindowEvent evt)
{
frame.setVisible(false);
@@
-365,6
+377,7
@@
public class Console extends WindowAdapter implements WindowListener,
}
}
}
}
+ @Override
public synchronized void windowClosing(WindowEvent evt)
{
frame.setVisible(false); // default behaviour of JFrame
public synchronized void windowClosing(WindowEvent evt)
{
frame.setVisible(false); // default behaviour of JFrame
@@
-373,12
+386,14
@@
public class Console extends WindowAdapter implements WindowListener,
// frame.dispose();
}
// frame.dispose();
}
+ @Override
public synchronized void actionPerformed(ActionEvent evt)
{
trimBuffer(true);
// textArea.setText("");
}
public synchronized void actionPerformed(ActionEvent evt)
{
trimBuffer(true);
// textArea.setText("");
}
+ @Override
public synchronized void run()
{
try
public synchronized void run()
{
try
@@
-410,7
+425,9
@@
public class Console extends WindowAdapter implements WindowListener,
// lines++;
}
if (quit)
// lines++;
}
if (quit)
+ {
return;
return;
+ }
}
while (Thread.currentThread() == reader2)
}
while (Thread.currentThread() == reader2)
@@
-439,7
+456,9
@@
public class Console extends WindowAdapter implements WindowListener,
// lines++;
}
if (quit)
// lines++;
}
if (quit)
+ {
return;
return;
+ }
}
while (Thread.currentThread() == textAppender)
{
}
while (Thread.currentThread() == textAppender)
{
@@
-478,7
+497,6
@@
public class Console extends WindowAdapter implements WindowListener,
} catch (InterruptedException e)
{
}
} catch (InterruptedException e)
{
}
- ;
}
}
else
}
}
else
@@
-503,8
+521,8
@@
public class Console extends WindowAdapter implements WindowListener,
textArea.append("The error is: " + e.getMessage());
// Need to uncomment this to ensure that line tally is synched.
// lines += 2;
textArea.append("The error is: " + e.getMessage());
// Need to uncomment this to ensure that line tally is synched.
// lines += 2;
- stderr.println("Console reports an Internal error.\nThe error is: "
- + e);
+ stderr.println(
+ "Console reports an Internal error.\nThe error is: " + e);
}
// just for testing (Throw a Nullpointer after 1 second)
}
// just for testing (Throw a Nullpointer after 1 second)
@@
-531,6
+549,7
@@
public class Console extends WindowAdapter implements WindowListener,
long time = System.nanoTime();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
long time = System.nanoTime();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
displayPipe.append(input); // change to stringBuffer
public void run()
{
displayPipe.append(input); // change to stringBuffer
@@
-598,7
+617,9
@@
public class Console extends WindowAdapter implements WindowListener,
{
int available = in.available();
if (available == 0)
{
int available = in.available();
if (available == 0)
+ {
break;
break;
+ }
byte b[] = new byte[available];
in.read(b);
input = input + new String(b, 0, b.length);
byte b[] = new byte[available];
in.read(b);
input = input + new String(b, 0, b.length);
@@
-611,6
+632,10
@@
public class Console extends WindowAdapter implements WindowListener,
return input;
}
return input;
}
+ /**
+ * @j2sIgnore
+ * @param arg
+ */
public static void main(String[] arg)
{
new Console().test(); // create console with not reference
public static void main(String[] arg)
{
new Console().test(); // create console with not reference