Compare commits

..

6 Commits

5 changed files with 14 additions and 11 deletions

View File

@@ -70,7 +70,7 @@ of Emmanuel Bigeon. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>gclc-socket</artifactId> <artifactId>gclc-socket</artifactId>
<version>1.1.3</version> <version>1.1.4</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<url>http://www.bigeon.fr/emmanuel</url> <url>http://www.bigeon.fr/emmanuel</url>
<properties> <properties>
@@ -104,6 +104,6 @@ of Emmanuel Bigeon. -->
<description>Socket implementation of GCLC</description> <description>Socket implementation of GCLC</description>
<scm> <scm>
<developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection> <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
<tag>gclc-socket-1.1.3</tag> <tag>gclc-socket-1.1.4</tag>
</scm> </scm>
</project> </project>

View File

@@ -295,6 +295,9 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
// keep on going // keep on going
} }
reading.setRunning(false); reading.setRunning(false);
while (consoleManager.available()) {
waitASec();
}
socket.shutdownOutput(); socket.shutdownOutput();
} }

View File

@@ -35,7 +35,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>gclc-swt</artifactId> <artifactId>gclc-swt</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<url>http://www.bigeon.fr/emmanuel</url> <url>http://www.bigeon.fr/emmanuel</url>
<properties> <properties>

View File

@@ -180,13 +180,6 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
consoleInput.setText(string); consoleInput.setText(string);
} }
/**
*
*/
public void validateCommand() {
validateInput();
}
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */ * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
@Override @Override

View File

@@ -38,6 +38,8 @@
*/ */
package fr.bigeon.gclc.swt; package fr.bigeon.gclc.swt;
import static org.junit.Assert.assertNull;
import java.io.IOException; import java.io.IOException;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@@ -65,6 +67,11 @@ public class SWTConsoleViewTest {
public void test() { public void test() {
final Shell shell = new Shell(DISPLAY); final Shell shell = new Shell(DISPLAY);
final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE); final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
try (PipedConsoleManager manager = new PipedConsoleManager()) {
swtConsole.setManager(manager);
} catch (IOException e2) {
assertNull(e2);
}
try (PipedConsoleManager manager = new PipedConsoleManager()) { try (PipedConsoleManager manager = new PipedConsoleManager()) {
swtConsole.setManager(manager); swtConsole.setManager(manager);
final ConsoleApplication appl = new ConsoleApplication(manager, final ConsoleApplication appl = new ConsoleApplication(manager,
@@ -110,7 +117,7 @@ public class SWTConsoleViewTest {
@Override @Override
public void run() { public void run() {
swtConsole.setText("test"); //$NON-NLS-1$ swtConsole.setText("test"); //$NON-NLS-1$
swtConsole.validateCommand(); swtConsole.validateInput();
} }
}); });
try { try {