- * The sending of command is done in two phases. Define the input through get - * and set, and then validate the input. - * - * @author Emmanuel Bigeon */ -public interface ConsoleDelayIO { - /** Get the input text. - * @return the non validated input */ - String getInput(); - - /** Set the input text. - * - * @param input the input to set */ - void setInput(String input); - - /** Actually send the input as the prompt next input. */ - void validateInput(); -} +/* + * GCLC swt, provide a swt window for console applications + * Copyright (C) 2015-2017 E. Bigeon + * mailto:emmanuel@bigeon.fr + * + * This software is governed by the CeCILL license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/or redistribute the software under the terms of the CeCILL + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * The fact that you are presently reading this means that you have had + * knowledge of the CeCILL license and that you accept its terms. + */ +/** + * gclc-swt:net.bigeon.gclc.swt.ConsoleDelayIO.java + * Created on: Nov 19, 2016 + */ +package net.bigeon.gclc.swt; + +/*- + * #%L + * GCLC swt + * %% + * Copyright (C) 2015 - 2018 Bigeon + * %% + * This software is governed by the CeCILL license under French law and + * abiding by the rules of distribution of free software. You can use, + * modify and/ or redistribute the software under the terms of the CeCILL + * license as circulated by CEA, CNRS and INRIA at the following URL + * "http://www.cecill.info". + * + * As a counterpart to the access to the source code and rights to copy, + * modify and redistribute granted by the license, users are provided only + * with a limited warranty and the software's author, the holder of the + * economic rights, and the successive licensors have only limited + * liability. + * + * In this respect, the user's attention is drawn to the risks associated + * with loading, using, modifying and/or developing or reproducing the + * software by the user in light of its specific status of free software, + * that may mean that it is complicated to manipulate, and that also + * therefore means that it is reserved for developers and experienced + * professionals having in-depth computer knowledge. Users are therefore + * encouraged to load and test the software's suitability as regards their + * requirements in conditions enabling the security of their systems and/or + * data to be ensured and, more generally, to use and operate it in the + * same conditions as regards security. + * + * The fact that you are presently reading this means that you have had + * knowledge of the CeCILL license and that you accept its terms. + * #L% + */ +/** This class represents an object used to send commands to a console + * application. + *
+ * The sending of command is done in two phases. Define the input through get
+ * and set, and then validate the input.
+ *
+ * @author Emmanuel Bigeon */
+public interface ConsoleDelayIO {
+ /** Get the input text.
+ * @return the non validated input */
+ String getInput();
+
+ /** Set the input text.
+ *
+ * @param input the input to set */
+ void setInput(String input);
+
+ /** Actually send the input as the prompt next input. */
+ void validateInput();
+}
diff --git a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/HistoryTextKeyListener.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
similarity index 69%
rename from gclc-swt/src/main/java/fr/bigeon/gclc/swt/HistoryTextKeyListener.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
index 2b398d9..9d91bb2 100644
--- a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/HistoryTextKeyListener.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/HistoryTextKeyListener.java
@@ -1,112 +1,145 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.HistoryTextKeyListener.java
- * Created on: Jun 9, 2016
- */
-package fr.bigeon.gclc.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-
-import net.bigeon.collections.ArrayRibbon;
-import net.bigeon.collections.Ribbon;
-
-/** A key listener to validate commands and manage the history of commands.
- *
- * @author Emmanuel Bigeon */
-public final class HistoryTextKeyListener extends KeyAdapter {
-
- /** The size of commands history. */
- private static final int DEFAULT_HISTORY_SIZE = 10;
- /** The empty string constant. */
- private static final String EMPTY = ""; //$NON-NLS-1$
- /** The history ribbon. */
- private final Ribbon
- *
- * @author Emmanuel Bigeon */
-public final class SWTConsole extends Composite
- implements ConsoleDelayIO, ConsoleInput, ConsoleOutput {
- /** The number of columns of the layout. */
- private static final int LAYOUT_NB_COLUMNS = 2;
- /** The cmd prefix in the output console. */
- private static final String CMD_PREFIX = "[CMD] "; //$NON-NLS-1$
- /** The class logger. */
- private static final Logger LOGGER = Logger
- .getLogger(SWTConsole.class.getName());
- /** The empty string constant. */
- private static final String EMPTY = ""; //$NON-NLS-1$
- /** The console output text field. */
- private final Text consoleOutput;
- /** The console input text field. */
- private final Text consoleInput;
- /** The prompt label. */
- private final Label lblPromptlabel;
- /** The prompt text. */
- private StringProvider prompt = new ConstantString("> "); //$NON-NLS-1$
- /** The command entered by the user. */
- private String command = null;
- /** If the prompt should be active. */
- private boolean prompting = false;
- /** The object for thread synchronization with the prompt. */
- private final Object promptLock = new Object();
-
- /** Create the composite.
- *
- * @param parent the prent composite
- * @param style the composite style */
- public SWTConsole(final Composite parent, final int style) {
- super(parent, style);
-
- setLayout(new GridLayout(LAYOUT_NB_COLUMNS, false));
-
- consoleOutput = new Text(this,
- SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
- consoleOutput.setLayoutData(
- new GridData(SWT.FILL, SWT.FILL, true, true, LAYOUT_NB_COLUMNS, 1));
- consoleOutput.setRedraw(true);
-
- lblPromptlabel = new Label(this, SWT.NONE);
- lblPromptlabel.setText(prompt.apply());
-
- consoleInput = new Text(this, SWT.BORDER);
- consoleInput.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
- consoleInput.addKeyListener(new HistoryTextKeyListener(this));
-
- }
-
- @Override
- protected void checkSubclass() {
- // Disable the check that prevents subclassing of SWT components
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
- @Override
- public void close() {
- synchronized (promptLock) {
- prompting = false;
- promptLock.notifyAll();
- }
- if (consoleInput.isDisposed()) {
- return;
- }
- consoleInput.setEnabled(false);
- consoleOutput.setEnabled(false);
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
- @Override
- public String getInput() {
- return consoleInput.getText();
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#getPrompt() */
- @Override
- public StringProvider getPrompt() {
- return prompt;
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
- @Override
- public void interruptPrompt() {
- synchronized (promptLock) {
- promptLock.notifyAll();
- }
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
- @Override
- public boolean isClosed() {
- return isDisposed();
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#print(java.lang.String) */
- @Override
- public void print(final String text) throws IOException {
- if (isDisposed()) {
- throw new IOException();
- }
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- consoleOutput.append(text);
- }
- }
- });
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#println() */
- @Override
- public void println() throws IOException {
- if (isDisposed()) {
- throw new IOException();
- }
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- consoleOutput.append(System.lineSeparator());
- }
- }
- });
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#println(java.lang.String) */
- @Override
- public void println(final String message) throws IOException {
- if (isDisposed()) {
- throw new IOException();
- }
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- consoleOutput.append(message + System.lineSeparator());
- }
- }
- });
-
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#prompt() */
- @Override
- public String prompt() throws IOException {
- synchronized (promptLock) {
- if (isDisposed()) {
- throw new IOException();
- }
- try {
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- if (!consoleInput.isDisposed()) {
- consoleInput.setEnabled(true);
- lblPromptlabel.setText(prompt.apply());
- // relayout
- SWTConsole.this.layout();
- consoleInput.setFocus();
- }
- }
- });
- prompting = true;
- promptLock.notifyAll();
- while (prompting) {
- promptLock.wait();
- }
- } catch (final InterruptedException e) {
- LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
- command = null;
- Thread.currentThread().interrupt();
- }
- }
- if (isDisposed()) {
- throw new IOException("Input closed"); //$NON-NLS-1$
- }
- return command;
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
- @Override
- public String prompt(final long timeout) throws IOException {
- synchronized (promptLock) {
- if (isDisposed()) {
- throw new IOException();
- }
- try {
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- if (!consoleInput.isDisposed()) {
- consoleInput.setEnabled(true);
- lblPromptlabel.setText(prompt.apply());
- // relayout
- SWTConsole.this.layout();
- consoleInput.setFocus();
- }
- }
- });
- prompting = true;
- command = null;
- promptLock.notifyAll();
- final long start = System.currentTimeMillis();
- long cur = start;
- while (prompting && start + timeout>cur) {
- promptLock.wait((cur-start-timeout)/2);
- cur = System.currentTimeMillis();
- }
- } catch (final InterruptedException e) {
- LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
- command = null;
- Thread.currentThread().interrupt();
- }
- }
- if (isDisposed()) {
- throw new IOException("Input closed"); //$NON-NLS-1$
- }
- return command;
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#prompt(java.lang.String) */
- @Override
- public String prompt(final String message) throws IOException {
- synchronized (promptLock) {
- if (isDisposed()) {
- throw new IOException();
- }
- try {
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- lblPromptlabel.setText(message);
- // relayout
- SWTConsole.this.layout();
- consoleInput.setEnabled(true);
- consoleInput.setFocus();
- }
- }
- });
- prompting = true;
- promptLock.wait();
- if (isDisposed()) {
- throw new IOException();
- }
- } catch (final InterruptedException e) {
- LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
- command = null;
- Thread.currentThread().interrupt();
- } finally {
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- lblPromptlabel.setText(prompt.apply());
- // relayout
- SWTConsole.this.layout();
- }
- }
- });
- }
- }
- return command;
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(java.lang.String, long) */
- @Override
- public String prompt(final String message, final long timeout) throws IOException {
- // TODO Auto-generated method stub
- // return null;
- throw new RuntimeException("Not implemented yet");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Composite#setFocus() */
- @Override
- public boolean setFocus() {
- return consoleInput.setFocus();
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
- @Override
- public void setInput(final String input) {
- consoleInput.setText(input);
- consoleInput.setSelection(input.length());
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.ConsoleManager#setPrompt(java.lang.String) */
- @Override
- public void setPrompt(final StringProvider prompt) {
- this.prompt = prompt;
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- if (!consoleOutput.isDisposed()) {
- lblPromptlabel.setText(prompt.apply());
- // relayout
- SWTConsole.this.layout();
- }
- }
- });
- }
-
- @Override
- public void setPrompt(String prompt) {
- setPrompt(new ConstantString(prompt));
- }
-
- /** @param string the text */
- public void setText(final String string) {
- consoleInput.setText(string);
- }
-
- /**
- *
- */
- public void validateCommand() {
- validateInput();
- }
-
- /**
- *
- */
- @Override
- public void validateInput() {
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- consoleInput.setEnabled(false);
- }
- });
- synchronized (promptLock) {
- while (!prompting) {
- try {
- promptLock.wait();
- } catch (final InterruptedException e) {
- LOGGER.log(Level.SEVERE, "Interruption while waiting prompt", e); //$NON-NLS-1$
- }
- }
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- command = consoleInput.getText();
- prompting = false;
- consoleInput.setText(EMPTY);
- consoleOutput.append(CMD_PREFIX + command + System.lineSeparator());
- }
- });
- promptLock.notifyAll();
- }
- }
-
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsole.java
+ * Created on: Apr 18, 2015
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+import net.bigeon.gclc.ConsoleApplication;
+import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.tools.ConstantString;
+import net.bigeon.gclc.tools.StringProvider;
+
+/** A SWT component to connect to gclc {@link ConsoleApplication}.
+ *
+ *
+ * @author Emmanuel Bigeon */
+public final class SWTConsole extends Composite
+ implements ConsoleDelayIO, ConsoleInput, ConsoleOutput {
+ /** The number of columns of the layout. */
+ private static final int LAYOUT_NB_COLUMNS = 2;
+ /** The cmd prefix in the output console. */
+ private static final String CMD_PREFIX = "[CMD] "; //$NON-NLS-1$
+ /** The class logger. */
+ private static final Logger LOGGER = Logger
+ .getLogger(SWTConsole.class.getName());
+ /** The empty string constant. */
+ private static final String EMPTY = ""; //$NON-NLS-1$
+ /** The console output text field. */
+ private final Text consoleOutput;
+ /** The console input text field. */
+ private final Text consoleInput;
+ /** The prompt label. */
+ private final Label lblPromptlabel;
+ /** The prompt text. */
+ private StringProvider prompt = new ConstantString("> "); //$NON-NLS-1$
+ /** The command entered by the user. */
+ private String command = null;
+ /** If the prompt should be active. */
+ private boolean prompting = false;
+ /** The object for thread synchronization with the prompt. */
+ private final Object promptLock = new Object();
+
+ /** Create the composite.
+ *
+ * @param parent the prent composite
+ * @param style the composite style */
+ public SWTConsole(final Composite parent, final int style) {
+ super(parent, style);
+
+ setLayout(new GridLayout(LAYOUT_NB_COLUMNS, false));
+
+ consoleOutput = new Text(this,
+ SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
+ consoleOutput.setLayoutData(
+ new GridData(SWT.FILL, SWT.FILL, true, true, LAYOUT_NB_COLUMNS, 1));
+ consoleOutput.setRedraw(true);
+
+ lblPromptlabel = new Label(this, SWT.NONE);
+ lblPromptlabel.setText(prompt.apply());
+
+ consoleInput = new Text(this, SWT.BORDER);
+ consoleInput.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+ consoleInput.addKeyListener(new HistoryTextKeyListener(this));
+
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleManager#close() */
+ @Override
+ public void close() {
+ synchronized (promptLock) {
+ prompting = false;
+ promptLock.notifyAll();
+ }
+ if (consoleInput.isDisposed()) {
+ return;
+ }
+ consoleInput.setEnabled(false);
+ consoleOutput.setEnabled(false);
+ }
+
+ /* (non-Javadoc)
+ * @see net.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+ @Override
+ public String getInput() {
+ return consoleInput.getText();
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#getPrompt() */
+ @Override
+ public StringProvider getPrompt() {
+ return prompt;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleManager#interruptPrompt() */
+ @Override
+ public void interruptPrompt() {
+ synchronized (promptLock) {
+ promptLock.notifyAll();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleManager#isClosed() */
+ @Override
+ public boolean isClosed() {
+ return isDisposed();
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#print(java.lang.String) */
+ @Override
+ public void print(final String text) throws IOException {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ consoleOutput.append(text);
+ }
+ }
+ });
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#println() */
+ @Override
+ public void println() throws IOException {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ consoleOutput.append(System.lineSeparator());
+ }
+ }
+ });
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#println(java.lang.String) */
+ @Override
+ public void println(final String message) throws IOException {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ consoleOutput.append(message + System.lineSeparator());
+ }
+ }
+ });
+
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#prompt() */
+ @Override
+ public String prompt() throws IOException {
+ synchronized (promptLock) {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ try {
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ if (!consoleInput.isDisposed()) {
+ consoleInput.setEnabled(true);
+ lblPromptlabel.setText(prompt.apply());
+ // relayout
+ SWTConsole.this.layout();
+ consoleInput.setFocus();
+ }
+ }
+ });
+ prompting = true;
+ promptLock.notifyAll();
+ while (prompting) {
+ promptLock.wait();
+ }
+ } catch (final InterruptedException e) {
+ LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
+ command = null;
+ Thread.currentThread().interrupt();
+ }
+ }
+ if (isDisposed()) {
+ throw new IOException("Input closed"); //$NON-NLS-1$
+ }
+ return command;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */
+ @Override
+ public String prompt(final long timeout) throws IOException {
+ synchronized (promptLock) {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ try {
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ if (!consoleInput.isDisposed()) {
+ consoleInput.setEnabled(true);
+ lblPromptlabel.setText(prompt.apply());
+ // relayout
+ SWTConsole.this.layout();
+ consoleInput.setFocus();
+ }
+ }
+ });
+ prompting = true;
+ command = null;
+ promptLock.notifyAll();
+ final long start = System.currentTimeMillis();
+ long cur = start;
+ while (prompting && start + timeout>cur) {
+ promptLock.wait((cur-start-timeout)/2);
+ cur = System.currentTimeMillis();
+ }
+ } catch (final InterruptedException e) {
+ LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
+ command = null;
+ Thread.currentThread().interrupt();
+ }
+ }
+ if (isDisposed()) {
+ throw new IOException("Input closed"); //$NON-NLS-1$
+ }
+ return command;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#prompt(java.lang.String) */
+ @Override
+ public String prompt(final String message) throws IOException {
+ synchronized (promptLock) {
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ try {
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ lblPromptlabel.setText(message);
+ // relayout
+ SWTConsole.this.layout();
+ consoleInput.setEnabled(true);
+ consoleInput.setFocus();
+ }
+ }
+ });
+ prompting = true;
+ promptLock.wait();
+ if (isDisposed()) {
+ throw new IOException();
+ }
+ } catch (final InterruptedException e) {
+ LOGGER.log(Level.WARNING, "Error in synchronization of prompting", e); //$NON-NLS-1$
+ command = null;
+ Thread.currentThread().interrupt();
+ } finally {
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ lblPromptlabel.setText(prompt.apply());
+ // relayout
+ SWTConsole.this.layout();
+ }
+ }
+ });
+ }
+ }
+ return command;
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(java.lang.String, long) */
+ @Override
+ public String prompt(final String message, final long timeout) throws IOException {
+ // TODO Auto-generated method stub
+ // return null;
+ throw new RuntimeException("Not implemented yet");
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.widgets.Composite#setFocus() */
+ @Override
+ public boolean setFocus() {
+ return consoleInput.setFocus();
+ }
+
+ /* (non-Javadoc)
+ * @see net.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
+ @Override
+ public void setInput(final String input) {
+ consoleInput.setText(input);
+ consoleInput.setSelection(input.length());
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.ConsoleManager#setPrompt(java.lang.String) */
+ @Override
+ public void setPrompt(final StringProvider prompt) {
+ this.prompt = prompt;
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ if (!consoleOutput.isDisposed()) {
+ lblPromptlabel.setText(prompt.apply());
+ // relayout
+ SWTConsole.this.layout();
+ }
+ }
+ });
+ }
+
+ @Override
+ public void setPrompt(String prompt) {
+ setPrompt(new ConstantString(prompt));
+ }
+
+ /** @param string the text */
+ public void setText(final String string) {
+ consoleInput.setText(string);
+ }
+
+ /**
+ *
+ */
+ public void validateCommand() {
+ validateInput();
+ }
+
+ /**
+ *
+ */
+ @Override
+ public void validateInput() {
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ consoleInput.setEnabled(false);
+ }
+ });
+ synchronized (promptLock) {
+ while (!prompting) {
+ try {
+ promptLock.wait();
+ } catch (final InterruptedException e) {
+ LOGGER.log(Level.SEVERE, "Interruption while waiting prompt", e); //$NON-NLS-1$
+ }
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ command = consoleInput.getText();
+ prompting = false;
+ consoleInput.setText(EMPTY);
+ consoleOutput.append(CMD_PREFIX + command + System.lineSeparator());
+ }
+ });
+ promptLock.notifyAll();
+ }
+ }
+
+}
diff --git a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleShell.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java
similarity index 61%
rename from gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleShell.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java
index aa0678b..4c16bd4 100644
--- a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleShell.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleShell.java
@@ -1,85 +1,118 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.SWTConsoleShell.java
- * Created on: Apr 18, 2015
- */
-package fr.bigeon.gclc.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/** A shell containing a {@link SWTConsole}
- *
- *
- * @author Emmanuel Bigeon */
-public final class SWTConsoleShell extends Shell {
-
- /** The console component */
- private SWTConsole console;
-
- /** Create the shell.
- *
- * @param display the display */
- public SWTConsoleShell(final Display display) {
- super(display, SWT.SHELL_TRIM);
- setLayout(new FillLayout(SWT.HORIZONTAL));
-
- createContents();
- }
-
- @Override
- protected void checkSubclass() {
- // Disable the check that prevents subclassing of SWT components
- }
-
- /** Create contents of the shell. */
- protected void createContents() {
- console = new SWTConsole(this, SWT.NONE);
- setText("Console Application"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Shell#dispose() */
- @Override
- public void dispose() {
- super.dispose();
- console.close();
- }
-
- /** @return the input and output. */
- public SWTConsole getManager() {
- return console;
- }
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShell.java
+ * Created on: Apr 18, 2015
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+/** A shell containing a {@link SWTConsole}
+ *
+ *
+ * @author Emmanuel Bigeon */
+public final class SWTConsoleShell extends Shell {
+
+ /** The console component */
+ private SWTConsole console;
+
+ /** Create the shell.
+ *
+ * @param display the display */
+ public SWTConsoleShell(final Display display) {
+ super(display, SWT.SHELL_TRIM);
+ setLayout(new FillLayout(SWT.HORIZONTAL));
+
+ createContents();
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ /** Create contents of the shell. */
+ protected void createContents() {
+ console = new SWTConsole(this, SWT.NONE);
+ setText("Console Application"); //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.widgets.Shell#dispose() */
+ @Override
+ public void dispose() {
+ super.dispose();
+ console.close();
+ }
+
+ /** @return the input and output. */
+ public SWTConsole getManager() {
+ return console;
+ }
+}
diff --git a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleView.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
similarity index 75%
rename from gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleView.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
index 7a37189..89b98e7 100644
--- a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleView.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
@@ -1,190 +1,223 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.SWTConsole.java
- * Created on: Apr 18, 2015
- */
-package fr.bigeon.gclc.swt;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.utils.AOutputForwardRunnable;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
-
-/** A SWT component to connect to gclc {@link ConsoleApplication}
- *
- *
- * @author Emmanuel Bigeon */
-public final class SWTConsoleView extends Composite implements ConsoleDelayIO {
- /** The local implementation of the forwarding runnable
- *
- * @author Emmanuel Bigeon */
- private final class ToSWTConsoleForwardRunnable
- extends AOutputForwardRunnable {
- /** The running status */
- private boolean running = true;
-
- /** @param manager the manager */
- public ToSWTConsoleForwardRunnable(final PipedConsoleOutput manager) {
- super(manager);
- }
-
- @Override
- protected void forwardLine(final String m) {
- appendConsoleOutput(m);
- }
-
- @Override
- protected boolean isRunning() {
- return running && !isDisposed();
- }
-
- /** @param running the running to set */
- public void setRunning(final boolean running) {
- this.running = running;
- }
- }
-
- /** The class logger */
- private static final Logger LOGGER = Logger
- .getLogger(SWTConsoleView.class.getName());
- /** The console output text field */
- private final Text consoleOutput;
- /** The console input text field */
- private final Text consoleInput;
- /** The input. */
- private PipedConsoleInput input;
- /** The forwarding runnable */
- private ToSWTConsoleForwardRunnable forward;
-
- /** Create the composite.
- *
- * @param parent the prent composite
- * @param style the composite style */
- public SWTConsoleView(final Composite parent, final int style) {
- super(parent, style);
-
- setLayout(new GridLayout(1, false));
-
- consoleOutput = new Text(this, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP |
- SWT.V_SCROLL | SWT.MULTI);
- consoleOutput.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true,
- 1, 1));
- consoleOutput.setRedraw(true);
-
- consoleInput = new Text(this, SWT.BORDER);
- consoleInput.setLayoutData(
- new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
- consoleInput.addKeyListener(new HistoryTextKeyListener(this));
- }
-
- /** @param next the next message */
- protected void appendConsoleOutput(final String next) {
- Display.getDefault().syncExec(new Runnable() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void run() {
- consoleOutput.append(System.lineSeparator() + next);
- }
- });
- }
-
- @Override
- protected void checkSubclass() {
- // Disable the check that prevents subclassing of SWT components
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
- @Override
- public String getInput() {
- return consoleInput.getText();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Composite#setFocus() */
- @Override
- public boolean setFocus() {
- return consoleInput.setFocus();
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
- @Override
- public void setInput(final String input) {
- consoleInput.setText(input);
- consoleInput.setSelection(input.length());
- }
-
- /** Set the input and output.
- *
- * @param manager the output to set
- * @param input the input */
- public void setManager(final PipedConsoleOutput manager,
- final PipedConsoleInput input) {
- this.input = input;
- if (forward != null) {
- forward.setRunning(false);
- }
- forward = new ToSWTConsoleForwardRunnable(manager);
- final Thread th = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
- th.start();
- }
-
- /** @param string the text */
- public void setText(final String string) {
- consoleInput.setText(string);
- }
-
- /**
- *
- */
- @Override
- public void validateInput() {
- try {
- input.type(getInput());
- } catch (final IOException e) {
- LOGGER.log(Level.SEVERE, "Unable to input value to console", e); //$NON-NLS-1$
- }
- }
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsole.java
+ * Created on: Apr 18, 2015
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+
+import net.bigeon.gclc.ConsoleApplication;
+import net.bigeon.gclc.utils.AOutputForwardRunnable;
+import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.utils.PipedConsoleOutput;
+
+/** A SWT component to connect to gclc {@link ConsoleApplication}
+ *
+ *
+ * @author Emmanuel Bigeon */
+public final class SWTConsoleView extends Composite implements ConsoleDelayIO {
+ /** The local implementation of the forwarding runnable
+ *
+ * @author Emmanuel Bigeon */
+ private final class ToSWTConsoleForwardRunnable
+ extends AOutputForwardRunnable {
+ /** The running status */
+ private boolean running = true;
+
+ /** @param manager the manager */
+ public ToSWTConsoleForwardRunnable(final PipedConsoleOutput manager) {
+ super(manager);
+ }
+
+ @Override
+ protected void forwardLine(final String m) {
+ appendConsoleOutput(m);
+ }
+
+ @Override
+ protected boolean isRunning() {
+ return running && !isDisposed();
+ }
+
+ /** @param running the running to set */
+ public void setRunning(final boolean running) {
+ this.running = running;
+ }
+ }
+
+ /** The class logger */
+ private static final Logger LOGGER = Logger
+ .getLogger(SWTConsoleView.class.getName());
+ /** The console output text field */
+ private final Text consoleOutput;
+ /** The console input text field */
+ private final Text consoleInput;
+ /** The input. */
+ private PipedConsoleInput input;
+ /** The forwarding runnable */
+ private ToSWTConsoleForwardRunnable forward;
+
+ /** Create the composite.
+ *
+ * @param parent the prent composite
+ * @param style the composite style */
+ public SWTConsoleView(final Composite parent, final int style) {
+ super(parent, style);
+
+ setLayout(new GridLayout(1, false));
+
+ consoleOutput = new Text(this, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP |
+ SWT.V_SCROLL | SWT.MULTI);
+ consoleOutput.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true,
+ 1, 1));
+ consoleOutput.setRedraw(true);
+
+ consoleInput = new Text(this, SWT.BORDER);
+ consoleInput.setLayoutData(
+ new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+ consoleInput.addKeyListener(new HistoryTextKeyListener(this));
+ }
+
+ /** @param next the next message */
+ protected void appendConsoleOutput(final String next) {
+ Display.getDefault().syncExec(new Runnable() {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void run() {
+ consoleOutput.append(System.lineSeparator() + next);
+ }
+ });
+ }
+
+ @Override
+ protected void checkSubclass() {
+ // Disable the check that prevents subclassing of SWT components
+ }
+
+ /* (non-Javadoc)
+ * @see net.bigeon.gclc.swt.ConsoleDelayIO#getInput() */
+ @Override
+ public String getInput() {
+ return consoleInput.getText();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.widgets.Composite#setFocus() */
+ @Override
+ public boolean setFocus() {
+ return consoleInput.setFocus();
+ }
+
+ /* (non-Javadoc)
+ * @see net.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
+ @Override
+ public void setInput(final String input) {
+ consoleInput.setText(input);
+ consoleInput.setSelection(input.length());
+ }
+
+ /** Set the input and output.
+ *
+ * @param manager the output to set
+ * @param input the input */
+ public void setManager(final PipedConsoleOutput manager,
+ final PipedConsoleInput input) {
+ this.input = input;
+ if (forward != null) {
+ forward.setRunning(false);
+ }
+ forward = new ToSWTConsoleForwardRunnable(manager);
+ final Thread th = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
+ th.start();
+ }
+
+ /** @param string the text */
+ public void setText(final String string) {
+ consoleInput.setText(string);
+ }
+
+ /**
+ *
+ */
+ @Override
+ public void validateInput() {
+ try {
+ input.type(getInput());
+ } catch (final IOException e) {
+ LOGGER.log(Level.SEVERE, "Unable to input value to console", e); //$NON-NLS-1$
+ }
+ }
+}
diff --git a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/package-info.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/package-info.java
similarity index 71%
rename from gclc-swt/src/main/java/fr/bigeon/gclc/swt/package-info.java
rename to gclc-swt/src/main/java/net/bigeon/gclc/swt/package-info.java
index 62c13ac..a1fc042 100644
--- a/gclc-swt/src/main/java/fr/bigeon/gclc/swt/package-info.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/package-info.java
@@ -1,39 +1,38 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.package-info.java
- * Created on: Nov 18, 2017
- */
-/** SWT components for a frontend of GCLC applications.
- *
- * @author Emmanuel Bigeon */
-package fr.bigeon.gclc.swt;
+/** SWT components for a frontend of GCLC applications.
+ *
+ * @author Emmanuel Bigeon */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
diff --git a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/HistoryTextKeyListenerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
similarity index 65%
rename from gclc-swt/src/test/java/fr/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
rename to gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
index 67c670c..d5c98c7 100644
--- a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/HistoryTextKeyListenerTest.java
@@ -1,108 +1,144 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.HistoryTextKeyListenerTest.java
- * Created on: Nov 19, 2016
- */
-package fr.bigeon.gclc.swt;
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.swt.SWT;
-import org.junit.Test;
-
-/**
- * TODO
- *
- * @author Emmanuel Bigeon */
-public class HistoryTextKeyListenerTest {
-
- /** Test method for
- * {@link fr.bigeon.gclc.swt.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
- @Test
- public final void testKeyPressedKeyEvent() {
- ConsoleDelayIO io = new ConsoleDelayIO() {
- private String input = "";
-
- @Override
- public void validateInput() {
- input = "";
- }
-
- @Override
- public void setInput(String input) {
- this.input = input;
- }
-
- @Override
- public String getInput() {
- return input;
- }
- };
- HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
-
- // no effects
- assertEquals("", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_DOWN);
- assertEquals("", io.getInput());
- listener.pressedKeyCode('\r');
- assertEquals("", io.getInput());
-
- io.setInput("cmd arg");
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("cmd arg", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_DOWN);
- assertEquals("cmd arg", io.getInput());
- listener.pressedKeyCode('\r');
- assertEquals("", io.getInput());
-
- io.setInput("cmd arg2");
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("cmd arg", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_DOWN);
- assertEquals("", io.getInput());
- io.setInput("cmd arg2");
- listener.pressedKeyCode('\r');
- assertEquals("", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("cmd arg2", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("cmd arg", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_UP);
- assertEquals("cmd arg", io.getInput());
- listener.pressedKeyCode(SWT.ARROW_DOWN);
- assertEquals("cmd arg2", io.getInput());
- }
-
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.HistoryTextKeyListenerTest.java
+ * Created on: Nov 19, 2016
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.swt.SWT;
+import org.junit.Test;
+
+import net.bigeon.gclc.swt.ConsoleDelayIO;
+import net.bigeon.gclc.swt.HistoryTextKeyListener;
+
+/**
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+public class HistoryTextKeyListenerTest {
+
+ /** Test method for
+ * {@link net.bigeon.gclc.swt.HistoryTextKeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)}. */
+ @Test
+ public final void testKeyPressedKeyEvent() {
+ ConsoleDelayIO io = new ConsoleDelayIO() {
+ private String input = "";
+
+ @Override
+ public void validateInput() {
+ input = "";
+ }
+
+ @Override
+ public void setInput(String input) {
+ this.input = input;
+ }
+
+ @Override
+ public String getInput() {
+ return input;
+ }
+ };
+ HistoryTextKeyListener listener = new HistoryTextKeyListener(io);
+
+ // no effects
+ assertEquals("", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_DOWN);
+ assertEquals("", io.getInput());
+ listener.pressedKeyCode('\r');
+ assertEquals("", io.getInput());
+
+ io.setInput("cmd arg");
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("cmd arg", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_DOWN);
+ assertEquals("cmd arg", io.getInput());
+ listener.pressedKeyCode('\r');
+ assertEquals("", io.getInput());
+
+ io.setInput("cmd arg2");
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("cmd arg", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_DOWN);
+ assertEquals("", io.getInput());
+ io.setInput("cmd arg2");
+ listener.pressedKeyCode('\r');
+ assertEquals("", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("cmd arg2", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("cmd arg", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_UP);
+ assertEquals("cmd arg", io.getInput());
+ listener.pressedKeyCode(SWT.ARROW_DOWN);
+ assertEquals("cmd arg2", io.getInput());
+ }
+
+}
diff --git a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleShellTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
similarity index 86%
rename from gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleShellTest.java
rename to gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
index fb7bf46..77a8f03 100644
--- a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleShellTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
@@ -1,333 +1,368 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.SWTConsoleShellTest.java
- * Created on: Jun 8, 2016
- */
-package fr.bigeon.gclc.swt;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.eclipse.swt.widgets.Display;
-import org.junit.Test;
-
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.command.Command;
-import net.bigeon.gclc.command.base.ExitCommand;
-import net.bigeon.gclc.exception.CommandRunException;
-import net.bigeon.gclc.exception.InvalidCommandName;
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.manager.ConsoleOutput;
-
-/**
- *
- * TODO
- *
- * @author Emmanuel Bigeon */
-@SuppressWarnings({"javadoc", "static-method", "nls", "deprecation"})
-public class SWTConsoleShellTest {
-
- protected static final long TWO_SECONDS = 2000;
- private static final Display DISPLAY = Display.getDefault();
-
- @Test
- public void test() {
- final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
- final SWTConsole swtConsole = shell.getManager();
- try {
- final ConsoleApplication appl = new ConsoleApplication(swtConsole,
- swtConsole, "Hello", "See you");
- appl.add(new ExitCommand("exit", appl));
- appl.add(new Command("long") {
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
- * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
- * java.lang.String[]) */
- @Override
- public void execute(final ConsoleOutput out,
- final ConsoleInput in,
- final String... args) throws CommandRunException {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public String tip() {
- return "a long running command";
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.Command#usageDetail() */
- @Override
- protected String usageDetail() {
- // TODO Auto-generated method stub
- // return null;
- throw new RuntimeException("Not implemented yet");
- }
- });
-// shell.pack();
- shell.open();
- final Thread applThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- appl.start();
- }
- });
- final Thread testThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("test"); //$NON-NLS-1$
- swtConsole.validateCommand();
- }
- });
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- shell.dispose();
- }
- });
- }
- });
- applThread.start();
- testThread.start();
- while (!shell.isDisposed()) {
- if (!DISPLAY.readAndDispatch()) {
- DISPLAY.sleep();
- }
- }
-// DISPLAY.dispose();
- assertTrue(swtConsole.isClosed());
- Thread.sleep(TWO_SECONDS);
- assertFalse(appl.isRunning());
- } catch (final InvalidCommandName e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Test
- public void testConsoleClose() {
- final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
- final SWTConsole swtConsole = shell.getManager();
- swtConsole.close();
- swtConsole.setPrompt(":");
- try {
- final ConsoleApplication appl = new ConsoleApplication(swtConsole,
- swtConsole, "Hello", "See you");
- appl.add(new ExitCommand("exit", appl));
- appl.add(new Command("long") {
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
- * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
- * java.lang.String[]) */
- @Override
- public void execute(final ConsoleOutput out,
- final ConsoleInput in,
- final String... args) throws CommandRunException {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public String tip() {
- return "a long running command";
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.Command#usageDetail() */
- @Override
- protected String usageDetail() {
- // TODO Auto-generated method stub
- // return null;
- throw new RuntimeException("Not implemented yet");
- }
- });
- appl.add(new Command("test") {
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
- * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
- * java.lang.String[]) */
- @Override
- public void execute(final ConsoleOutput out,
- final ConsoleInput in,
- final String... args) throws CommandRunException {
- try {
- swtConsole.prompt("Test");
- } catch (final IOException e) {
- throw new CommandRunException("No input", e);
- }
- }
-
- @Override
- public String tip() {
- return "a prompting running command";
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.Command#usageDetail() */
- @Override
- protected String usageDetail() {
- // TODO Auto-generated method stub
- // return null;
- throw new RuntimeException("Not implemented yet");
- }
- });
-// shell.pack();
- shell.open();
- final Thread applThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- appl.start();
- }
- });
- final Thread testThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("test"); //$NON-NLS-1$
- swtConsole.validateCommand();
- }
- });
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("ok"); //$NON-NLS-1$
- }
- });
- swtConsole.validateCommand();
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("long"); //$NON-NLS-1$
- }
- });
- swtConsole.validateCommand();
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("test"); //$NON-NLS-1$
- }
- });
- swtConsole.validateCommand();
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("test"); //$NON-NLS-1$
- }
- });
- swtConsole.validateCommand();
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- shell.dispose();
- }
- });
-
- }
- });
- applThread.start();
- testThread.start();
- while (!shell.isDisposed()) {
- if (!DISPLAY.readAndDispatch()) {
- DISPLAY.sleep();
- }
- }
- swtConsole.setPrompt(">");
- try {
- swtConsole.prompt();
- fail("Prompting when closed should fail!");
- } catch (final IOException e) {
- assertNotNull(e);
- }
-// DISPLAY.dispose();
- assertTrue(swtConsole.isClosed());
- Thread.sleep(TWO_SECONDS);
- assertFalse(appl.isRunning());
- } catch (final InvalidCommandName e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShellTest.java
+ * Created on: Jun 8, 2016
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.eclipse.swt.widgets.Display;
+import org.junit.Test;
+
+import net.bigeon.gclc.ConsoleApplication;
+import net.bigeon.gclc.command.Command;
+import net.bigeon.gclc.command.base.ExitCommand;
+import net.bigeon.gclc.exception.CommandRunException;
+import net.bigeon.gclc.exception.InvalidCommandName;
+import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.swt.SWTConsole;
+import net.bigeon.gclc.swt.SWTConsoleShell;
+
+/**
+ *
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+@SuppressWarnings({"javadoc", "static-method", "nls", "deprecation"})
+public class SWTConsoleShellTest {
+
+ protected static final long TWO_SECONDS = 2000;
+ private static final Display DISPLAY = Display.getDefault();
+
+ @Test
+ public void test() {
+ final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
+ final SWTConsole swtConsole = shell.getManager();
+ try {
+ final ConsoleApplication appl = new ConsoleApplication(swtConsole,
+ swtConsole, "Hello", "See you");
+ appl.add(new ExitCommand("exit", appl));
+ appl.add(new Command("long") {
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
+ * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
+ * java.lang.String[]) */
+ @Override
+ public void execute(final ConsoleOutput out,
+ final ConsoleInput in,
+ final String... args) throws CommandRunException {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public String tip() {
+ return "a long running command";
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.Command#usageDetail() */
+ @Override
+ protected String usageDetail() {
+ // TODO Auto-generated method stub
+ // return null;
+ throw new RuntimeException("Not implemented yet");
+ }
+ });
+// shell.pack();
+ shell.open();
+ final Thread applThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ appl.start();
+ }
+ });
+ final Thread testThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("test"); //$NON-NLS-1$
+ swtConsole.validateCommand();
+ }
+ });
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ shell.dispose();
+ }
+ });
+ }
+ });
+ applThread.start();
+ testThread.start();
+ while (!shell.isDisposed()) {
+ if (!DISPLAY.readAndDispatch()) {
+ DISPLAY.sleep();
+ }
+ }
+// DISPLAY.dispose();
+ assertTrue(swtConsole.isClosed());
+ Thread.sleep(TWO_SECONDS);
+ assertFalse(appl.isRunning());
+ } catch (final InvalidCommandName e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testConsoleClose() {
+ final SWTConsoleShell shell = new SWTConsoleShell(DISPLAY);
+ final SWTConsole swtConsole = shell.getManager();
+ swtConsole.close();
+ swtConsole.setPrompt(":");
+ try {
+ final ConsoleApplication appl = new ConsoleApplication(swtConsole,
+ swtConsole, "Hello", "See you");
+ appl.add(new ExitCommand("exit", appl));
+ appl.add(new Command("long") {
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
+ * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
+ * java.lang.String[]) */
+ @Override
+ public void execute(final ConsoleOutput out,
+ final ConsoleInput in,
+ final String... args) throws CommandRunException {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public String tip() {
+ return "a long running command";
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.Command#usageDetail() */
+ @Override
+ protected String usageDetail() {
+ // TODO Auto-generated method stub
+ // return null;
+ throw new RuntimeException("Not implemented yet");
+ }
+ });
+ appl.add(new Command("test") {
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.
+ * manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput,
+ * java.lang.String[]) */
+ @Override
+ public void execute(final ConsoleOutput out,
+ final ConsoleInput in,
+ final String... args) throws CommandRunException {
+ try {
+ swtConsole.prompt("Test");
+ } catch (final IOException e) {
+ throw new CommandRunException("No input", e);
+ }
+ }
+
+ @Override
+ public String tip() {
+ return "a prompting running command";
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.Command#usageDetail() */
+ @Override
+ protected String usageDetail() {
+ // TODO Auto-generated method stub
+ // return null;
+ throw new RuntimeException("Not implemented yet");
+ }
+ });
+// shell.pack();
+ shell.open();
+ final Thread applThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ appl.start();
+ }
+ });
+ final Thread testThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("test"); //$NON-NLS-1$
+ swtConsole.validateCommand();
+ }
+ });
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("ok"); //$NON-NLS-1$
+ }
+ });
+ swtConsole.validateCommand();
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("long"); //$NON-NLS-1$
+ }
+ });
+ swtConsole.validateCommand();
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("test"); //$NON-NLS-1$
+ }
+ });
+ swtConsole.validateCommand();
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("test"); //$NON-NLS-1$
+ }
+ });
+ swtConsole.validateCommand();
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ shell.dispose();
+ }
+ });
+
+ }
+ });
+ applThread.start();
+ testThread.start();
+ while (!shell.isDisposed()) {
+ if (!DISPLAY.readAndDispatch()) {
+ DISPLAY.sleep();
+ }
+ }
+ swtConsole.setPrompt(">");
+ try {
+ swtConsole.prompt();
+ fail("Prompting when closed should fail!");
+ } catch (final IOException e) {
+ assertNotNull(e);
+ }
+// DISPLAY.dispose();
+ assertTrue(swtConsole.isClosed());
+ Thread.sleep(TWO_SECONDS);
+ assertFalse(appl.isRunning());
+ } catch (final InvalidCommandName e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleViewTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
similarity index 77%
rename from gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleViewTest.java
rename to gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
index da9ddbb..414822f 100644
--- a/gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleViewTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
@@ -1,169 +1,203 @@
-/*
- * GCLC swt, provide a swt window for console applications
- * Copyright (C) 2015-2017 E. Bigeon
- * mailto:emmanuel@bigeon.fr
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software. You can use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty and the software's author, the holder of the
- * economic rights, and the successive licensors have only limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading, using, modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean that it is complicated to manipulate, and that also
- * therefore means that it is reserved for developers and experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and, more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc-swt:fr.bigeon.gclc.swt.SWTConsoleShellTest.java
- * Created on: Jun 8, 2016
- */
-package fr.bigeon.gclc.swt;
-
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.Test;
-
-import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.command.Command;
-import net.bigeon.gclc.command.base.ExitCommand;
-import net.bigeon.gclc.exception.CommandRunException;
-import net.bigeon.gclc.exception.InvalidCommandName;
-import net.bigeon.gclc.manager.ConsoleInput;
-import net.bigeon.gclc.manager.ConsoleOutput;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
-
-/**
- * TODO
- *
- * @author Emmanuel Bigeon */
-@SuppressWarnings({"javadoc", "static-method", "nls", "deprecation"})
-public class SWTConsoleViewTest {
-
- protected static final long TWO_SECONDS = 2000;
- private static final Display DISPLAY = Display.getDefault();
-
- @Test
- public void test() {
- final Shell shell = new Shell(DISPLAY);
- final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
- try (PipedConsoleOutput manager = new PipedConsoleOutput();
- PipedConsoleInput input = new PipedConsoleInput(System.out)) {
- swtConsole.setManager(manager, input);
- } catch (final IOException e2) {
- assertNull(e2);
- }
- try (PipedConsoleOutput manager = new PipedConsoleOutput();
- PipedConsoleInput input = new PipedConsoleInput(System.out)) {
- swtConsole.setManager(manager, input);
- final ConsoleApplication appl = new ConsoleApplication(manager,
- input,
- "Hello", "See you");
- appl.add(new ExitCommand("exit", appl));
- appl.add(new Command("long") {
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[])
- */
- @Override
- public void execute(final ConsoleOutput out, final ConsoleInput in,
- final String... args) throws CommandRunException {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public String tip() {
- return "a long running command";
- }
-
- /* (non-Javadoc)
- * @see fr.bigeon.gclc.command.Command#usageDetail() */
- @Override
- protected String usageDetail() {
- // TODO Auto-generated method stub
- // return null;
- throw new RuntimeException("Not implemented yet");
- }
- });
-// shell.pack();
- shell.open();
- final Thread applThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- appl.start();
- }
- });
- final Thread testThread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- swtConsole.setText("test"); //$NON-NLS-1$
- swtConsole.validateInput();
- }
- });
- try {
- Thread.sleep(TWO_SECONDS);
- } catch (final InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Display.getDefault().syncExec(new Runnable() {
- @Override
- public void run() {
- shell.dispose();
- }
- });
- }
- });
- applThread.start();
- testThread.start();
- while (!shell.isDisposed()) {
- if (!DISPLAY.readAndDispatch()) {
- DISPLAY.sleep();
- }
- }
- } catch (final InvalidCommandName e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (final IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- }
-}
+/*
+ * GCLC swt, provide a swt window for console applications
+ * Copyright (C) 2015-2017 E. Bigeon
+ * mailto:emmanuel@bigeon.fr
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:net.bigeon.gclc.swt.SWTConsoleShellTest.java
+ * Created on: Jun 8, 2016
+ */
+package net.bigeon.gclc.swt;
+
+/*-
+ * #%L
+ * GCLC swt
+ * %%
+ * Copyright (C) 2015 - 2018 Bigeon
+ * %%
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ * #L%
+ */
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
+
+import net.bigeon.gclc.ConsoleApplication;
+import net.bigeon.gclc.command.Command;
+import net.bigeon.gclc.command.base.ExitCommand;
+import net.bigeon.gclc.exception.CommandRunException;
+import net.bigeon.gclc.exception.InvalidCommandName;
+import net.bigeon.gclc.manager.ConsoleInput;
+import net.bigeon.gclc.manager.ConsoleOutput;
+import net.bigeon.gclc.swt.SWTConsoleView;
+import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.utils.PipedConsoleOutput;
+
+/**
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+@SuppressWarnings({"javadoc", "static-method", "nls", "deprecation"})
+public class SWTConsoleViewTest {
+
+ protected static final long TWO_SECONDS = 2000;
+ private static final Display DISPLAY = Display.getDefault();
+
+ @Test
+ public void test() {
+ final Shell shell = new Shell(DISPLAY);
+ final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
+ try (PipedConsoleOutput manager = new PipedConsoleOutput();
+ PipedConsoleInput input = new PipedConsoleInput(System.out)) {
+ swtConsole.setManager(manager, input);
+ } catch (final IOException e2) {
+ assertNull(e2);
+ }
+ try (PipedConsoleOutput manager = new PipedConsoleOutput();
+ PipedConsoleInput input = new PipedConsoleInput(System.out)) {
+ swtConsole.setManager(manager, input);
+ final ConsoleApplication appl = new ConsoleApplication(manager,
+ input,
+ "Hello", "See you");
+ appl.add(new ExitCommand("exit", appl));
+ appl.add(new Command("long") {
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.ICommand#execute(fr.bigeon.gclc.manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[])
+ */
+ @Override
+ public void execute(final ConsoleOutput out, final ConsoleInput in,
+ final String... args) throws CommandRunException {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public String tip() {
+ return "a long running command";
+ }
+
+ /* (non-Javadoc)
+ * @see fr.bigeon.gclc.command.Command#usageDetail() */
+ @Override
+ protected String usageDetail() {
+ // TODO Auto-generated method stub
+ // return null;
+ throw new RuntimeException("Not implemented yet");
+ }
+ });
+// shell.pack();
+ shell.open();
+ final Thread applThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ appl.start();
+ }
+ });
+ final Thread testThread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ swtConsole.setText("test"); //$NON-NLS-1$
+ swtConsole.validateInput();
+ }
+ });
+ try {
+ Thread.sleep(TWO_SECONDS);
+ } catch (final InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ Display.getDefault().syncExec(new Runnable() {
+ @Override
+ public void run() {
+ shell.dispose();
+ }
+ });
+ }
+ });
+ applThread.start();
+ testThread.start();
+ while (!shell.isDisposed()) {
+ if (!DISPLAY.readAndDispatch()) {
+ DISPLAY.sleep();
+ }
+ }
+ } catch (final InvalidCommandName e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (final IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+}