misc cleanup

lopex · lopex · commit 3bcdcd3573c4 · 2017-12-27T11:42:42.000+01:00
diff --git a/src/org/jcodings/unicode/UnicodeEncoding.java b/src/org/jcodings/unicode/UnicodeEncoding.java
@@ -579,9 +579,9 @@ private static CaseInsensitiveBytesHash<Integer> initializeCTypeNameTable() {
     private static class CodeList {
         CodeList(DataInputStream dis) throws IOException {
             int packed = dis.readInt();
-            this.flags = packed & ~Config.CodePointMask;
+            flags = packed & ~Config.CodePointMask;
             int length = packed & Config.CodePointMask;
-            this.codes = new int[length];
+            codes = new int[length];
             for (int j = 0; j < length; j++) {
                 codes[j] = dis.readInt();
             }
@@ -744,12 +744,13 @@ static ArrayList<int[]> read() {
                     }
                     values.add(codes);
                 }
+                dis.close();
                 return values;
             } catch (IOException ioe) {
                 throw new RuntimeException(ioe);
             }
         }
 
-        private static ArrayList<int[]> Values = read();
+        static final ArrayList<int[]> Values = read();
     }
 }
diff --git a/test/org/jcodings/specific/TestUnicode.java b/test/org/jcodings/specific/TestUnicode.java
@@ -39,7 +39,7 @@ String caseMap(String fromS, int flags) throws Exception {
         IntHolder flagP = new IntHolder();
         flagP.value = flags;
         int len = enc.caseMap(flagP, from, fromP, from.length, to, 0, to.length);
-        return new String(to, 0, len);
+        return new String(to, 0, len, "utf-8");
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -579,9 +579,9 @@ private static CaseInsensitiveBytesHash<Integer> initializeCTypeNameTable() {`
`579`	`579`	`private static class CodeList {`
`580`	`580`	`CodeList(DataInputStream dis) throws IOException {`
`581`	`581`	`int packed = dis.readInt();`
`582`		`- this.flags = packed & ~Config.CodePointMask;`
	`582`	`+ flags = packed & ~Config.CodePointMask;`
`583`	`583`	`int length = packed & Config.CodePointMask;`
`584`		`- this.codes = new int[length];`
	`584`	`+ codes = new int[length];`
`585`	`585`	`for (int j = 0; j < length; j++) {`
`586`	`586`	`codes[j] = dis.readInt();`
`587`	`587`	`}`
`@@ -744,12 +744,13 @@ static ArrayList<int[]> read() {`
`744`	`744`	`}`
`745`	`745`	`values.add(codes);`
`746`	`746`	`}`
	`747`	`+ dis.close();`
`747`	`748`	`return values;`
`748`	`749`	`} catch (IOException ioe) {`
`749`	`750`	`throw new RuntimeException(ioe);`
`750`	`751`	`}`
`751`	`752`	`}`
`752`	`753`
`753`		`- private static ArrayList<int[]> Values = read();`
	`754`	`+ static final ArrayList<int[]> Values = read();`
`754`	`755`	`}`
`755`	`756`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ String caseMap(String fromS, int flags) throws Exception {`
`39`	`39`	`IntHolder flagP = new IntHolder();`
`40`	`40`	`flagP.value = flags;`
`41`	`41`	`int len = enc.caseMap(flagP, from, fromP, from.length, to, 0, to.length);`
`42`		`- return new String(to, 0, len);`
	`42`	`+ return new String(to, 0, len, "utf-8");`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Test`