Minor cleanup and removing dead code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/00f7dda8 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/00f7dda8 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/00f7dda8 Branch: refs/heads/master Commit: 00f7dda82bbcc201d70607837c857903a9428628 Parents: 488257b Author: ajs6f <[email protected]> Authored: Sat Oct 8 14:55:36 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:30 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/jena/atlas/io/BlockUTF8.java | 12 ------------ .../org/apache/jena/atlas/io/InStreamUTF8.java | 6 ------ .../apache/jena/atlas/lib/tuple/TupleMap.java | 19 +++++++------------ .../atlas/logging/java/ConsoleHandlerStream.java | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/00f7dda8/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java index 2d5560b..a8401cb 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java @@ -22,8 +22,6 @@ import java.io.IOException ; import java.nio.ByteBuffer ; import java.nio.CharBuffer ; -import org.apache.jena.atlas.lib.NotImplemented ; - /** * Convert between bytes and chars, UTF-8 only. * @@ -154,11 +152,6 @@ public class BlockUTF8 } } } - - private static void toCharsArray(byte[] bytes, char[] chars) - { - throw new NotImplemented() ; - } private static void fromCharsBuffer(CharBuffer cb, ByteBuffer bb) { @@ -227,11 +220,6 @@ public class BlockUTF8 } //int bytesFinish = bb.position() ; } - - private static void fromCharsArray(char[] array, byte[] array2) - { - throw new NotImplemented() ; - } public static void fromChars(CharSequence cs, ByteBuffer bb) { http://git-wip-us.apache.org/repos/asf/jena/blob/00f7dda8/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java index 5253b64..0b2347a 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java @@ -216,12 +216,6 @@ public final class InStreamUTF8 extends Reader implements CharStream return x ; } - private static void p(int ch) { - System.out.printf(" %02X", ch); - if ( ch == -1 ) - System.out.println(); - } - public static String decode(byte[] bytes) { try { char[] chars = new char[bytes.length]; http://git-wip-us.apache.org/repos/asf/jena/blob/00f7dda8/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java index bc4f69e..87bfca5 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java @@ -24,6 +24,7 @@ import java.util.ArrayList ; import java.util.Arrays; import java.util.Collections ; import java.util.List; +import java.util.StringJoiner; import org.apache.jena.atlas.AtlasException; import org.apache.jena.atlas.lib.ListUtils ; @@ -272,7 +273,7 @@ public class TupleMap { } /** Apply an index transformation */ - private <T> void applyArray(T[] src, T[] dst, int[] transform) { + private static <T> void applyArray(T[] src, T[] dst, int[] transform) { for ( int i = 0 ; i < src.length ; i++ ) { int j = transform[i] ; dst[i] = src[j] ; @@ -362,7 +363,7 @@ public class TupleMap { return arrayToList(putTransform) ; } - private List<Integer> arrayToList(int[] array) { + private static List<Integer> arrayToList(int[] array) { List<Integer> list = new ArrayList<>(array.length) ; for ( int x : array ) list.add(x) ; @@ -381,18 +382,12 @@ public class TupleMap { return format("%s:%s:%s", label, mapStr(putTransform, "->"), mapStr(getTransform, "<-")); } - private Object mapStr(int[] map, String arrow) { - StringBuilder buff = new StringBuilder(); - String sep = "{"; - + private static Object mapStr(int[] map, String arrow) { + StringJoiner j = new StringJoiner(", ", "{", "}"); for ( int i = 0 ; i < map.length ; i++ ) { - buff.append(sep); - sep = ", "; - buff.append(format("%d%s%d", i, arrow, map[i])); + j.add(format("%d%s%d", i, arrow, map[i])); } - buff.append("}"); - - return buff.toString(); + return j.toString(); } public String getLabel() { http://git-wip-us.apache.org/repos/asf/jena/blob/00f7dda8/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java index d900b1e..6eaf63a 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java @@ -105,7 +105,7 @@ public class ConsoleHandlerStream extends StreamHandler { } } - private String getProperty(LogManager manager, String cname, String pname) { + private static String getProperty(LogManager manager, String cname, String pname) { return manager.getProperty(cname+"."+pname); }
