diff options
| author | Craig Black <craig.black@aonix.com> | 2004-11-18 12:53:12 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-11-18 12:53:12 +0000 |
| commit | f0b4747b4cbed05b39a834beaa9525cf2619dbef (patch) | |
| tree | d24efec5a262a8283ca44dcab5e5ffc1c76b625e /libjava | |
| parent | b8610a53763f72f32f5c1c79840d96ba147d93d6 (diff) | |
| download | gcc-f0b4747b4cbed05b39a834beaa9525cf2619dbef.zip gcc-f0b4747b4cbed05b39a834beaa9525cf2619dbef.tar.gz gcc-f0b4747b4cbed05b39a834beaa9525cf2619dbef.tar.bz2 | |
BeanInfoEmbryo.java: Use TreeMap for proper sorting.
2004-11-18 Craig Black <craig.black@aonix.com>
* gnu/java/beans/BeanInfoEmbryo.java: Use TreeMap for proper sorting.
From-SVN: r90858
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/beans/BeanInfoEmbryo.java | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 388a5f9..0e945c5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-11-18 Craig Black <craig.black@aonix.com> + + * gnu/java/beans/BeanInfoEmbryo.java: Use TreeMap for proper sorting. + 2004-11-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> * Makefile.am: Correct friend function declaration. diff --git a/libjava/gnu/java/beans/BeanInfoEmbryo.java b/libjava/gnu/java/beans/BeanInfoEmbryo.java index 2dc1166..7c60e7c 100644 --- a/libjava/gnu/java/beans/BeanInfoEmbryo.java +++ b/libjava/gnu/java/beans/BeanInfoEmbryo.java @@ -48,6 +48,9 @@ import java.lang.reflect.Method; import java.util.Arrays; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; import java.util.Vector; /** @@ -66,7 +69,10 @@ import java.util.Vector; **/ public class BeanInfoEmbryo { - Hashtable properties = new Hashtable(); + + // by using a TreeMap the properties will be sorted alphabetically by name + // which matches the (undocumented) behavior of jdk + TreeMap properties = new TreeMap(); Hashtable events = new Hashtable(); Vector methods = new Vector(); @@ -85,9 +91,9 @@ public class BeanInfoEmbryo { PropertyDescriptor[] Aproperties = new PropertyDescriptor[properties.size()]; int i = 0; - Enumeration e = properties.elements(); - while (e.hasMoreElements()) { - Aproperties[i] = (PropertyDescriptor) e.nextElement(); + Iterator it = properties.entrySet().iterator(); + while (it.hasNext()) { + Aproperties[i] = (PropertyDescriptor) (((Map.Entry)it.next()).getValue()); if(defaultPropertyName != null && Aproperties[i].getName().equals(defaultPropertyName)) { defaultProperty = i; } @@ -96,7 +102,7 @@ public class BeanInfoEmbryo { EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()]; i = 0; - e = events.elements(); + Enumeration e = events.elements(); while (e.hasMoreElements()) { Aevents[i] = (EventSetDescriptor) e.nextElement(); if(defaultEventName != null && Aevents[i].getName().equals(defaultEventName)) { |