JDK9 compatibility: removing explicit boxing, #48

jline · Nov 21, 2016 · 12e5b85 · 12e5b85
1 parent c768abb
commit 12e5b85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/jline/terminal/impl/jna/win/AnsiOutputStream.java b/src/main/java/org/jline/terminal/impl/jna/win/AnsiOutputStream.java
@@ -95,9 +95,9 @@ public void write(int data) throws IOException {
                 } else if (';' == data) {
                     options.add(null);
                 } else if ('?' == data) {
-                    options.add(new Character('?'));
+                    options.add('?');
                 } else if ('=' == data) {
-                    options.add(new Character('='));
+                    options.add('=');
                 } else {
                     reset(processEscapeCommand(options, data));
                 }
@@ -107,7 +107,7 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (!('0' <= data && data <= '9')) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.parseInt(strValue);
                     options.add(value);
                     if (data == ';') {
                         state = LOOKING_FOR_NEXT_ARG;
@@ -144,7 +144,7 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (';' == data) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.parseInt(strValue);
                     options.add(value);
                     startOfValue = pos;
                     state = LOOKING_FOR_OSC_PARAM;

diff --git a/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiOutputStream.java b/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiOutputStream.java
@@ -186,7 +186,7 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (!('0' <= data && data <= '9')) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.parseInt(strValue);
                     options.add(value);
                     if (data == ';') {
                         state = LOOKING_FOR_NEXT_ARG;
@@ -223,7 +223,7 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (';' == data) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.parseInt(strValue);
                     options.add(value);
                     startOfValue = pos;
                     state = LOOKING_FOR_OSC_PARAM;

diff --git a/src/test/java/org/jline/example/PasswordReader.java b/src/test/java/org/jline/example/PasswordReader.java
@@ -29,8 +29,8 @@ public static void main(String[] args) throws IOException {
                 .terminal(terminal).build();
 
         Character mask = (args.length == 0)
-            ? new Character((char) 0)
-            : new Character(args[0].charAt(0));
+            ? (char) 0
+            : args[0].charAt(0);
 
         String line;
         do {