You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/05/14 18:54:19 UTC
svn commit: r656333 [2/2] - in /directory:
apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/
apacheds/trunk/mitosis/src/main/java/org/apache/dire...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/MultiMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/MultiMap.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/MultiMap.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/MultiMap.java Wed May 14 09:54:17 2008
@@ -53,7 +53,7 @@
* @version $Revision$ $Date$
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface MultiMap extends Map
+public interface MultiMap<K,V> extends Map<K,V>
{
/**
@@ -78,7 +78,7 @@
* @throws NullPointerException
* if the key or value is null and null is invalid
*/
- public Object remove( Object key, Object item );
+ Object remove( K key, V item );
// -----------------------------------------------------------------------
@@ -117,7 +117,7 @@
* @throws NullPointerException
* if the key is null and null keys are invalid
*/
- Object get( Object key );
+ V get( K key );
/**
@@ -135,7 +135,7 @@
* @throws NullPointerException
* if the value is null and null value are invalid
*/
- boolean containsValue( Object value );
+ boolean containsValue( V value );
/**
@@ -161,7 +161,7 @@
* @throws IllegalArgumentException
* if the key or value is invalid
*/
- Object put( Object key, Object value );
+ V put( K key, V value );
/**
@@ -183,7 +183,7 @@
* @throws NullPointerException
* if the key is null and null keys are invalid
*/
- Object remove( Object key );
+ V remove( K key );
/**
@@ -195,6 +195,5 @@
*
* @return a collection view of the values contained in this map
*/
- Collection values();
-
+ Collection<V> values();
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SequencedHashMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SequencedHashMap.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SequencedHashMap.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SequencedHashMap.java Wed May 14 09:54:17 2008
@@ -119,6 +119,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
// implemented per api docs for Map.Entry.hashCode()
@@ -622,6 +626,7 @@
/**
* Implements {@link Map#hashCode()}.
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Wed May 14 09:54:17 2008
@@ -1535,6 +1535,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return super.hashCode();