From 4c1e28b04f6e22b4e64bdd10f14d5daceb1e7127 Mon Sep 17 00:00:00 2001 From: Emmanuel Bigeon Date: Sun, 25 Nov 2018 12:05:10 -0500 Subject: [PATCH] Update gclc version Signed-off-by: Emmanuel Bigeon --- gclc-process/pom.xml | 2 +- .../process/io/ConnectingConsoleInput.java | 12 ++++++------ .../process/io/ConnectingConsoleInputTest.java | 2 +- gclc-socket/pom.xml | 2 +- .../gclc/socket/PluggableConsoleInput.java | 12 ++++++------ .../gclc/socket/PluggableConsoleInputTest.java | 10 +++++----- gclc-swt/pom.xml | 2 +- .../java/net/bigeon/gclc/swt/SWTConsole.java | 18 +++++++++--------- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gclc-process/pom.xml b/gclc-process/pom.xml index d192386..e8fe890 100644 --- a/gclc-process/pom.xml +++ b/gclc-process/pom.xml @@ -49,7 +49,7 @@ net.bigeon gclc - 2.0.11 + 2.0.12 net.bigeon.test diff --git a/gclc-process/src/main/java/net/bigeon/gclc/process/io/ConnectingConsoleInput.java b/gclc-process/src/main/java/net/bigeon/gclc/process/io/ConnectingConsoleInput.java index 5e68c48..afc6fb5 100644 --- a/gclc-process/src/main/java/net/bigeon/gclc/process/io/ConnectingConsoleInput.java +++ b/gclc-process/src/main/java/net/bigeon/gclc/process/io/ConnectingConsoleInput.java @@ -68,10 +68,10 @@ package net.bigeon.gclc.process.io; * #L% */ import java.io.IOException; +import java.util.function.Supplier; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.tools.ConstantString; -import net.bigeon.gclc.tools.StringProvider; /** A console input that can be connected to and diconnected from. * @@ -84,7 +84,7 @@ public final class ConnectingConsoleInput implements ConsoleInput { /** If the input is closed. */ private boolean close = false; /** The prompt string. */ - private StringProvider prompt = EMPTY_STRING; + private Supplier prompt = EMPTY_STRING; /** If the input is currently in prompting state. *

* To change it you should be in a promptLock. */ @@ -139,7 +139,7 @@ public final class ConnectingConsoleInput implements ConsoleInput { /* (non-Javadoc) * @see fr.bigeon.gclc.manager.ConsoleInput#getPrompt() */ @Override - public StringProvider getPrompt() { + public Supplier getPrompt() { return prompt; } @@ -170,14 +170,14 @@ public final class ConnectingConsoleInput implements ConsoleInput { * @see fr.bigeon.gclc.manager.ConsoleInput#prompt() */ @Override public String prompt() throws IOException { - return prompt(prompt.apply()); + return prompt(prompt.get()); } /* (non-Javadoc) * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */ @Override public String prompt(final long timeout) throws IOException { - return prompt(prompt.apply(), timeout); + return prompt(prompt.get(), timeout); } /* (non-Javadoc) @@ -282,7 +282,7 @@ public final class ConnectingConsoleInput implements ConsoleInput { * @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(fr.bigeon.gclc.tools. * StringProvider) */ @Override - public void setPrompt(final StringProvider string) { + public void setPrompt(final Supplier string) { prompt = string; } } diff --git a/gclc-process/src/test/java/net/bigeon/gclc/process/io/ConnectingConsoleInputTest.java b/gclc-process/src/test/java/net/bigeon/gclc/process/io/ConnectingConsoleInputTest.java index ee8a607..542085d 100644 --- a/gclc-process/src/test/java/net/bigeon/gclc/process/io/ConnectingConsoleInputTest.java +++ b/gclc-process/src/test/java/net/bigeon/gclc/process/io/ConnectingConsoleInputTest.java @@ -66,7 +66,7 @@ public class ConnectingConsoleInputTest { final ConnectingConsoleInput in = new ConnectingConsoleInput(); in.setPrompt("test"); assertEquals("Prompt should be set correctly", "test", - ((ConstantString) in.getPrompt()).apply()); + ((ConstantString) in.getPrompt()).get()); final ConstantString prompt = new ConstantString("other"); in.setPrompt(prompt); assertEquals("Prompt should be set correctly", prompt, in.getPrompt()); diff --git a/gclc-socket/pom.xml b/gclc-socket/pom.xml index b197869..03ebc82 100644 --- a/gclc-socket/pom.xml +++ b/gclc-socket/pom.xml @@ -47,7 +47,7 @@ net.bigeon gclc - 2.0.11 + 2.0.12 net.bigeon diff --git a/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java index ebcb181..ae0dc04 100644 --- a/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java @@ -43,12 +43,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.nio.charset.StandardCharsets; +import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; import net.bigeon.gclc.manager.ConsoleInput; import net.bigeon.gclc.tools.ConstantString; -import net.bigeon.gclc.tools.StringProvider; import net.bigeon.gclc.utils.ReadingRunnable; /** A console input where the stream can be plugged. @@ -75,7 +75,7 @@ public final class PluggableConsoleInput implements ConsoleInput { /** If the element is closed. */ private boolean closed = false; /** The default prompt. */ - private StringProvider prompt = new ConstantString("> "); //$NON-NLS-1$ + private Supplier prompt = new ConstantString("> "); //$NON-NLS-1$ /** If the input is plugged or buffering. */ private boolean connected = false; /** The current connexion (if any). */ @@ -146,7 +146,7 @@ public final class PluggableConsoleInput implements ConsoleInput { /* (non-Javadoc) * @see fr.bigeon.gclc.manager.ConsoleInput#getPrompt() */ @Override - public StringProvider getPrompt() { + public Supplier getPrompt() { return prompt; } @@ -175,14 +175,14 @@ public final class PluggableConsoleInput implements ConsoleInput { * @see fr.bigeon.gclc.manager.ConsoleInput#prompt() */ @Override public String prompt() throws IOException { - return prompt(prompt.apply()); + return prompt(prompt.get()); } /* (non-Javadoc) * @see fr.bigeon.gclc.manager.ConsoleInput#prompt(long) */ @Override public String prompt(final long timeout) throws IOException { - return prompt(prompt.apply(), timeout); + return prompt(prompt.get(), timeout); } /* (non-Javadoc) @@ -264,7 +264,7 @@ public final class PluggableConsoleInput implements ConsoleInput { * @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(net.bigeon.gclc.tools. * StringProvider) */ @Override - public void setPrompt(final StringProvider prompt) { + public void setPrompt(final Supplier prompt) { this.prompt = prompt; } diff --git a/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java index 2dbaa5c..03da5f9 100644 --- a/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java @@ -90,7 +90,7 @@ public class PluggableConsoleInputTest { } try { - Object obj = new Object(); + final Object obj = new Object(); synchronized (obj) { obj.wait(100); } @@ -115,7 +115,7 @@ public class PluggableConsoleInputTest { @Override public void run() { try { - Object obj = new Object(); + final Object obj = new Object(); synchronized (obj) { obj.wait(200); } @@ -168,7 +168,7 @@ public class PluggableConsoleInputTest { }); th.start(); - Object obj = new Object(); + final Object obj = new Object(); synchronized (obj) { while (!input.isPrompting()) { obj.wait(10); @@ -211,8 +211,8 @@ public class PluggableConsoleInputTest { @Test public final void testGetPrompt() { final PluggableConsoleInput input = new PluggableConsoleInput(); - assertEquals("Default prompt invalid", "> ", input.getPrompt().apply()); + assertEquals("Default prompt invalid", "> ", input.getPrompt().get()); input.setPrompt("test"); - assertEquals("Prompt setting failed", "test", input.getPrompt().apply()); + assertEquals("Prompt setting failed", "test", input.getPrompt().get()); } } diff --git a/gclc-swt/pom.xml b/gclc-swt/pom.xml index 6283eb3..c8365a5 100644 --- a/gclc-swt/pom.xml +++ b/gclc-swt/pom.xml @@ -48,7 +48,7 @@ net.bigeon gclc - 2.0.11 + 2.0.12 net.bigeon diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java index eae050e..827b324 100644 --- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java +++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java @@ -69,6 +69,7 @@ package net.bigeon.gclc.swt; * #L% */ import java.io.IOException; +import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; @@ -84,7 +85,6 @@ 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}. *

@@ -111,7 +111,7 @@ public final class SWTConsole extends Composite /** The prompt label. */ private final Label lblPromptlabel; /** The prompt text. */ - private StringProvider prompt = new ConstantString("> "); //$NON-NLS-1$ + private Supplier prompt = new ConstantString("> "); //$NON-NLS-1$ /** The command entered by the user. */ private String command = null; /** If the prompt should be active. */ @@ -135,7 +135,7 @@ public final class SWTConsole extends Composite consoleOutput.setRedraw(true); lblPromptlabel = new Label(this, SWT.NONE); - lblPromptlabel.setText(prompt.apply()); + lblPromptlabel.setText(prompt.get()); consoleInput = new Text(this, SWT.BORDER); consoleInput.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); @@ -175,7 +175,7 @@ public final class SWTConsole extends Composite /* (non-Javadoc) * @see fr.bigeon.gclc.ConsoleManager#getPrompt() */ @Override - public StringProvider getPrompt() { + public Supplier getPrompt() { return prompt; } @@ -255,7 +255,7 @@ public final class SWTConsole extends Composite @Override public String prompt() throws IOException { synchronized (promptLock) { - initPrompt(prompt.apply()); + initPrompt(prompt.get()); promptLock.notifyAll(); try { while (prompting) { @@ -303,7 +303,7 @@ public final class SWTConsole extends Composite @Override public String prompt(final long timeout) throws IOException { synchronized (promptLock) { - initPrompt(prompt.apply()); + initPrompt(prompt.get()); promptLock.notifyAll(); try { waitPromptResolution(timeout); @@ -386,7 +386,7 @@ public final class SWTConsole extends Composite @Override public void run() { if (!consoleOutput.isDisposed()) { - lblPromptlabel.setText(prompt.apply()); + lblPromptlabel.setText(prompt.get()); // relayout SWTConsole.this.layout(); } @@ -419,14 +419,14 @@ public final class SWTConsole extends Composite /* (non-Javadoc) * @see fr.bigeon.gclc.ConsoleManager#setPrompt(java.lang.String) */ @Override - public void setPrompt(final StringProvider prompt) { + public void setPrompt(final Supplier prompt) { this.prompt = prompt; Display.getDefault().syncExec(new Runnable() { @SuppressWarnings("synthetic-access") @Override public void run() { if (!consoleOutput.isDisposed()) { - lblPromptlabel.setText(prompt.apply()); + lblPromptlabel.setText(prompt.get()); // relayout SWTConsole.this.layout(); }