diff --git a/jansi/src/main/java/org/fusesource/jansi/Ansi.java b/jansi/src/main/java/org/fusesource/jansi/Ansi.java index 00abc13a..658362ab 100644 --- a/jansi/src/main/java/org/fusesource/jansi/Ansi.java +++ b/jansi/src/main/java/org/fusesource/jansi/Ansi.java @@ -29,7 +29,7 @@ public class Ansi { private static final char FIRST_ESC_CHAR = 27; private static final char SECOND_ESC_CHAR = '['; - public static enum Color { + public enum Color { BLACK(0, "BLACK"), RED(1, "RED"), GREEN(2, "GREEN"), @@ -74,9 +74,7 @@ public int bgBright() { } } - ; - - public static enum Attribute { + public enum Attribute { RESET(0, "RESET"), INTENSITY_BOLD(1, "INTENSITY_BOLD"), INTENSITY_FAINT(2, "INTENSITY_FAINT"), @@ -115,9 +113,7 @@ public int value() { } - ; - - public static enum Erase { + public enum Erase { FORWARD(0, "FORWARD"), BACKWARD(1, "BACKWARD"), ALL(2, "ALL"); @@ -140,8 +136,6 @@ public int value() { } } - ; - public static final String DISABLE = Ansi.class.getName() + ".disable"; private static Callable detector = new Callable() { diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java index 0a8f77e7..f5d4c5a3 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiOutputStream.java @@ -46,7 +46,7 @@ public AnsiOutputStream(OutputStream os) { } private final static int MAX_ESCAPE_SEQUENCE_LENGTH = 100; - private byte[] buffer = new byte[MAX_ESCAPE_SEQUENCE_LENGTH]; + private final byte[] buffer = new byte[MAX_ESCAPE_SEQUENCE_LENGTH]; private int pos = 0; private int startOfValue; private final ArrayList options = new ArrayList(); @@ -104,9 +104,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)); } @@ -224,7 +224,7 @@ private int getNextOptionInt(Iterator optionsIterator) throws IOExceptio throw new IllegalArgumentException(); Object arg = optionsIterator.next(); if (arg != null) - return ((Integer)arg).intValue(); + return (Integer) arg; } } @@ -288,7 +288,7 @@ private boolean processEscapeCommand(ArrayList options, int command) thr Object next = optionsIterator.next(); if (next != null) { count++; - int value = ((Integer) next).intValue(); + int value = (Integer) next; if (30 <= value && value <= 37) { processSetForegroundColor(value - 30); } else if (40 <= value && value <= 47) { @@ -552,7 +552,7 @@ private int optionInt(ArrayList options, int index) { throw new IllegalArgumentException(); if (!value.getClass().equals(Integer.class)) throw new IllegalArgumentException(); - return ((Integer) value).intValue(); + return (Integer) value; } private int optionInt(ArrayList options, int index, int defaultValue) { @@ -561,7 +561,7 @@ private int optionInt(ArrayList options, int index, int defaultValue) { if (value == null) { return defaultValue; } - return ((Integer) value).intValue(); + return (Integer) value; } return defaultValue; } diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java b/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java index 7677da84..2a432ea2 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiRenderer.java @@ -45,22 +45,20 @@ * @since 1.1 */ public class AnsiRenderer { - public static final String BEGIN_TOKEN = "@|"; - private static final int BEGIN_TOKEN_LEN = 2; + public static final String BEGIN_TOKEN = "@|"; public static final String END_TOKEN = "|@"; - private static final int END_TOKEN_LEN = 2; - public static final String CODE_TEXT_SEPARATOR = " "; public static final String CODE_LIST_SEPARATOR = ","; - private AnsiRenderer() { - } + private static final int BEGIN_TOKEN_LEN = 2; + + private static final int END_TOKEN_LEN = 2; - static public String render(final String input) throws IllegalArgumentException { + public static String render(final String input) throws IllegalArgumentException { try { return render(input, new StringBuilder()).toString(); } catch (IOException e) { @@ -80,7 +78,7 @@ static public String render(final String input) throws IllegalArgumentException * @throws IOException * If an I/O error occurs */ - static public Appendable render(final String input, Appendable target) throws IOException { + public static Appendable render(final String input, Appendable target) throws IOException { int i = 0; int j, k; @@ -118,7 +116,7 @@ static public Appendable render(final String input, Appendable target) throws IO } } - static public String render(final String text, final String... codes) { + public static String render(final String text, final String... codes) { Ansi ansi = Ansi.ansi(); for (String name : codes) { Code code = Code.valueOf(name.toUpperCase(Locale.ENGLISH)); @@ -141,7 +139,7 @@ public static boolean test(final String text) { return text != null && text.contains(BEGIN_TOKEN); } - public static enum Code { + public enum Code { // // TODO: Find a better way to keep Code in sync with Color/Attribute/Erase // @@ -202,13 +200,13 @@ public static enum Code { private final boolean background; @SuppressWarnings("unchecked") - private Code(final Enum n, boolean background) { + Code(final Enum n, boolean background) { this.n = n; this.background = background; } @SuppressWarnings("unchecked") - private Code(final Enum n) { + Code(final Enum n) { this(n, false); } @@ -232,4 +230,8 @@ public boolean isBackground() { return background; } } + + private AnsiRenderer() { + } + } diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiString.java b/jansi/src/main/java/org/fusesource/jansi/AnsiString.java index 6b14a49c..646f11de 100644 --- a/jansi/src/main/java/org/fusesource/jansi/AnsiString.java +++ b/jansi/src/main/java/org/fusesource/jansi/AnsiString.java @@ -15,8 +15,6 @@ */ package org.fusesource.jansi; -import org.fusesource.jansi.AnsiOutputStream; - import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java index 71054efc..2845951a 100644 --- a/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java +++ b/jansi/src/main/java/org/fusesource/jansi/HtmlAnsiOutputStream.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.List; -import org.fusesource.jansi.AnsiOutputStream; - /** * @author Daniel Doubrovkine */ @@ -47,7 +45,7 @@ public HtmlAnsiOutputStream(OutputStream os) { super(os); } - private List closingAttributes = new ArrayList(); + private final List closingAttributes = new ArrayList(); private void write(String s) throws IOException { super.out.write(s.getBytes());