[Mulgara-svn] r575 - branches/mgr-73/src/jar/util/java/org/mulgara/util

[andrae at mulgara.org]

Author: andrae
Date: 2007-11-21 05:21:21 -0600 (Wed, 21 Nov 2007)
New Revision: 575

Modified:
   branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java
Log:
Needed to be able to access the key-set.  Also modified Iterator to iterate over
Entries rather than Keys.



Modified: branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java
===================================================================
--- branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java	2007-11-21 11:20:05 UTC (rev 574)
+++ branches/mgr-73/src/jar/util/java/org/mulgara/util/Assoc1toNMap.java	2007-11-21 11:21:21 UTC (rev 575)
@@ -20,6 +20,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -37,7 +38,7 @@
  * @licence Open Software License v3.0</a>
  */
 
-public class Assoc1toNMap<T1,T2> implements Iterable<T1> {
+public class Assoc1toNMap<T1,T2> implements Iterable<Map.Entry<T1,Set<T2>>> {
   private Map<T1, Set<T2>> map1toN;
   private Map<T2, T1> mapNto1;
 
@@ -89,6 +90,11 @@
     return mapNto1.containsKey(t2);
   }
 
-  public Iterator<T1> iterator() {
-    return map1toN.keySet().iterator();
+  public Set<T1> getKeySet() {
+    return map1toN.keySet();
+  }
+
+  public Iterator<Map.Entry<T1,Set<T2>>> iterator() {
+    return map1toN.entrySet().iterator();
+  }
 }