Enable MultiHashMap compilation on J#

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@372373 13f79535-47bb-0310-9956-ffa450edef68

RELEASE-NOTES.html

@@ -95,6 +95,7 @@ If this causes major headaches to anyone please contact commons-dev at jakarta.a
 <li>BeanMap.initialize() - Internal variable now correctly initialised with only write methods that actually exist [15895]</li>
 <li>MultiHashMap.remove(key, item) - Was returning the item even when nothing was removed [32366]</li>
 <li>MultiHashMap.putAll(multimap) - Was adding the collection as a single item rather than individually [35631]</li>
+<li>MultiHashMap - Enable compilation using J#</li>
 <li>Flat3Map.equals() - Fix to make flat mode comparison actually work [34917]</li>
 <li>TransformedMap.putAll - Now allows putAll of an empty map [34686]</li>
 <li>StaticBucketMap - containsKey - Fix incorrect null checking [37567]</li>

project.xml

@@ -340,6 +340,9 @@
     <contributor>
       <name>Daniel Rall</name>
     </contributor>
+    <contributor>
+      <name>Robert Ribnitz</name>
+    </contributor>
     <contributor>
       <name>Huw Roberts</name>
     </contributor>

src/java/org/apache/commons/collections/MultiHashMap.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2005 The Apache Software Foundation
+ *  Copyright 2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -63,6 +63,7 @@ import org.apache.commons.collections.iterators.EmptyIterator;
  * @author Stephen Colebourne
  * @author Julien Buret
  * @author Serhiy Yevtushenko
+ * @author Robert Ribnitz
  */
 public class MultiHashMap extends HashMap implements MultiMap {
     
@@ -375,6 +376,15 @@ public class MultiHashMap extends HashMap implements MultiMap {
         return (vs != null ? vs : (values = new Values()));
     }
 
+    /**
+     * Gets the values iterator from the superclass, as used by inner class.
+     *
+     * @return iterator
+     */
+    Iterator superValuesIterator() {
+        return super.values().iterator();
+    }
+
     //-----------------------------------------------------------------------
     /**
      * Inner class to view the elements.
@@ -409,7 +419,7 @@ public class MultiHashMap extends HashMap implements MultiMap {
         private Iterator tempIterator;
 
         private ValueIterator() {
-            backedIterator = MultiHashMap.super.values().iterator();
+            backedIterator = MultiHashMap.this.superValuesIterator();
         }
 
         private boolean searchNextIterator() {