Author: aadamchik
Date: Sat Nov 25 11:02:55 2006
New Revision: 479170
URL: http://svn.apache.org/viewvc?view=rev&rev=479170
Log:
CAY-701: "property" package refactoring
(creating subpackages in refelect package to organize descriptors by the object
type)
Added:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
- copied, changed from r479165,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/ToManyListProperty.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java
- copied, changed from r479157,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoCollectionProperty.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java
- copied, changed from r479157,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSingleObjectArcProperty.java
Removed:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/ToManyListProperty.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoCollectionProperty.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSingleObjectArcProperty.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java?view=diff&rev=479170&r1=479169&r2=479170
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
Sat Nov 25 11:02:55 2006
@@ -66,7 +66,7 @@
String reverseName = relationship.getReverseRelationshipName();
Accessor accessor = createAccessor(descriptor, relationship.getName(),
List.class);
- descriptor.addDeclaredProperty(new ToManyListProperty(
+ descriptor.addDeclaredProperty(new DataObjectToManyProperty(
descriptor,
targetDescriptor,
accessor,
Copied:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
(from r479165,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/ToManyListProperty.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java?view=diff&rev=479170&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/ToManyListProperty.java&r1=479165&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java&r2=479170
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/ToManyListProperty.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
Sat Nov 25 11:02:55 2006
@@ -34,9 +34,9 @@
* @since 1.2
* @author Andrus Adamchik
*/
-public class ToManyListProperty extends ListProperty {
+public class DataObjectToManyProperty extends ListProperty {
- public ToManyListProperty(ClassDescriptor owner, ClassDescriptor
targetDescriptor,
+ public DataObjectToManyProperty(ClassDescriptor owner, ClassDescriptor
targetDescriptor,
Accessor accessor, String reverseName) {
super(owner, targetDescriptor, accessor, reverseName);
}
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java?view=diff&rev=479170&r1=479169&r2=479170
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java
Sat Nov 25 11:02:55 2006
@@ -71,7 +71,7 @@
.getName());
Accessor accessor = createAccessor(descriptor, relationship.getName(),
List.class);
- descriptor.addDeclaredProperty(new EnhancedPojoCollectionProperty(
+ descriptor.addDeclaredProperty(new EnhancedPojoToManyProperty(
descriptor,
targetDescriptor,
accessor,
@@ -94,7 +94,7 @@
descriptor,
relationship.getName(),
targetDescriptor.getObjectClass());
- descriptor.addDeclaredProperty(new EnhancedPojoSingleObjectArcProperty(
+ descriptor.addDeclaredProperty(new EnhancedPojoToOneProperty(
descriptor,
targetDescriptor,
accessor,
Copied:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java
(from r479157,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoCollectionProperty.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java?view=diff&rev=479170&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoCollectionProperty.java&r1=479157&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java&r2=479170
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoCollectionProperty.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java
Sat Nov 25 11:02:55 2006
@@ -26,11 +26,11 @@
* @since 3.0
* @author Andrus Adamchik
*/
-class EnhancedPojoCollectionProperty extends ListProperty {
+public class EnhancedPojoToManyProperty extends ListProperty {
private Accessor faultResolvedFlagAccessor;
- public EnhancedPojoCollectionProperty(ClassDescriptor owner,
+ public EnhancedPojoToManyProperty(ClassDescriptor owner,
ClassDescriptor targetDescriptor, Accessor accessor, String
reverseName,
Accessor faultResolvedFlagAccessor) {
super(owner, targetDescriptor, accessor, reverseName);
Copied:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java
(from r479157,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSingleObjectArcProperty.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java?view=diff&rev=479170&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSingleObjectArcProperty.java&r1=479157&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java&r2=479170
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSingleObjectArcProperty.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java
Sat Nov 25 11:02:55 2006
@@ -33,11 +33,11 @@
* @since 3.0
* @author Andrus Adamchik
*/
-class EnhancedPojoSingleObjectArcProperty extends BaseToOneProperty {
+public class EnhancedPojoToOneProperty extends BaseToOneProperty {
protected Accessor faultResolvedFlagAccessor;
- EnhancedPojoSingleObjectArcProperty(ClassDescriptor owner,
+ public EnhancedPojoToOneProperty(ClassDescriptor owner,
ClassDescriptor targetDescriptor, Accessor accessor, String
reverseName,
Accessor faultResolvedFlagAccessor) {
super(owner, targetDescriptor, accessor, reverseName);