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 2006/11/06 00:44:13 UTC
svn commit: r471572 - in
/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi:
CjpaCollectionFieldAccessor.java CjpaCollectionProperty.java
CjpaEntityDescriptor.java
Author: aadamchik
Date: Sun Nov 5 15:44:12 2006
New Revision: 471572
URL: http://svn.apache.org/viewvc?view=rev&rev=471572
Log:
CAY-701: "property" package refactoring
(fixing jdk 1.5 classes that depended on PropertyAccessor)
Modified:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java?view=diff&rev=471572&r1=471571&r2=471572
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java Sun Nov 5 15:44:12 2006
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.cspi;
import org.apache.cayenne.Fault;
@@ -41,13 +40,12 @@
* Resolves a fault before setting the field.
*/
@Override
- public void writePropertyDirectly(Object object, Object oldValue, Object newValue)
- throws PropertyAccessException {
+ public void setValue(Object object, Object newValue) throws PropertyAccessException {
if (newValue instanceof Fault) {
newValue = ((Fault) newValue).resolveFault((Persistent) object, getName());
}
- super.writePropertyDirectly(object, oldValue, newValue);
+ super.setValue(object, newValue);
}
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java?view=diff&rev=471572&r1=471571&r2=471572
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java Sun Nov 5 15:44:12 2006
@@ -17,24 +17,23 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.cspi;
+import org.apache.cayenne.property.Accessor;
import org.apache.cayenne.property.ClassDescriptor;
import org.apache.cayenne.property.PropertyAccessException;
-import org.apache.cayenne.property.PropertyAccessor;
import org.apache.cayenne.property.ToManyListProperty;
class CjpaCollectionProperty extends ToManyListProperty {
- public CjpaCollectionProperty(ClassDescriptor owner, ClassDescriptor targetDescriptor,
- PropertyAccessor accessor, String reverseName) {
+ public CjpaCollectionProperty(ClassDescriptor owner,
+ ClassDescriptor targetDescriptor, Accessor accessor, String reverseName) {
super(owner, targetDescriptor, accessor, reverseName);
}
@Override
public void writePropertyDirectly(Object object, Object oldValue, Object newValue)
throws PropertyAccessException {
- accessor.writePropertyDirectly(object, oldValue, newValue);
+ accessor.setValue(object, newValue);
}
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java?view=diff&rev=471572&r1=471571&r2=471572
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java Sun Nov 5 15:44:12 2006
@@ -17,7 +17,6 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.jpa.cspi;
import java.util.Iterator;
@@ -27,11 +26,11 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.property.Accessor;
import org.apache.cayenne.property.ClassDescriptor;
import org.apache.cayenne.property.FieldAccessor;
import org.apache.cayenne.property.ListProperty;
import org.apache.cayenne.property.PropertyAccessException;
-import org.apache.cayenne.property.PropertyAccessor;
class CjpaEntityDescriptor extends EntityDescriptor {
@@ -53,7 +52,7 @@
String name = entry.getKey().toString();
ListProperty overridenProperty = (ListProperty) entry.getValue();
- PropertyAccessor accessor = new CjpaCollectionFieldAccessor(
+ Accessor accessor = new CjpaCollectionFieldAccessor(
objectClass,
name,
null);
@@ -73,7 +72,7 @@
* DataObject or not.
*/
@Override
- protected PropertyAccessor makeAccessor(String propertyName, Class propertyType)
+ protected Accessor makeAccessor(String propertyName, Class propertyType)
throws PropertyAccessException {
try {
return new FieldAccessor(objectClass, propertyName, propertyType);
@@ -84,7 +83,7 @@
+ propertyName
+ "' of class '"
+ objectClass.getName()
- + "'", null, null);
+ + "'");
}
}
}