commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1125943 - /incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/
Date Sun, 22 May 2011 12:37:43 GMT
Author: simonetripodi
Date: Sun May 22 12:37:42 2011
New Revision: 1125943

URL: http://svn.apache.org/viewvc?rev=1125943&view=rev
Log:
fixed ElementAccessor.getElements(Object) raw type and related implementations

Modified:
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java
    incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -31,9 +31,9 @@ import java.util.Enumeration;
 public class ArrayElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( final Object target )
+    public Enumeration<?> getElements( final Object target )
     {
-        return new Enumeration()
+        return new Enumeration<Object>()
         {
             private int count = Array.getLength( target );
 

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/CollectionElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -31,8 +31,8 @@ import java.util.Enumeration;
 public class CollectionElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
     {
-        return new IteratorEnumeration( ( (Collection) target ).iterator() );
+        return new IteratorEnumeration( ( (Collection<?>) target ).iterator() );
     }
 }

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ElementsAccessor.java Sun May
22 12:37:42 2011
@@ -41,6 +41,6 @@ public interface ElementsAccessor
      * @return an iterator over the elements of the given object
      * @exception OgnlException if there is an error getting the given object's elements
      */
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
         throws OgnlException;
 }

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -31,8 +31,8 @@ import java.util.Enumeration;
 public class EnumerationElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
     {
-        return (Enumeration) target;
+        return (Enumeration<?>) target;
     }
 }

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -31,8 +31,8 @@ import java.util.Iterator;
 public class IteratorElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
     {
-        return new IteratorEnumeration( (Iterator) target );
+        return new IteratorEnumeration( (Iterator<?>) target );
     }
 }

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/MapElementsAccessor.java Sun
May 22 12:37:42 2011
@@ -31,8 +31,8 @@ import java.util.Map;
 public class MapElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
     {
-        return new IteratorEnumeration( ( (Map) target ).values().iterator() );
+        return new IteratorEnumeration( ( (Map<?, ?>) target ).values().iterator()
);
     }
 }

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/NumberElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -31,9 +31,9 @@ import java.util.NoSuchElementException;
 public class NumberElementsAccessor
     implements ElementsAccessor, NumericTypes
 {
-    public Enumeration getElements( final Object target )
+    public Enumeration<?> getElements( final Object target )
     {
-        return new Enumeration()
+        return new Enumeration<Object>()
         {
             private int type = OgnlOps.getNumericType( target );
 

Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java?rev=1125943&r1=1125942&r2=1125943&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectElementsAccessor.java
Sun May 22 12:37:42 2011
@@ -30,11 +30,11 @@ import java.util.Enumeration;
 public class ObjectElementsAccessor
     implements ElementsAccessor
 {
-    public Enumeration getElements( Object target )
+    public Enumeration<?> getElements( Object target )
     {
         final Object object = target;
 
-        return new Enumeration()
+        return new Enumeration<Object>()
         {
             private boolean seen = false;
 



Mime
View raw message