Author: aadamchik
Date: Sat Nov 25 09:45:45 2006
New Revision: 479152
URL: http://svn.apache.org/viewvc?view=rev&rev=479152
Log:
CAY-701: "property" package refactoring
(more property package class names refactoring)
Added:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaToManyProperty.java
- copied, changed from r478936,
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
Removed:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java?view=diff&rev=479152&r1=479151&r2=479152
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
Sat Nov 25 09:45:45 2006
@@ -44,7 +44,7 @@
descriptor.getObjectClass(),
relationship.getName(),
null);
- descriptor.addDeclaredProperty(new CjpaCollectionProperty(
+ descriptor.addDeclaredProperty(new CjpaToManyProperty(
descriptor,
targetDescriptor,
accessor,
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=479152&r1=479151&r2=479152
==============================================================================
---
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
Sat Nov 25 09:45:45 2006
@@ -22,7 +22,7 @@
import org.apache.cayenne.Fault;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.property.FieldAccessor;
-import org.apache.cayenne.property.PropertyAccessException;
+import org.apache.cayenne.property.PropertyException;
class CjpaCollectionFieldAccessor extends FieldAccessor {
@@ -40,7 +40,7 @@
* Resolves a fault before setting the field.
*/
@Override
- public void setValue(Object object, Object newValue) throws
PropertyAccessException {
+ public void setValue(Object object, Object newValue) throws
PropertyException {
if (newValue instanceof Fault) {
newValue = ((Fault) newValue).resolveFault((Persistent) object,
getName());
Copied:
incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaToManyProperty.java
(from r478936,
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/CjpaToManyProperty.java?view=diff&rev=479152&p1=incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java&r1=478936&p2=incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaToManyProperty.java&r2=479152
==============================================================================
---
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/CjpaToManyProperty.java
Sat Nov 25 09:45:45 2006
@@ -21,19 +21,19 @@
import org.apache.cayenne.property.Accessor;
import org.apache.cayenne.property.ClassDescriptor;
-import org.apache.cayenne.property.PropertyAccessException;
+import org.apache.cayenne.property.PropertyException;
import org.apache.cayenne.property.ToManyListProperty;
-class CjpaCollectionProperty extends ToManyListProperty {
+class CjpaToManyProperty extends ToManyListProperty {
- public CjpaCollectionProperty(ClassDescriptor owner,
+ public CjpaToManyProperty(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 {
+ throws PropertyException {
accessor.setValue(object, newValue);
}
}