From 14007f4d9ad47069aeb97c58a43241d09b17a8b2 Mon Sep 17 00:00:00 2001 From: Emmanuel Bigeon Date: Fri, 12 Nov 2021 10:00:06 +0100 Subject: [PATCH] [fix] Remove use of deprecated code Signed-off-by: Emmanuel Bigeon --- .../bigeon/gclc/process/io/ConnectingConsoleInput.java | 8 ++------ .../net/bigeon/gclc/socket/PluggableConsoleInput.java | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) 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 d9c4280..d6d8fc7 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 @@ -72,20 +72,16 @@ import java.io.InterruptedIOException; import java.util.function.Supplier; import net.bigeon.gclc.manager.ConsoleInput; -import net.bigeon.gclc.tools.ConstantString; /** A console input that can be connected to and diconnected from. * * @author Emmanuel Bigeon */ public final class ConnectingConsoleInput implements ConsoleInput { - /** The empty string provider. */ - private static final ConstantString EMPTY_STRING = new ConstantString(""); - /** If the input is closed. */ private boolean close = false; /** The prompt string. */ - private Supplier prompt = EMPTY_STRING; + private Supplier prompt = () -> ""; /** If the input is currently in prompting state. *

* To change it you should be in a promptLock. */ @@ -307,7 +303,7 @@ public final class ConnectingConsoleInput implements ConsoleInput { * @see fr.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */ @Override public void setPrompt(final String prompt) { - this.prompt = new ConstantString(prompt); + this.prompt = () -> prompt; } /* (non-Javadoc) 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 1e63e4f..d01dfe7 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 @@ -51,7 +51,6 @@ 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.utils.ReadingRunnable; /** A console input where the stream can be plugged. @@ -78,7 +77,7 @@ public final class PluggableConsoleInput implements ConsoleInput { /** If the element is closed. */ private boolean closed = false; /** The default prompt. */ - private Supplier prompt = new ConstantString("> "); //$NON-NLS-1$ + private Supplier prompt = () -> "> "; //$NON-NLS-1$ /** If the input is plugged or buffering. */ private boolean connected = false; /** The current connexion (if any). */ @@ -263,7 +262,7 @@ public final class PluggableConsoleInput implements ConsoleInput { * @see net.bigeon.gclc.manager.ConsoleInput#setPrompt(java.lang.String) */ @Override public void setPrompt(final String prompt) { - setPrompt(new ConstantString(prompt)); + setPrompt(() -> prompt); } /* (non-Javadoc)