fix issues

Author: peteroupc

src/main/java/com/upokecenter/cbor/CBORCanonical.java

@@ -180,7 +180,7 @@ private static byte[] CtapCanonicalEncode(CBORObject a, int depth) {
 }
 }
         } else if (valueAType == CBORType.Map) {
-          Map.Entry<byte[], byte[]> kv;
+          Map.Entry<byte[], byte[]> kv1;
           ArrayList<Map.Entry<byte[], byte[]>> sortedKeys;
           sortedKeys = new ArrayList<Map.Entry<byte[], byte[]>>();
           for (CBORObject key : cbor.getKeys()) {
@@ -190,27 +190,28 @@ private static byte[] CtapCanonicalEncode(CBORObject a, int depth) {
             }
             // Check if key and value can be canonically encoded
             // (will throw an exception if they cannot)
-            kv = new AbstractMap.SimpleImmutableEntry<byte[], byte[]>(
+            kv1 = new AbstractMap.SimpleImmutableEntry<byte[], byte[]>(
               CtapCanonicalEncode(key, depth + 1),
               CtapCanonicalEncode(cbor.get(key), depth + 1));
-            sortedKeys.add(kv);
+            sortedKeys.add(kv1);
           }
-          Collections.sort(sortedKeys,ByteComparer);
+          java.util.Collections.sort(sortedKeys, ByteComparer);
           {
             java.io.ByteArrayOutputStream ms = null;
 try {
 ms = new java.io.ByteArrayOutputStream();
 
             CBORObject.WriteValue(ms, 5, cbor.size());
             byte[] lastKey = null;
-            for (Map.Entry<byte[], byte[]> kv2 : sortedKeys) {
-              byte[] bytes = kv2.getKey();
+            for (int i = 0; i < sortedKeys.size(); ++i) {
+              kv1 = sortedKeys.get(i);
+              byte[] bytes = kv1.getKey();
               if (lastKey != null && ByteArraysEqual(bytes, lastKey)) {
                 throw new CBORException("duplicate canonical CBOR key");
               }
               lastKey = bytes;
               ms.write(bytes, 0, bytes.length);
-              bytes = kv2.getValue();
+              bytes = kv1.getValue();
               ms.write(bytes, 0, bytes.length);
             }
             return ms.toByteArray();

src/test/java/com/upokecenter/test/CBORTest.java

@@ -3197,25 +3197,23 @@ public void TestCtap2CanonicalDecodeEncode() {
    bytes = cbor.EncodeToBytes(options);
    try {
  cbor2 = CBORObject.DecodeFromBytes(bytes, options);
-} catch (Exception ex) {
- System.out.println(ex.getMessage());
- System.out.println(ex.getStackTrace());
- Assert.fail(ex.toString());
- throw new IllegalStateException("", ex);
+} catch (Exception ex2) {
+ Assert.fail(ex2.toString());
+ throw new IllegalStateException("", ex2);
 }
    byte[] bytes2 = cbor2.EncodeToBytes(options);
    TestCommon.AssertByteArraysEqual(bytes, bytes2);
- } catch (CBORException ex) {
+ } catch (CBORException ex4) {
    // Canonical encoding failed, so DecodeFromBytes must fail
    bytes = cbor.EncodeToBytes();
    try {
  CBORObject.DecodeFromBytes(bytes, options);
  Assert.fail("Should have failed");
-} catch (CBORException ex2) {
+} catch (CBORException ex) {
 // NOTE: Intentionally empty
-} catch (Exception ex2) {
- Assert.fail(ex2.toString());
- throw new IllegalStateException("", ex2);
+} catch (Exception ex3) {
+ Assert.fail(ex3.toString());
+ throw new IllegalStateException("", ex3);
 }
  }
 }

src/test/java/com/upokecenter/test/FieldClass.java

@@ -0,0 +1,15 @@
+package com.upokecenter.test;
+/*
+Written by Peter O. in 2014.
+Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/
+If you like this, you should donate to Peter O.
+at: http://peteroupc.github.io/
+ */
+
+   public final class FieldClass {
+       public int publicFieldA;
+       public final int ReadonlyFieldA = 33;
+       private int PrivateFieldA;
+       private final int PrivateFieldB = 44;
+    }

src/test/java/com/upokecenter/test/ToObjectTest.java

@@ -1103,13 +1103,6 @@ public void TestAsString() {
       }
     }
 
-    private static final class FieldClass {
-       public int PublicFieldA;
-       public final int ReadonlyFieldA = 33;
-       private int privateFieldA;
-       private final int privateFieldB = 44;
-       private static int staticFieldA;
-    }
 
     @Test
     public void TestToObjectFieldClass() {
@@ -1145,7 +1138,7 @@ public void TestToObjectFieldClass() {
       co.set("privateFieldA",ToObjectTest.TestToFromObjectRoundTrip(999));
       co.set("publicFieldA",ToObjectTest.TestToFromObjectRoundTrip(999));
       fc = (FieldClass)co.ToObject(FieldClass.class);
-      Assert.assertEquals(999, fc.PublicFieldA);
+      Assert.assertEquals(999, fc.publicFieldA);
     }
 
     @Test(timeout = 5000)