You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2006/01/26 01:10:48 UTC
svn commit: r372373 - in /jakarta/commons/proper/collections/trunk:
RELEASE-NOTES.html project.xml
src/java/org/apache/commons/collections/MultiHashMap.java
Author: scolebourne
Date: Wed Jan 25 16:10:43 2006
New Revision: 372373
URL: http://svn.apache.org/viewcvs?rev=372373&view=rev
Log:
Enable MultiHashMap compilation on J#
Modified:
jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
jakarta/commons/proper/collections/trunk/project.xml
jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/MultiHashMap.java
Modified: jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html?rev=372373&r1=372372&r2=372373&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html (original)
+++ jakarta/commons/proper/collections/trunk/RELEASE-NOTES.html Wed Jan 25 16:10:43 2006
@@ -95,6 +95,7 @@
<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>
Modified: jakarta/commons/proper/collections/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/project.xml?rev=372373&r1=372372&r2=372373&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/project.xml (original)
+++ jakarta/commons/proper/collections/trunk/project.xml Wed Jan 25 16:10:43 2006
@@ -341,6 +341,9 @@
<name>Daniel Rall</name>
</contributor>
<contributor>
+ <name>Robert Ribnitz</name>
+ </contributor>
+ <contributor>
<name>Huw Roberts</name>
</contributor>
<contributor>
Modified: jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/MultiHashMap.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/MultiHashMap.java?rev=372373&r1=372372&r2=372373&view=diff
==============================================================================
--- jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/MultiHashMap.java (original)
+++ jakarta/commons/proper/collections/trunk/src/java/org/apache/commons/collections/MultiHashMap.java Wed Jan 25 16:10:43 2006
@@ -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 @@
* @author Stephen Colebourne
* @author Julien Buret
* @author Serhiy Yevtushenko
+ * @author Robert Ribnitz
*/
public class MultiHashMap extends HashMap implements MultiMap {
@@ -375,6 +376,15 @@
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 @@
private Iterator tempIterator;
private ValueIterator() {
- backedIterator = MultiHashMap.super.values().iterator();
+ backedIterator = MultiHashMap.this.superValuesIterator();
}
private boolean searchNextIterator() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org