diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java b/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java index 12579a5a..190faadc 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java @@ -42,6 +42,8 @@ public class AnsiConsole { private static int installed; + private AnsiConsole() {} + public static OutputStream wrapOutputStream(final OutputStream stream) { return wrapOutputStream(stream, STDOUT_FILENO); } diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java index a46f1415..d1d9338f 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java @@ -47,7 +47,7 @@ public AnsiOutputStream(OutputStream os) { } private final static int MAX_ESCAPE_SEQUENCE_LENGTH=100; - private byte buffer[] = new byte[MAX_ESCAPE_SEQUENCE_LENGTH]; + private byte[] buffer = new byte[MAX_ESCAPE_SEQUENCE_LENGTH]; private int pos=0; private int startOfValue; private final ArrayList options = new ArrayList(); @@ -112,6 +112,8 @@ public void write(int data) throws IOException { reset( processEscapeCommand(options, data) ); } break; + default: + break; case LOOKING_FOR_INT_ARG_END: buffer[pos++] = (byte)data; diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java b/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java index 7db384ba..2bb52b84 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java @@ -58,6 +58,8 @@ public class AnsiRenderer public static final String CODE_LIST_SEPARATOR = ","; + private AnsiRenderer() {} + static public String render(final String input) throws IllegalArgumentException { StringBuffer buff = new StringBuffer(); diff --git a/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java index 8fd8f63e..fcf7fe4f 100644 --- a/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java +++ b/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java @@ -37,7 +37,7 @@ public void close() throws IOException { super.close(); } - private static final String ANSI_COLOR_MAP[] = { "black", "red", + private static final String[] ANSI_COLOR_MAP = { "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", }; private static final byte[] BYTES_QUOT = """.getBytes(); @@ -114,6 +114,8 @@ protected void processSetAttribute(int attribute) throws IOException { break; case ATTRIBUTE_NEGATIVE_Off: break; + default: + break; } } diff --git a/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java index aa056eaf..99798549 100644 --- a/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java +++ b/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java @@ -64,7 +64,7 @@ public final class WindowsAnsiOutputStream extends AnsiOutputStream { private static final short BACKGROUND_CYAN = (short) (BACKGROUND_BLUE|BACKGROUND_GREEN); private static final short BACKGROUND_WHITE = (short) (BACKGROUND_RED|BACKGROUND_GREEN|BACKGROUND_BLUE); - private static final short ANSI_FOREGROUND_COLOR_MAP[] = { + private static final short[] ANSI_FOREGROUND_COLOR_MAP = { FOREGROUND_BLACK, FOREGROUND_RED, FOREGROUND_GREEN, @@ -75,7 +75,7 @@ public final class WindowsAnsiOutputStream extends AnsiOutputStream { FOREGROUND_WHITE, }; - private static final short ANSI_BACKGROUND_COLOR_MAP[] = { + private static final short[] ANSI_BACKGROUND_COLOR_MAP = { BACKGROUND_BLACK, BACKGROUND_RED, BACKGROUND_GREEN, @@ -163,6 +163,9 @@ protected void processEraseScreen(int eraseOption) throws IOException { (info.size.x - info.cursorPosition.x); FillConsoleOutputAttribute(console, originalColors, lengthToEnd, info.cursorPosition.copy(), written); FillConsoleOutputCharacterW(console, ' ', lengthToEnd, info.cursorPosition.copy(), written); + break; + default: + break; } } @@ -187,6 +190,9 @@ protected void processEraseLine(int eraseOption) throws IOException { int lengthToLastCol = info.size.x - info.cursorPosition.x; FillConsoleOutputAttribute(console, originalColors, lengthToLastCol, info.cursorPosition.copy(), written); FillConsoleOutputCharacterW(console, ' ', lengthToLastCol, info.cursorPosition.copy(), written); + break; + default: + break; } } @@ -295,6 +301,8 @@ protected void processSetAttribute(int attribute) throws IOException { negative = false; applyAttribute(); break; + default: + break; } } diff --git a/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample.java b/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample.java index 88d1e771..c262484e 100644 --- a/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample.java +++ b/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample.java @@ -25,6 +25,8 @@ */ public class AnsiConsoleExample { + private AnsiConsoleExample() {} + public static void main(String[] args) throws IOException { String file = "src/test/resources/jansi.ans"; if( args.length>0 ) diff --git a/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample2.java b/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample2.java index db2f5e0e..b18af31f 100755 --- a/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample2.java +++ b/jansi/src/test/java/org/fusesource/jansi/AnsiConsoleExample2.java @@ -26,6 +26,8 @@ */ public class AnsiConsoleExample2 { + private AnsiConsoleExample2() {} + public static void main(String[] args) throws IOException { String file = "src/test/resources/jansi.ans"; if( args.length>0 )