You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/10/20 03:02:10 UTC
svn commit: r1024471 - in
/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map:
FixedSizeMap.java FixedSizeSortedMap.java ListOrderedMap.java
MultiValueMap.java PredicatedMap.java TransformedMap.java
UnmodifiableOrderedMap.java
Author: sebb
Date: Wed Oct 20 01:02:09 2010
New Revision: 1024471
URL: http://svn.apache.org/viewvc?rev=1024471&view=rev
Log:
Raw types and unchecked casts
Modified:
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java
commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeMap.java Wed Oct 20 01:02:09 2010
@@ -105,10 +105,10 @@ public class FixedSizeMap<K, V>
* @throws ClassNotFoundException
* @since Commons Collections 3.1
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java Wed Oct 20 01:02:09 2010
@@ -106,10 +106,10 @@ public class FixedSizeSortedMap<K, V>
/**
* Read the map in using a custom routine.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/ListOrderedMap.java Wed Oct 20 01:02:09 2010
@@ -132,10 +132,10 @@ public class ListOrderedMap<K, V>
* @throws ClassNotFoundException
* @since Commons Collections 3.1
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
// Implement OrderedMap
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/MultiValueMap.java Wed Oct 20 01:02:09 2010
@@ -157,9 +157,10 @@ public class MultiValueMap<K, V> extends
* @throws ClassNotFoundException
* @since Commons Collections 3.3
*/
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, Object>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/PredicatedMap.java Wed Oct 20 01:02:09 2010
@@ -121,10 +121,10 @@ public class PredicatedMap<K, V>
* @throws ClassNotFoundException
* @since Commons Collections 3.1
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/TransformedMap.java Wed Oct 20 01:02:09 2010
@@ -144,10 +144,10 @@ public class TransformedMap<K, V>
* @throws ClassNotFoundException
* @since Commons Collections 3.1
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------
Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java?rev=1024471&r1=1024470&r2=1024471&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java Wed Oct 20 01:02:09 2010
@@ -94,10 +94,10 @@ public final class UnmodifiableOrderedMa
* @throws ClassNotFoundException
* @since Commons Collections 3.1
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
- map = (Map) in.readObject();
+ map = (Map<K, V>) in.readObject(); // (1)
}
//-----------------------------------------------------------------------