emmanuel/gclc-core
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Update gclc version

Browse Source 
Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>
This commit is contained in:
Emmanuel Bigeon
2018-11-25 12:05:10 -05:00
parent 80933bb636
commit 4c1e28b04f
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java
View File

@@ -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<String> 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<String> 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<String> prompt) {
this.prompt = prompt;
}

10
gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java
View File

@@ -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());
}
}