You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/04/30 20:24:25 UTC
svn commit: r1477753 -
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/
Author: tn
Date: Tue Apr 30 18:24:24 2013
New Revision: 1477753
URL: http://svn.apache.org/r1477753
Log:
Remove trailing spaces.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java Tue Apr 30 18:24:24 2013
@@ -47,7 +47,7 @@ public abstract class AbstractKeyValue<K
/**
* Gets the key from the pair.
*
- * @return the key
+ * @return the key
*/
public K getKey() {
return key;
@@ -76,7 +76,7 @@ public abstract class AbstractKeyValue<K
/**
* Gets a debugging String view of the pair.
- *
+ *
* @return a String view of the entry
*/
@Override
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java Tue Apr 30 18:24:24 2013
@@ -57,7 +57,7 @@ public abstract class AbstractMapEntry<K
* Compares this <code>Map.Entry</code> with another <code>Map.Entry</code>.
* <p>
* Implemented per API documentation of {@link java.util.Map.Entry#equals(Object)}
- *
+ *
* @param obj the object to compare to
* @return true if equal key and value
*/
@@ -79,13 +79,13 @@ public abstract class AbstractMapEntry<K
* Gets a hashCode compatible with the equals method.
* <p>
* Implemented per API documentation of {@link java.util.Map.Entry#hashCode()}
- *
+ *
* @return a suitable hash code
*/
@Override
public int hashCode() {
return (getKey() == null ? 0 : getKey().hashCode()) ^
- (getValue() == null ? 0 : getValue().hashCode());
+ (getValue() == null ? 0 : getValue().hashCode());
}
}
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java Tue Apr 30 18:24:24 2013
@@ -28,7 +28,7 @@ import org.apache.commons.collections4.K
* @version $Id$
*/
public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
-
+
/** The <code>Map.Entry</code> to decorate */
private final Map.Entry<K, V> entry;
@@ -47,7 +47,7 @@ public abstract class AbstractMapEntryDe
/**
* Gets the map being decorated.
- *
+ *
* @return the decorated map
*/
protected Map.Entry<K, V> getMapEntry() {
@@ -55,7 +55,7 @@ public abstract class AbstractMapEntryDe
}
//-----------------------------------------------------------------------
-
+
public K getKey() {
return entry.getKey();
}
@@ -67,7 +67,7 @@ public abstract class AbstractMapEntryDe
public V setValue(final V object) {
return entry.setValue(object);
}
-
+
@Override
public boolean equals(final Object object) {
if (object == this) {
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java Tue Apr 30 18:24:24 2013
@@ -86,7 +86,7 @@ public class DefaultKeyValue<K, V> exten
return super.setKey(key);
}
- /**
+ /**
* Sets the value.
*
* @return the old value of the value
@@ -105,7 +105,7 @@ public class DefaultKeyValue<K, V> exten
//-----------------------------------------------------------------------
/**
* Returns a new <code>Map.Entry</code> object with key and value from this pair.
- *
+ *
* @return a MapEntry instance
*/
public Map.Entry<K, V> toMapEntry() {
@@ -118,7 +118,7 @@ public class DefaultKeyValue<K, V> exten
* <p>
* Returns true if the compared object is also a <code>DefaultKeyValue</code>,
* and its key and value are equal to this object's key and value.
- *
+ *
* @param obj the object to compare to
* @return true if equal key and value
*/
@@ -132,7 +132,7 @@ public class DefaultKeyValue<K, V> exten
}
final DefaultKeyValue<?, ?> other = (DefaultKeyValue<?, ?>) obj;
- return
+ return
(getKey() == null ? other.getKey() == null : getKey().equals(other.getKey())) &&
(getValue() == null ? other.getValue() == null : getValue().equals(other.getValue()));
}
@@ -142,7 +142,7 @@ public class DefaultKeyValue<K, V> exten
* <p>
* Implemented per API documentation of {@link java.util.Map.Entry#hashCode()},
* however subclasses may override this.
- *
+ *
* @return a suitable hash code
*/
@Override
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java Tue Apr 30 18:24:24 2013
@@ -19,11 +19,11 @@ package org.apache.commons.collections4.
import java.io.Serializable;
import java.util.Arrays;
-/**
+/**
* A <code>MultiKey</code> allows multiple map keys to be merged together.
* <p>
* The purpose of this class is to avoid the need to write code to handle
- * maps of maps. An example might be the need to look up a file name by
+ * maps of maps. An example might be the need to look up a file name by
* key and locale. The typical solution might be nested maps. This class
* can be used instead by creating an instance passing in the key and locale.
* <p>
@@ -58,7 +58,7 @@ public class MultiKey<K> implements Seri
* <p>
* The keys should be immutable
* If they are not then they must not be changed after adding to the MultiKey.
- *
+ *
* @param key1 the first key
* @param key2 the second key
*/
@@ -72,7 +72,7 @@ public class MultiKey<K> implements Seri
* <p>
* The keys should be immutable
* If they are not then they must not be changed after adding to the MultiKey.
- *
+ *
* @param key1 the first key
* @param key2 the second key
* @param key3 the third key
@@ -87,7 +87,7 @@ public class MultiKey<K> implements Seri
* <p>
* The keys should be immutable
* If they are not then they must not be changed after adding to the MultiKey.
- *
+ *
* @param key1 the first key
* @param key2 the second key
* @param key3 the third key
@@ -103,7 +103,7 @@ public class MultiKey<K> implements Seri
* <p>
* The keys should be immutable
* If they are not then they must not be changed after adding to the MultiKey.
- *
+ *
* @param key1 the first key
* @param key2 the second key
* @param key3 the third key
@@ -174,7 +174,7 @@ public class MultiKey<K> implements Seri
* <p>
* The keys should be immutable
* If they are not then they must not be changed.
- *
+ *
* @return the individual keys
*/
public K[] getKeys() {
@@ -186,7 +186,7 @@ public class MultiKey<K> implements Seri
* <p>
* The key should be immutable.
* If it is not then it must not be changed.
- *
+ *
* @param index the index to retrieve
* @return the key at the index
* @throws IndexOutOfBoundsException if the index is invalid
@@ -198,7 +198,7 @@ public class MultiKey<K> implements Seri
/**
* Gets the size of the list of keys.
- *
+ *
* @return the size of the list of keys
* @since 3.1
*/
@@ -212,7 +212,7 @@ public class MultiKey<K> implements Seri
* <p>
* To be equal, the other object must be a <code>MultiKey</code> with the
* same number of keys which are also equal.
- *
+ *
* @param other the other object to compare to
* @return true if equal
*/
@@ -232,10 +232,10 @@ public class MultiKey<K> implements Seri
* Gets the combined hash code that is computed from all the keys.
* <p>
* This value is computed once and then cached, so elements should not
- * change their hash codes once created (note that this is the same
+ * change their hash codes once created (note that this is the same
* constraint that would be used if the individual keys elements were
* themselves {@link java.util.Map Map} keys.
- *
+ *
* @return the hash code
*/
@Override
@@ -245,7 +245,7 @@ public class MultiKey<K> implements Seri
/**
* Gets a debugging string version of the key.
- *
+ *
* @return a debugging string
*/
@Override
@@ -267,11 +267,11 @@ public class MultiKey<K> implements Seri
}
hashCode = total;
}
-
+
/**
* Recalculate the hash code after deserialization. The hash code of some
* keys might have change (hash codes based on the system hash code are
- * only stable for the same process).
+ * only stable for the same process).
* @return the instance with recalculated hash code
*/
private Object readResolve() {
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java Tue Apr 30 18:24:24 2013
@@ -32,10 +32,10 @@ import org.apache.commons.collections4.K
*/
public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Serializable {
- /** Serialization version */
+ /** Serialization version */
private static final long serialVersionUID = -8453869361373831205L;
- /** The map underlying the entry/iterator */
+ /** The map underlying the entry/iterator */
private final Map<K, V> map;
/** The key */
@@ -57,7 +57,7 @@ public class TiedMapEntry<K, V> implemen
//-------------------------------------------------------------------------
/**
* Gets the key of this entry
- *
+ *
* @return the key
*/
public K getKey() {
@@ -66,7 +66,7 @@ public class TiedMapEntry<K, V> implemen
/**
* Gets the value of this entry direct from the map.
- *
+ *
* @return the value
*/
public V getValue() {
@@ -75,7 +75,7 @@ public class TiedMapEntry<K, V> implemen
/**
* Sets the value associated with the key direct onto the map.
- *
+ *
* @param value the new value
* @return the old value
* @throws IllegalArgumentException if the value is set to this map entry
@@ -91,7 +91,7 @@ public class TiedMapEntry<K, V> implemen
* Compares this <code>Map.Entry</code> with another <code>Map.Entry</code>.
* <p>
* Implemented per API documentation of {@link java.util.Map.Entry#equals(Object)}
- *
+ *
* @param obj the object to compare to
* @return true if equal key and value
*/
@@ -114,19 +114,19 @@ public class TiedMapEntry<K, V> implemen
* Gets a hashCode compatible with the equals method.
* <p>
* Implemented per API documentation of {@link java.util.Map.Entry#hashCode()}
- *
+ *
* @return a suitable hash code
*/
@Override
public int hashCode() {
final Object value = getValue();
return (getKey() == null ? 0 : getKey().hashCode()) ^
- (value == null ? 0 : value.hashCode());
+ (value == null ? 0 : value.hashCode());
}
/**
* Gets a string version of the entry.
- *
+ *
* @return entry as a string
*/
@Override
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java?rev=1477753&r1=1477752&r2=1477753&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java Tue Apr 30 18:24:24 2013
@@ -62,7 +62,7 @@ public final class UnmodifiableMapEntry<
/**
* Throws UnsupportedOperationException.
- *
+ *
* @param value the new value
* @return the previous value
* @throws UnsupportedOperationException always