You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/22 18:34:29 UTC
svn commit: r606471 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect:
IdMapKeyAccessor.java IndexedListProperty.java
LazyClassDescriptorDecorator.java
Author: aadamchik
Date: Sat Dec 22 09:34:28 2007
New Revision: 606471
URL: http://svn.apache.org/viewvc?rev=606471&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IdMapKeyAccessor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IdMapKeyAccessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IdMapKeyAccessor.java?rev=606471&r1=606470&r2=606471&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IdMapKeyAccessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IdMapKeyAccessor.java Sat Dec 22 09:34:28 2007
@@ -47,9 +47,9 @@
return id;
}
- Map map = id.getIdSnapshot();
+ Map<?, ?> map = id.getIdSnapshot();
if (map.size() == 1) {
- Map.Entry pkEntry = (Map.Entry) map.entrySet().iterator().next();
+ Map.Entry<?, ?> pkEntry = map.entrySet().iterator().next();
return pkEntry.getValue();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java?rev=606471&r1=606470&r2=606471&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java Sat Dec 22 09:34:28 2007
@@ -47,7 +47,7 @@
*/
protected ValueHolder createCollectionValueHolder(Object object)
throws PropertyException {
- List unordered = (List) super.createCollectionValueHolder(object);
+ List<?> unordered = (List<?>) super.createCollectionValueHolder(object);
return new IndexPropertyList(indexPropertyName, unordered, true);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java?rev=606471&r1=606470&r2=606471&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java Sat Dec 22 09:34:28 2007
@@ -23,7 +23,7 @@
import org.apache.cayenne.map.ObjEntity;
/**
- * A ClassDescriptor wrapper that compiles decoarated descriptor lazily on first access.
+ * A ClassDescriptor wrapper that compiles decorated descriptor lazily on first access.
*
* @since 3.0
* @author Andrus Adamchik