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 2008/01/05 13:41:31 UTC
svn commit: r609131 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
validation/BeanValidationFailure.java wocompat/PlistDataStructureFactory.java
wocompat/parser/DefaultPlistDataStructureFactory.java
Author: aadamchik
Date: Sat Jan 5 04:40:57 2008
New Revision: 609131
URL: http://svn.apache.org/viewvc?rev=609131&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java?rev=609131&r1=609130&r2=609131&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/validation/BeanValidationFailure.java Sat Jan 5 04:40:57 2008
@@ -49,7 +49,7 @@
public static ValidationFailure validateNotEmpty(
Object bean,
String attribute,
- Collection value) {
+ Collection<?> value) {
if (value == null) {
return new BeanValidationFailure(bean, attribute, validationMessage(
@@ -75,7 +75,7 @@
return validateNotEmpty(bean, attribute, (String) value);
}
if (value instanceof Collection) {
- return validateNotEmpty(bean, attribute, (Collection) value);
+ return validateNotEmpty(bean, attribute, (Collection<?>) value);
}
return validateNotNull(bean, attribute, value);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java?rev=609131&r1=609130&r2=609131&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java Sat Jan 5 04:40:57 2008
@@ -27,7 +27,7 @@
*/
public interface PlistDataStructureFactory {
- Map createMap(String keyPath);
+ Map<String, Object> createMap(String keyPath);
- Collection createCollection(String keyPath);
+ Collection<Object> createCollection(String keyPath);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java?rev=609131&r1=609130&r2=609131&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java Sat Jan 5 04:40:57 2008
@@ -28,11 +28,11 @@
class DefaultPlistDataStructureFactory implements PlistDataStructureFactory {
- public Collection createCollection(String keyPath) {
- return new ArrayList();
+ public Collection<Object> createCollection(String keyPath) {
+ return new ArrayList<Object>();
}
- public Map createMap(String keyPath) {
- return new HashMap();
+ public Map<String, Object> createMap(String keyPath) {
+ return new HashMap<String, Object>();
}
}