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/19 16:54:40 UTC
svn commit: r605593 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main:
java/org/apache/cayenne/exp/Expression.java
java/org/apache/cayenne/query/Ordering.java
resources/dotemplates/v1_2/superclass.vm
Author: aadamchik
Date: Wed Dec 19 07:54:39 2007
New Revision: 605593
URL: http://svn.apache.org/viewvc?rev=605593&view=rev
Log:
generic related fixes, after I tried the new build on a real project...
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/superclass.vm
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java?rev=605593&r1=605592&r2=605593&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java Wed Dec 19 07:54:39 2007
@@ -360,12 +360,12 @@
/**
* Returns a list of objects that match the expression.
*/
- public List<Object> filterObjects(List<Object> objects) {
+ public <T> List<T> filterObjects(List<T> objects) {
if (objects == null || objects.size() == 0) {
return Collections.EMPTY_LIST;
}
- return (List<Object>) filter(objects, new LinkedList<Object>());
+ return (List<T>) filter(objects, new LinkedList<T>());
}
/**
@@ -374,8 +374,8 @@
*
* @since 1.1
*/
- public Collection<Object> filter(Collection<Object> source, Collection<Object> target) {
- for (Object o : source) {
+ public <T> Collection<?> filter(Collection<T> source, Collection<T> target) {
+ for (T o : source) {
if (match(o)) {
target.add(o);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java?rev=605593&r1=605592&r2=605593&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java Wed Dec 19 07:54:39 2007
@@ -68,7 +68,7 @@
* is more significant than any other Ordering with higher index. List being ordered is
* modified in place.
*/
- public static void orderList(List<?> objects, List<Comparator<Object>> orderings) {
+ public static void orderList(List<?> objects, List<Ordering> orderings) {
Collections.sort(objects, ComparatorUtils.chainedComparator(orderings));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/superclass.vm
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/superclass.vm?rev=605593&r1=605592&r2=605593&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/superclass.vm (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/resources/dotemplates/v1_2/superclass.vm Wed Dec 19 07:54:39 2007
@@ -102,6 +102,7 @@
removeToManyTarget("${rel.name}", obj, true);
}
#end
+ @SuppressWarnings("unchecked")
#if ( ${rel.CollectionType} == "java.util.Map")
public $importUtils.formatJavaType($rel.CollectionType)<$importUtils.formatJavaType($entityUtils.getMapKeyType($rel)), $importUtils.formatJavaType($rel.TargetEntity.ClassName)> get${stringUtils.capitalized($rel.Name)}() {
return ($importUtils.formatJavaType($rel.CollectionType)<$importUtils.formatJavaType($entityUtils.getMapKeyType($rel)), $importUtils.formatJavaType($rel.TargetEntity.ClassName)>)readProperty("${rel.name}");