diff --git a/README.md b/README.md
index 46a6a0b..6bf144a 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ This project is **kept in sync** with the utilities library, so "jar hell" is no
com.dorkbox
InputConsole
- 1.5
+ 2.0
```
@@ -50,3 +50,5 @@ https://oss.sonatype.org/content/repositories/releases/com/dorkbox/InputConsole-
This project is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further references.
+
+
diff --git a/src/dorkbox/util/input/Encoding.java b/src/dorkbox/inputConsole/Encoding.java
similarity index 98%
rename from src/dorkbox/util/input/Encoding.java
rename to src/dorkbox/inputConsole/Encoding.java
index 0fcc311..a8450fb 100644
--- a/src/dorkbox/util/input/Encoding.java
+++ b/src/dorkbox/inputConsole/Encoding.java
@@ -9,7 +9,7 @@
* @author Jason Dillon
* @author Guillaume Nodet
*/
-package dorkbox.util.input;
+package dorkbox.inputConsole;
import java.nio.charset.Charset;
diff --git a/src/dorkbox/util/input/InputConsole.java b/src/dorkbox/inputConsole/InputConsole.java
similarity index 98%
rename from src/dorkbox/util/input/InputConsole.java
rename to src/dorkbox/inputConsole/InputConsole.java
index c6deb06..4d46bb7 100644
--- a/src/dorkbox/util/input/InputConsole.java
+++ b/src/dorkbox/inputConsole/InputConsole.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input;
+package dorkbox.inputConsole;
+import dorkbox.inputConsole.posix.UnixTerminal;
+import dorkbox.inputConsole.unsupported.UnsupportedTerminal;
+import dorkbox.objectPool.ObjectPool;
import dorkbox.util.OS;
import dorkbox.util.bytes.ByteBuffer2;
import dorkbox.util.bytes.ByteBuffer2Poolable;
-import dorkbox.util.input.posix.UnixTerminal;
-import dorkbox.util.input.unsupported.UnsupportedTerminal;
-import dorkbox.util.input.windows.WindowsTerminal;
-import dorkbox.util.objectPool.ObjectPool;
+import dorkbox.inputConsole.windows.WindowsTerminal;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
import org.slf4j.Logger;
@@ -87,6 +87,14 @@ class InputConsole {
}
}
+ /**
+ * Gets the version number.
+ */
+ public static
+ String getVersion() {
+ return "2.0";
+ }
+
/**
* return null if no data
*/
@@ -568,3 +576,4 @@ class InputConsole {
// return sbuff;
}
}
+
diff --git a/src/dorkbox/util/input/Terminal.java b/src/dorkbox/inputConsole/Terminal.java
similarity index 97%
rename from src/dorkbox/util/input/Terminal.java
rename to src/dorkbox/inputConsole/Terminal.java
index d800980..28bd5dd 100644
--- a/src/dorkbox/util/input/Terminal.java
+++ b/src/dorkbox/inputConsole/Terminal.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input;
+package dorkbox.inputConsole;
import java.io.IOException;
diff --git a/src/dorkbox/util/input/TerminalType.java b/src/dorkbox/inputConsole/TerminalType.java
similarity index 97%
rename from src/dorkbox/util/input/TerminalType.java
rename to src/dorkbox/inputConsole/TerminalType.java
index b6171be..e828286 100644
--- a/src/dorkbox/util/input/TerminalType.java
+++ b/src/dorkbox/inputConsole/TerminalType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input;
+package dorkbox.inputConsole;
public class TerminalType {
public static final String TYPE = "input.terminal";
diff --git a/src/dorkbox/util/input/posix/InputStreamReader.java b/src/dorkbox/inputConsole/posix/InputStreamReader.java
similarity index 99%
rename from src/dorkbox/util/input/posix/InputStreamReader.java
rename to src/dorkbox/inputConsole/posix/InputStreamReader.java
index 306d5d5..3980d85 100644
--- a/src/dorkbox/util/input/posix/InputStreamReader.java
+++ b/src/dorkbox/inputConsole/posix/InputStreamReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input.posix;
+package dorkbox.inputConsole.posix;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/dorkbox/util/input/posix/PosixTerminalControl.java b/src/dorkbox/inputConsole/posix/PosixTerminalControl.java
similarity index 98%
rename from src/dorkbox/util/input/posix/PosixTerminalControl.java
rename to src/dorkbox/inputConsole/posix/PosixTerminalControl.java
index 4574d12..54b9bc0 100644
--- a/src/dorkbox/util/input/posix/PosixTerminalControl.java
+++ b/src/dorkbox/inputConsole/posix/PosixTerminalControl.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input.posix;
-
-import java.nio.ByteBuffer;
+package dorkbox.inputConsole.posix;
import com.sun.jna.Library;
+import java.nio.ByteBuffer;
+
@SuppressWarnings("ALL")
interface PosixTerminalControl extends Library {
diff --git a/src/dorkbox/util/input/posix/TermiosStruct.java b/src/dorkbox/inputConsole/posix/TermiosStruct.java
similarity index 97%
rename from src/dorkbox/util/input/posix/TermiosStruct.java
rename to src/dorkbox/inputConsole/posix/TermiosStruct.java
index 1564894..3d1125e 100644
--- a/src/dorkbox/util/input/posix/TermiosStruct.java
+++ b/src/dorkbox/inputConsole/posix/TermiosStruct.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input.posix;
+package dorkbox.inputConsole.posix;
+
+import com.sun.jna.Structure;
import java.util.Arrays;
import java.util.List;
-import com.sun.jna.Structure;
-
@SuppressWarnings("ALL")
class TermiosStruct extends Structure {
/**
diff --git a/src/dorkbox/util/input/posix/UnixTerminal.java b/src/dorkbox/inputConsole/posix/UnixTerminal.java
similarity index 98%
rename from src/dorkbox/util/input/posix/UnixTerminal.java
rename to src/dorkbox/inputConsole/posix/UnixTerminal.java
index f640453..6ad9039 100644
--- a/src/dorkbox/util/input/posix/UnixTerminal.java
+++ b/src/dorkbox/inputConsole/posix/UnixTerminal.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input.posix;
+package dorkbox.inputConsole.posix;
import java.io.IOException;
import java.io.Reader;
@@ -21,8 +21,8 @@ import java.nio.ByteBuffer;
import com.sun.jna.Native;
-import dorkbox.util.input.Encoding;
-import dorkbox.util.input.Terminal;
+import dorkbox.inputConsole.Encoding;
+import dorkbox.inputConsole.Terminal;
/**
* Terminal that is used for unix platforms. Terminal initialization is handled via JNA and ioctl/tcgetattr/tcsetattr/cfmakeraw.
diff --git a/src/dorkbox/util/input/unsupported/UnsupportedTerminal.java b/src/dorkbox/inputConsole/unsupported/UnsupportedTerminal.java
similarity index 96%
rename from src/dorkbox/util/input/unsupported/UnsupportedTerminal.java
rename to src/dorkbox/inputConsole/unsupported/UnsupportedTerminal.java
index 39968f4..369d82c 100644
--- a/src/dorkbox/util/input/unsupported/UnsupportedTerminal.java
+++ b/src/dorkbox/inputConsole/unsupported/UnsupportedTerminal.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package dorkbox.util.input.unsupported;
+package dorkbox.inputConsole.unsupported;
import java.io.IOException;
import java.io.InputStream;
+import dorkbox.inputConsole.Terminal;
import dorkbox.util.bytes.ByteBuffer2;
-import dorkbox.util.input.Terminal;
public class UnsupportedTerminal extends Terminal {
diff --git a/src/dorkbox/util/input/windows/ConsoleMode.java b/src/dorkbox/inputConsole/windows/ConsoleMode.java
similarity index 98%
rename from src/dorkbox/util/input/windows/ConsoleMode.java
rename to src/dorkbox/inputConsole/windows/ConsoleMode.java
index 0833dea..f88e8b9 100644
--- a/src/dorkbox/util/input/windows/ConsoleMode.java
+++ b/src/dorkbox/inputConsole/windows/ConsoleMode.java
@@ -9,7 +9,7 @@
* @author Marc Prud'hommeaux
* @author Jason Dillon
*/
-package dorkbox.util.input.windows;
+package dorkbox.inputConsole.windows;
/**
* Console mode
diff --git a/src/dorkbox/util/input/windows/WindowsTerminal.java b/src/dorkbox/inputConsole/windows/WindowsTerminal.java
similarity index 98%
rename from src/dorkbox/util/input/windows/WindowsTerminal.java
rename to src/dorkbox/inputConsole/windows/WindowsTerminal.java
index a94dedd..047868d 100644
--- a/src/dorkbox/util/input/windows/WindowsTerminal.java
+++ b/src/dorkbox/inputConsole/windows/WindowsTerminal.java
@@ -9,17 +9,16 @@
* @author Marc Prud'hommeaux
* @author Jason Dillon
*/
-package dorkbox.util.input.windows;
+package dorkbox.inputConsole.windows;
import java.io.IOException;
import java.io.PrintStream;
+import dorkbox.inputConsole.Terminal;
import org.fusesource.jansi.internal.Kernel32.INPUT_RECORD;
import org.fusesource.jansi.internal.Kernel32.KEY_EVENT_RECORD;
import org.fusesource.jansi.internal.WindowsSupport;
-import dorkbox.util.input.Terminal;
-
/**
* Terminal implementation for Microsoft Windows. Terminal initialization in {@link #init} is accomplished by calling the Win32 APIs SetConsoleMode and