Fixes minor style issues.

Author: olivertwistor

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>nu.olivertwistor</groupId>
     <artifactId>java-tui</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
 
     <licenses>
         <license>
@@ -16,14 +16,6 @@
         </license>
     </licenses>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations-java5</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/nu/olivertwistor/java/tui/Terminal.java

@@ -7,19 +7,20 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Utility class for writing to and reading from the terminal (standard input
  * and output).
- *
+ * <p>
  * It has convenience methods for reading strings and integers, as well as
  * writing string representations of objects. Many of these methods are
  * wrappers for {@link PrintStream} and {@link BufferedReader}.
  *
  * @since  0.1.0
  */
-@SuppressWarnings({"ClassWithoutLogger", "UtilityClassCanBeEnum",
-        "PublicMethodWithoutLogging"})
+@SuppressWarnings({"ClassWithoutLogger", "PublicMethodWithoutLogging",
+        "WeakerAccess"})
 public final class Terminal
 {
     /**
@@ -110,7 +111,7 @@ public static String readString(final String prompt, final Charset charset)
     @SuppressWarnings("WeakerAccess")
     public static String readString(final String prompt) throws IOException
     {
-        return Terminal.readString(prompt, StandardCharsets.UTF_8);
+        return readString(prompt, StandardCharsets.UTF_8);
     }
 
     /**
@@ -129,7 +130,7 @@ public static String readString(final String prompt) throws IOException
      */
     public static String readString(final Charset charset) throws IOException
     {
-        return Terminal.readString("", charset);
+        return readString("", charset);
     }
 
     /**
@@ -146,7 +147,7 @@ public static String readString(final Charset charset) throws IOException
      */
     public static String readString() throws IOException
     {
-        return Terminal.readString("");
+        return readString("");
     }
 
     /**
@@ -169,7 +170,7 @@ public static String readString() throws IOException
      */
     public static int readInt(final String prompt) throws IOException
     {
-        final String rawInput = Terminal.readString(prompt);
+        final String rawInput = readString(prompt);
         final int intInput = Integer.parseInt(rawInput);
 
         return intInput;
@@ -191,7 +192,7 @@ public static int readInt(final String prompt) throws IOException
      */
     public static int readInt() throws IOException
     {
-        return Terminal.readInt("");
+        return readInt("");
     }
 
     /**
@@ -211,17 +212,19 @@ public static int readInt() throws IOException
      *
      * @throws IOException if reading from standard input failed.
      *
-     * @since //todo next released version
+     * @since 0.3.0
      *
      * @see BufferedReader#readLine()
      */
     public static boolean readBoolean(final String prompt,
                                       final Charset charset,
-                                      String ...truthyValues)
+                                      final String[] truthyValues)
             throws IOException
     {
-        final String rawInput = Terminal.readString(prompt, charset);
-        return Arrays.asList(truthyValues).contains(rawInput);
+        final String rawInput = readString(prompt, charset);
+        final List<String> strings = Arrays.asList(truthyValues);
+
+        return strings.contains(rawInput);
     }
 
     /**
@@ -239,16 +242,15 @@ public static boolean readBoolean(final String prompt,
      *
      * @throws IOException if reading from standard input failed.
      *
-     * @since //todo next released version
+     * @since 0.3.0
      *
      * @see BufferedReader#readLine()
      */
     public static boolean readBoolean(final String prompt,
-                                      String ...truthyValues)
+                                      final String[] truthyValues)
             throws IOException
     {
-        return Terminal.readBoolean(
-                prompt, StandardCharsets.UTF_8, truthyValues);
+        return readBoolean(prompt, StandardCharsets.UTF_8, truthyValues);
     }
 
     /**

src/main/java/nu/olivertwistor/java/tui/UnclosableInputStream.java

@@ -1,15 +1,12 @@
 package nu.olivertwistor.java.tui;
 
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
  * A decorator for InputStream. It does what the underlying InputStream does
- * with the exception of {@link InputStream#close()}. Instead of closing it, it
- * does nothing.
+ * except for {@link InputStream#close()}. Instead of closing it, it does
+ * nothing.
  *
  * @author nkukhar https://stackoverflow.com/users/369280/nkukhar
  * @author Johan Nilsson
@@ -19,7 +16,8 @@
  * @see <a href="https://stackoverflow.com/a/14962425/2267803">
  *      Idea taken from an Stack Overflow answer by nkukhar</a>
  */
-@SuppressWarnings({"ClassWithoutLogger", "PublicMethodWithoutLogging"})
+@SuppressWarnings({"ClassWithoutLogger", "PublicMethodWithoutLogging",
+        "WeakerAccess"})
 public final class UnclosableInputStream extends InputStream
 {
     /**
@@ -49,13 +47,13 @@ public int read() throws IOException
     }
 
     @Override
-    public int read(@NotNull final byte[] b) throws IOException
+    public int read(final byte[] b) throws IOException
     {
         return this.inputStream.read(b);
     }
 
     @Override
-    public int read(@NotNull final byte[] b, final int off, final int len)
+    public int read(final byte[] b, final int off, final int len)
             throws IOException
     {
         return this.inputStream.read(b, off, len);
@@ -103,11 +101,9 @@ public void close()
     }
 
     @Override
-    @NonNls
     public String toString()
     {
-        return "UnclosableInputStream{" +
-                "inputStream=" + this.inputStream +
-                '}';
+        return String.format("UnclosableInputStream[inputStream=%s]",
+                this.inputStream);
     }
 }