svn commit: r480973 - in /incubator/qpid/trunk/qpid/java: client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java common/src/main/java/org/apache/qpid/framing/FieldTable.java

[ritchiem]

Author: ritchiem
Date: Thu Nov 30 07:44:07 2006
New Revision: 480973

URL: http://svn.apache.org/viewvc?view=rev&rev=480973
Log:
FieldTable.java no longer has a keys() method as it already has a keySet().  
Plus the implementation was broken.

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java?view=diff&rev=480973&r1=480972&r2=480973
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
 Thu Nov 30 07:44:07 2006
@@ -25,6 +25,8 @@
 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 @@
         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()

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java?view=diff&rev=480973&r1=480972&r2=480973
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
 Thu Nov 30 07:44:07 2006
@@ -71,10 +71,10 @@
             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 @@
         }
 
         return encodingSize;
-    }   
-
-    public Enumeration keys()
-    {
-        return new FieldTableKeyEnumeration(this);
     }
 }