[Swixat-cvscommit] swixat/src/main/java/org/swixat/util SwiXUtil.java, 1.1.2.4, 1.1.2.5

[Benjamin P. <bpo...@us...>]

Update of /cvsroot/swixat/swixat/src/main/java/org/swixat/util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25300/src/main/java/org/swixat/util

Modified Files:
      Tag: B0_5_5
	SwiXUtil.java 
Log Message:
in getValues method add support for Map and Iterable


Index: SwiXUtil.java
===================================================================
RCS file: /cvsroot/swixat/swixat/src/main/java/org/swixat/util/Attic/SwiXUtil.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** SwiXUtil.java	6 Apr 2006 19:04:36 -0000	1.1.2.4
--- SwiXUtil.java	26 Sep 2006 10:21:35 -0000	1.1.2.5
***************
*** 39,42 ****
--- 39,44 ----
  import java.util.Iterator;
  import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
  
  import javax.swing.JComponent;
***************
*** 257,260 ****
--- 259,264 ----
       * <li>Iterator -> [iterator values]
       * <li>Array -> [array values]
+      * <li>Map -> [EntrySet values]
+      * <li>Iterable -> [iterator values]
       * <li>other -> [other] array with one value
       * 
***************
*** 277,280 ****
--- 281,295 ----
           } else if (data.getClass().isArray() ) {
               result = (Object[])data;
+          } else if (data instanceof Map) {
+              Set entries = ((Map)data).entrySet();
+              result = entries.toArray();
+          } else if (data instanceof Iterable) {
+              Iterator iter = ((Iterable)data).iterator();
+              ArrayList list = new ArrayList();
+              while (iter.hasNext()) {
+                  list.add(iter.next());
+              }
+              result = list.toArray();
+              
           } else {
               result = new Object[]{data};