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
new _j2sclasslist.txt for tab-focus
[jalview.git]
/
src
/
jalview
/
gui
/
Console.java
diff --git
a/src/jalview/gui/Console.java
b/src/jalview/gui/Console.java
index
de7574c
..
f44dae1
100644
(file)
--- a/
src/jalview/gui/Console.java
+++ b/
src/jalview/gui/Console.java
@@
-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;
@@
-136,7
+136,7
@@
public class Console extends WindowAdapter implements WindowListener,
}
quit = false; // signals the Threads that they should exit
}
quit = false; // signals the Threads that they should exit
- // Starting two seperate threads to read from the PipedInputStreams
+ // Starting two separate threads to read from the PipedInputStreams
//
reader = new Thread(this);
reader.setDaemon(true);
//
reader = new Thread(this);
reader.setDaemon(true);
@@
-305,15
+305,16
@@
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();
jappender.setLayout(new SimpleLayout());
}
frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
// desktop.add(frame);
initConsole(false);
JalviewAppender jappender = new JalviewAppender();
jappender.setLayout(new SimpleLayout());
- JalviewAppender.setTextArea(textArea);
+ // BH 2019 JalviewAppender.setTextArea(textArea);
+ jappender.setTextArea(textArea);
org.apache.log4j.Logger.getRootLogger().addAppender(jappender);
}
org.apache.log4j.Logger.getRootLogger().addAppender(jappender);
}
@@
-497,7
+498,6
@@
public class Console extends WindowAdapter implements WindowListener,
} catch (InterruptedException e)
{
}
} catch (InterruptedException e)
{
}
- ;
}
}
else
}
}
else
@@
-522,8
+522,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)
@@
-633,6
+633,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