From 4cd22d5ff1e552b1f0d4d93ef8fd0b023a774d94 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Thu, 30 Nov 2006 15:44:07 +0000
Subject: FieldTable.java no longer has a keys() method as it already has a
 keySet().  Plus the implementation was broken.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@480973 13f79535-47bb-0310-9956-ffa450edef68
---
 .../unit/basic/FieldTableKeyEnumeratorTest.java    | 22 ++++++++++++++++------
 .../java/org/apache/qpid/framing/FieldTable.java   |  9 ++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
index 079def81d0..2e740aa3eb 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
@@ -25,6 +25,8 @@ import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
 
 import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 import javax.jms.JMSException;
 
@@ -41,13 +43,21 @@ public class FieldTableKeyEnumeratorTest extends TestCase
         result.put("four", 4L);
         result.put("five", 5L);
 
-        Enumeration e = result.keys();
+        Iterator iterator = result.keySet().iterator();
+
+        try
+        {
+            assertTrue("one".equals(iterator.next()));
+            assertTrue("two".equals(iterator.next()));
+            assertTrue("three".equals(iterator.next()));
+            assertTrue("four".equals(iterator.next()));
+            assertTrue("five".equals(iterator.next()));
+        }
+        catch (NoSuchElementException e)
+        {
+            fail("All elements should be found.");
+        }
 
-        assertTrue("one".equals(e.nextElement()));
-        assertTrue("two".equals(e.nextElement()));
-        assertTrue("three".equals(e.nextElement()));
-        assertTrue("four".equals(e.nextElement()));
-        assertTrue("five".equals(e.nextElement()));
     }
 
     public void testPropertEnu()
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index be456c8754..796e1843af 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
@@ -71,10 +71,10 @@ public class FieldTable extends LinkedHashMap
             Object value;
             switch (type)
             {
-                case 'S':
+                case'S':
                     value = EncodingUtils.readLongString(buffer);
                     break;
-                case 'I':
+                case'I':
                     value = new Long(buffer.getUnsignedInt());
                     break;
                 default:
@@ -313,10 +313,5 @@ public class FieldTable extends LinkedHashMap
         }
 
         return encodingSize;
-    }   
-
-    public Enumeration keys()
-    {
-        return new FieldTableKeyEnumeration(this);
     }
 }
-- 
cgit v1.2.1