Skip to content

Patch for Issue #645 - When running some "Screen" Junit tests, junit crashes with IllegalArgumentException #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Orbisman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch for Issue #645 - When running some "Screen" Junit tests, junit crashes with IllegalArgumentException #647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main/java/com/googlecode/lanterna/terminal/swing/SwingTerminalFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ public SwingTerminalFrame(String title,
private SwingTerminalFrame(String title, SwingTerminal swingTerminal, TerminalEmulatorAutoCloseTrigger... autoCloseTriggers) {
super(title != null ? title : "SwingTerminalFrame");
this.swingTerminal = swingTerminal;
this.autoCloseTriggers = EnumSet.copyOf(Arrays.asList(autoCloseTriggers));
if (autoCloseTriggers != null && autoCloseTriggers.length > 0)
{
this.autoCloseTriggers = EnumSet.copyOf(Arrays.asList(autoCloseTriggers));
}
else this.autoCloseTriggers = null;
this.disposed = false;

getContentPane().setLayout(new BorderLayout());
Expand Down Expand Up @@ -228,9 +232,11 @@ public KeyStroke pollInput() {
return new KeyStroke(KeyType.EOF);
}
KeyStroke keyStroke = swingTerminal.pollInput();
if(autoCloseTriggers.contains(TerminalEmulatorAutoCloseTrigger.CLOSE_ON_ESCAPE) &&
keyStroke != null &&
keyStroke.getKeyType() == KeyType.ESCAPE) {
if(autoCloseTriggers != null &&
autoCloseTriggers.contains(TerminalEmulatorAutoCloseTrigger.CLOSE_ON_ESCAPE) &&
keyStroke != null &&
keyStroke.getKeyType() == KeyType.ESCAPE)
{
dispose();
}
return keyStroke;
Expand All @@ -249,7 +255,9 @@ public void enterPrivateMode() {
@Override
public void exitPrivateMode() {
swingTerminal.exitPrivateMode();
if(autoCloseTriggers.contains(TerminalEmulatorAutoCloseTrigger.CLOSE_ON_EXIT_PRIVATE_MODE)) {
if(autoCloseTriggers != null &&
autoCloseTriggers.contains(TerminalEmulatorAutoCloseTrigger.CLOSE_ON_EXIT_PRIVATE_MODE))
{
dispose();
}
}
Expand Down