cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnth...@apache.org
Subject svn commit: r1361427 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/ main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/access/jdbc/ main/java/org/apache/cayenne/ejbql/parser/ main/java/or...
Date Fri, 13 Jul 2012 22:37:59 GMT
Author: johnthuss
Date: Fri Jul 13 22:37:58 2012
New Revision: 1361427

URL: http://svn.apache.org/viewvc?rev=1361427&view=rev
Log:
Refactor rename reflect.Property to PropertyDescriptor to avoid confusion with new exp.Property

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java
      - copied, changed from r1361426, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextChildDiffLoader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/PersistentObject.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectDiff.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/Property.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyAccessor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyException.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/RelationshipFault.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/BaseContext.java Fri Jul 13 22:37:58 2012
@@ -43,7 +43,7 @@ import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.RefreshQuery;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -326,7 +326,7 @@ public abstract class BaseContext implem
         if (lazyFaulting && property != null) {
             ClassDescriptor classDescriptor = getEntityResolver().getClassDescriptor(
                     object.getObjectId().getEntityName());
-            Property propertyDescriptor = classDescriptor.getProperty(property);
+            PropertyDescriptor propertyDescriptor = classDescriptor.getProperty(property);
 
             // If we don't have a property descriptor, there's not much we can do.
             // Let the caller know that the specified property could not be found and list

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/Cayenne.java Fri Jul 13 22:37:58 2012
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.query.ObjectIdQuery;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyUtils;
 
 /**
@@ -87,7 +87,7 @@ public final class Cayenne {
      * @param properyName path to the property
      * @return property descriptor, <code>null</code> if not found
      */
-    public static Property getProperty(Persistent object, String properyName) {
+    public static PropertyDescriptor getProperty(Persistent object, String properyName) {
         ClassDescriptor descriptor = getClassDescriptor(object);
         if (descriptor == null) {
             return null;
@@ -221,7 +221,7 @@ public final class Cayenne {
     private static final Object readSimpleProperty(Object o, String propertyName) {
         if (o instanceof Persistent) {
 
-            Property property = getProperty((Persistent) o, propertyName);
+            PropertyDescriptor property = getProperty((Persistent) o, propertyName);
 
             if (property != null) {
                 return property.readProperty(o);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextChildDiffLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextChildDiffLoader.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextChildDiffLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextChildDiffLoader.java Fri Jul 13 22:37:58 2012
@@ -22,7 +22,7 @@ import org.apache.cayenne.graph.ChildDif
 import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -98,7 +98,7 @@ class CayenneContextChildDiffLoader exte
 
         ClassDescriptor descriptor = context.getEntityResolver().getClassDescriptor(
                 ((ObjectId) nodeId).getEntityName());
-        Property property = descriptor.getProperty(arcId.toString());
+        PropertyDescriptor property = descriptor.getProperty(arcId.toString());
 
         final Persistent[] target = new Persistent[1];
         target[0] = findObject(targetNodeId);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java Fri Jul 13 22:37:58 2012
@@ -24,7 +24,7 @@ import org.apache.cayenne.graph.GraphDif
 import org.apache.cayenne.graph.GraphEvent;
 import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.util.Util;
 
@@ -156,7 +156,7 @@ class CayenneContextMergeHandler impleme
         if (object != null) {
 
             // do not override local changes....
-            Property p = propertyForId(nodeId, property);
+            PropertyDescriptor p = propertyForId(nodeId, property);
             if (Util.nullSafeEquals(p.readPropertyDirectly(object), oldValue)) {
 
                 p.writePropertyDirectly(object, oldValue, newValue);
@@ -233,7 +233,7 @@ class CayenneContextMergeHandler impleme
         }
     }
 
-    private Property propertyForId(Object nodeId, String propertyName) {
+    private PropertyDescriptor propertyForId(Object nodeId, String propertyName) {
         ClassDescriptor descriptor = context.getEntityResolver().getClassDescriptor(
                 ((ObjectId) nodeId).getEntityName());
         return descriptor.getProperty(propertyName);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/PersistentObject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/PersistentObject.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/PersistentObject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/PersistentObject.java Fri Jul 13 22:37:58 2012
@@ -21,7 +21,7 @@ package org.apache.cayenne;
 
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.ToManyMapProperty;
 
 /**
@@ -93,7 +93,7 @@ public abstract class PersistentObject i
                     + objectId);
         }
 
-        Property property = descriptor.getProperty(relationshipName);
+        PropertyDescriptor property = descriptor.getProperty(relationshipName);
         if (property instanceof ToManyMapProperty) {
             return ((ToManyMapProperty) property).getMapKey(value);
         }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextMergeHandler.java Fri Jul 13 22:37:58 2012
@@ -30,7 +30,7 @@ import org.apache.cayenne.graph.GraphDif
 import org.apache.cayenne.graph.GraphEvent;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -80,7 +80,7 @@ class DataContextMergeHandler implements
         // extra safegurad
     }
 
-    private Property propertyForId(Object nodeId, String propertyName) {
+    private PropertyDescriptor propertyForId(Object nodeId, String propertyName) {
         ClassDescriptor descriptor = context.getEntityResolver().getClassDescriptor(
                 ((ObjectId) nodeId).getEntityName());
         return descriptor.getProperty(propertyName);
@@ -155,7 +155,7 @@ class DataContextMergeHandler implements
         if (object != null && object.getPersistenceState() != PersistenceState.HOLLOW) {
 
             // do not override local changes....
-            Property p = propertyForId(nodeId, property);
+            PropertyDescriptor p = propertyForId(nodeId, property);
             if (Util.nullSafeEquals(p.readPropertyDirectly(object), oldValue)) {
                 p.writePropertyDirectly(object, oldValue, newValue);
             }
@@ -178,7 +178,7 @@ class DataContextMergeHandler implements
 
             final int state = source.getPersistenceState();
 
-            Property p = propertyForId(nodeId, arcId.toString());
+            PropertyDescriptor p = propertyForId(nodeId, arcId.toString());
             p.visit(new PropertyVisitor() {
 
                 public boolean visitAttribute(AttributeProperty property) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectDiff.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectDiff.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectDiff.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ObjectDiff.java Fri Jul 13 22:37:58 2012
@@ -37,7 +37,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -188,7 +188,7 @@ class ObjectDiff extends NodeDiff {
             Object targetId = arcDiff.getTargetNodeId();
             String arcId = arcDiff.getArcId().toString();
 
-            Property property = getClassDescriptor().getProperty(arcId);
+            PropertyDescriptor property = getClassDescriptor().getProperty(arcId);
 
             // note that some collection properties implement 'SingleObjectArcProperty',
             // so we cant't do 'instanceof SingleObjectArcProperty'

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java Fri Jul 13 22:37:58 2012
@@ -51,7 +51,7 @@ import org.apache.cayenne.map.DbRelation
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 
 /**
  * @since 3.0
@@ -864,7 +864,7 @@ public class EJBQLConditionTranslator ex
                 }
                 String pathChunk = translator.lastPathComponent;
 
-                Property property = descriptor.getProperty(pathChunk);
+                PropertyDescriptor property = descriptor.getProperty(pathChunk);
                 if (property instanceof AttributeProperty) {
                     String atrType = ((AttributeProperty) property)
                             .getAttribute()

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java Fri Jul 13 22:37:58 2012
@@ -43,7 +43,7 @@ import org.apache.cayenne.query.Prefetch
 import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -149,7 +149,7 @@ class Compiler {
                     String pathChunk = path.getChild(i).getText();
                     buffer.append('.').append(pathChunk);
 
-                    Property property = descriptor.getProperty(pathChunk);
+                    PropertyDescriptor property = descriptor.getProperty(pathChunk);
 
                     if (property instanceof ArcProperty) {
                         incoming = ((ArcProperty) property).getRelationship();
@@ -543,7 +543,7 @@ class Compiler {
 
         @Override
         public boolean visitIdentificationVariable(EJBQLExpression expression) {
-            Property property = descriptor.getProperty(expression.getText());
+            PropertyDescriptor property = descriptor.getProperty(expression.getText());
             if (property instanceof ArcProperty) {
                 incoming = ((ArcProperty) property).getRelationship();
                 descriptor = ((ArcProperty) property).getTargetDescriptor();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/graph/ChildDiffLoader.java Fri Jul 13 22:37:58 2012
@@ -35,7 +35,7 @@ import org.apache.cayenne.query.Query;
 import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyProperty;
 import org.apache.cayenne.reflect.ToOneProperty;
@@ -214,7 +214,7 @@ public class ChildDiffLoader implements 
 
         ClassDescriptor descriptor = context.getEntityResolver().getClassDescriptor(
                 ((ObjectId) nodeId).getEntityName());
-        Property property = descriptor.getProperty(arcId.toString());
+        PropertyDescriptor property = descriptor.getProperty(arcId.toString());
 
         setExternalChange(Boolean.TRUE);
         try {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ArcProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ArcProperty.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ArcProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ArcProperty.java Fri Jul 13 22:37:58 2012
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.ObjRelatio
  * 
  * @since 1.2
  */
-public interface ArcProperty extends Property {
+public interface ArcProperty extends PropertyDescriptor {
 
     /**
      * Returns a relationship associated with this arc.

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java Fri Jul 13 22:37:58 2012
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.ObjAttribu
  * 
  * @since 3.0
  */
-public interface AttributeProperty extends Property {
+public interface AttributeProperty extends PropertyDescriptor {
 
     ObjAttribute getAttribute();
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java Fri Jul 13 22:37:58 2012
@@ -25,7 +25,7 @@ package org.apache.cayenne.reflect;
  * 
  * @since 3.0
  */
-public abstract class BaseProperty implements Property {
+public abstract class BaseProperty implements PropertyDescriptor {
 
     protected ClassDescriptor owner;
     protected Accessor accessor;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ClassDescriptor.java Fri Jul 13 22:37:58 2012
@@ -107,7 +107,7 @@ public interface ClassDescriptor {
      * descriptors. Returned property can be any one of {@link AttributeProperty},
      * {@link ToManyProperty}, {@link ToOneProperty}.
      */
-    Property getProperty(String propertyName);
+    PropertyDescriptor getProperty(String propertyName);
 
     /**
      * Returns a Java Bean property descriptor matching property name or null if no such
@@ -115,7 +115,7 @@ public interface ClassDescriptor {
      * descriptors. Returned property can be any one of {@link AttributeProperty},
      * {@link ToManyProperty}, {@link ToOneProperty}.
      */
-    Property getDeclaredProperty(String propertyName);
+    PropertyDescriptor getDeclaredProperty(String propertyName);
 
     /**
      * Returns a collection of the properties mapped to id columns.

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LazyClassDescriptorDecorator.java Fri Jul 13 22:37:58 2012
@@ -73,7 +73,7 @@ public class LazyClassDescriptorDecorato
         return descriptor.createObject();
     }
 
-    public Property getDeclaredProperty(String propertyName) {
+    public PropertyDescriptor getDeclaredProperty(String propertyName) {
         checkDescriptorInitialized();
         return descriptor.getDeclaredProperty(propertyName);
     }
@@ -134,7 +134,7 @@ public class LazyClassDescriptorDecorato
         return descriptor.getMapArcProperties();
     }
 
-    public Property getProperty(String propertyName) {
+    public PropertyDescriptor getProperty(String propertyName) {
         checkDescriptorInitialized();
         return descriptor.getProperty(propertyName);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java Fri Jul 13 22:37:58 2012
@@ -49,8 +49,8 @@ public class PersistentDescriptor implem
 
     // compiled properties ...
     protected Class<?> objectClass;
-    protected Map<String, Property> declaredProperties;
-    protected Map<String, Property> superProperties;
+    protected Map<String, PropertyDescriptor> declaredProperties;
+    protected Map<String, PropertyDescriptor> superProperties;
     protected Map<String, ClassDescriptor> subclassDescriptors;
     protected Accessor persistenceStateAccessor;
 
@@ -72,8 +72,8 @@ public class PersistentDescriptor implem
      * Creates a PersistentDescriptor.
      */
     public PersistentDescriptor() {
-        this.declaredProperties = new HashMap<String, Property>();
-        this.superProperties = new HashMap<String, Property>();
+        this.declaredProperties = new HashMap<String, PropertyDescriptor>();
+        this.superProperties = new HashMap<String, PropertyDescriptor>();
         this.subclassDescriptors = new HashMap<String, ClassDescriptor>();
 
         // must be a set as duplicate addition attempts are expected...
@@ -92,7 +92,7 @@ public class PersistentDescriptor implem
     /**
      * Registers a superclass property.
      */
-    public void addSuperProperty(Property property) {
+    public void addSuperProperty(PropertyDescriptor property) {
         superProperties.put(property.getName(), property);
         indexAddedProperty(property);
     }
@@ -101,7 +101,7 @@ public class PersistentDescriptor implem
      * Registers a property. This method is useful to customize default ClassDescriptor
      * generated from ObjEntity by adding new properties or overriding the standard ones.
      */
-    public void addDeclaredProperty(Property property) {
+    public void addDeclaredProperty(PropertyDescriptor property) {
         declaredProperties.put(property.getName(), property);
         indexAddedProperty(property);
     }
@@ -113,7 +113,7 @@ public class PersistentDescriptor implem
         this.rootDbEntities.add(dbEntity);
     }
 
-    void indexAddedProperty(Property property) {
+    void indexAddedProperty(PropertyDescriptor property) {
         if (property instanceof AttributeProperty) {
 
             AttributeProperty attributeProperty = (AttributeProperty) property;
@@ -250,8 +250,8 @@ public class PersistentDescriptor implem
      * Recursively looks up property descriptor in this class descriptor and all
      * superclass descriptors.
      */
-    public Property getProperty(String propertyName) {
-        Property property = getDeclaredProperty(propertyName);
+    public PropertyDescriptor getProperty(String propertyName) {
+        PropertyDescriptor property = getDeclaredProperty(propertyName);
 
         if (property == null && superclassDescriptor != null) {
             property = superclassDescriptor.getProperty(propertyName);
@@ -260,7 +260,7 @@ public class PersistentDescriptor implem
         return property;
     }
 
-    public Property getDeclaredProperty(String propertyName) {
+    public PropertyDescriptor getDeclaredProperty(String propertyName) {
         return declaredProperties.get(propertyName);
     }
 
@@ -302,7 +302,7 @@ public class PersistentDescriptor implem
             getSuperclassDescriptor().injectValueHolders(object);
         }
 
-        for (Property property : declaredProperties.values()) {
+        for (PropertyDescriptor property : declaredProperties.values()) {
             property.injectValueHolder(object);
         }
     }
@@ -338,7 +338,7 @@ public class PersistentDescriptor implem
      * @since 3.0
      */
     boolean visitSuperProperties(PropertyVisitor visitor) {
-        for (Property next : superProperties.values()) {
+        for (PropertyDescriptor next : superProperties.values()) {
             if (!next.visit(visitor)) {
                 return false;
             }
@@ -352,7 +352,7 @@ public class PersistentDescriptor implem
      */
     public boolean visitDeclaredProperties(PropertyVisitor visitor) {
 
-        for (Property next : declaredProperties.values()) {
+        for (PropertyDescriptor next : declaredProperties.values()) {
             if (!next.visit(visitor)) {
                 return false;
             }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/Property.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/Property.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/Property.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/Property.java Fri Jul 13 22:37:58 2012
@@ -24,6 +24,9 @@ package org.apache.cayenne.reflect;
  * maintenance tasks.
  * 
  * @since 1.2
+ * 
+ * @deprecated renamed to PropertyDescriptor in 3.2
+ * 
  */
 public interface Property {
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyAccessor.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyAccessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyAccessor.java Fri Jul 13 22:37:58 2012
@@ -25,9 +25,9 @@ package org.apache.cayenne.reflect;
  */
 public class PropertyAccessor implements Accessor {
 
-    protected Property property;
+    protected PropertyDescriptor property;
 
-    public PropertyAccessor(Property property) {
+    public PropertyAccessor(PropertyDescriptor property) {
         if (property == null) {
             throw new NullPointerException("Null property");
         }

Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java (from r1361426, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java&r1=1361426&r2=1361427&rev=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/AttributeProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyDescriptor.java Fri Jul 13 22:37:58 2012
@@ -16,16 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.reflect;
 
-import org.apache.cayenne.map.ObjAttribute;
+package org.apache.cayenne.reflect;
 
 /**
- * Represents a simple object property.
+ * Defines bean property API used by Cayenne to access object data, do faulting and graph
+ * maintenance tasks.
  * 
- * @since 3.0
+ * @since 3.2
  */
-public interface AttributeProperty extends Property {
+public interface PropertyDescriptor extends Property {
 
-    ObjAttribute getAttribute();
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyException.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyException.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyException.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyException.java Fri Jul 13 22:37:58 2012
@@ -29,7 +29,7 @@ import org.apache.cayenne.CayenneRuntime
  */
 public class PropertyException extends CayenneRuntimeException {
 
-    protected Property property;
+    protected PropertyDescriptor property;
     protected Accessor accessor;
     protected Object source;
 
@@ -54,12 +54,12 @@ public class PropertyException extends C
         this.source = source;
     }
 
-    public PropertyException(String messageFormat, Property property, Object source,
+    public PropertyException(String messageFormat, PropertyDescriptor property, Object source,
             Object... messageArgs) {
         this(messageFormat, property, source, (Throwable) null, messageArgs);
     }
 
-    public PropertyException(String messageFormat, Property property, Object source,
+    public PropertyException(String messageFormat, PropertyDescriptor property, Object source,
             Throwable cause, Object... messageArgs) {
         super(messageFormat, cause, messageArgs);
 
@@ -74,7 +74,7 @@ public class PropertyException extends C
         return accessor;
     }
 
-    public Property getProperty() {
+    public PropertyDescriptor getProperty() {
         return property;
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectBaseProperty.java Fri Jul 13 22:37:58 2012
@@ -19,7 +19,7 @@
 package org.apache.cayenne.reflect.generic;
 
 import org.apache.cayenne.DataObject;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyException;
 import org.apache.cayenne.reflect.PropertyVisitor;
 
@@ -28,7 +28,7 @@ import org.apache.cayenne.reflect.Proper
  * 
  * @since 3.0
  */
-abstract class DataObjectBaseProperty implements Property {
+abstract class DataObjectBaseProperty implements PropertyDescriptor {
 
     public abstract String getName();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java Fri Jul 13 22:37:58 2012
@@ -30,7 +30,7 @@ import org.apache.cayenne.reflect.ClassD
 import org.apache.cayenne.reflect.ClassDescriptorMap;
 import org.apache.cayenne.reflect.PersistentDescriptor;
 import org.apache.cayenne.reflect.PersistentDescriptorFactory;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 
 /**
  * A {@link ClassDescriptorFactory} for Persistent objects that implement relationship
@@ -86,7 +86,7 @@ public class ValueHolderDescriptorFactor
         String reverseName = relationship.getReverseRelationshipName();
         Accessor accessor = createAccessor(descriptor, relationship.getName(), Map.class);
         Accessor mapKeyAccessor = createMapKeyAccessor(relationship, targetDescriptor);
-        Property property = new ValueHolderMapProperty(
+        PropertyDescriptor property = new ValueHolderMapProperty(
                 descriptor,
                 targetDescriptor,
                 accessor,
@@ -124,7 +124,7 @@ public class ValueHolderDescriptorFactor
                 descriptor,
                 relationship.getName(),
                 ValueHolder.class);
-        Property property = new ValueHolderProperty(
+        PropertyDescriptor property = new ValueHolderProperty(
                 descriptor,
                 targetDescriptor,
                 accessor,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextGraphAction.java Fri Jul 13 22:37:58 2012
@@ -25,7 +25,7 @@ import org.apache.cayenne.PersistenceSta
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.reflect.ArcProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 
 /**
  * A base implementation of a helper class to handle
@@ -59,7 +59,7 @@ public class ObjectContextGraphAction im
 
         ClassDescriptor descriptor = context.getEntityResolver().getClassDescriptor(
                 object.getObjectId().getEntityName());
-        Property property = descriptor.getProperty(propertyName);
+        PropertyDescriptor property = descriptor.getProperty(propertyName);
 
         if (property instanceof ArcProperty) {
             handleArcPropertyChange(object, (ArcProperty) property, oldValue, newValue);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectDetachOperation.java Fri Jul 13 22:37:58 2012
@@ -32,7 +32,7 @@ import org.apache.cayenne.map.EntityReso
 import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.reflect.AttributeProperty;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.PropertyVisitor;
 import org.apache.cayenne.reflect.ToManyMapProperty;
 import org.apache.cayenne.reflect.ToManyProperty;
@@ -172,7 +172,7 @@ public class ObjectDetachOperation {
             }
 
             public boolean visitAttribute(AttributeProperty property) {
-                Property targetProperty = targetDescriptor
+                PropertyDescriptor targetProperty = targetDescriptor
                         .getProperty(property.getName());
                 targetProperty.writeProperty(target, null, property.readProperty(source));
                 return true;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/RelationshipFault.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/RelationshipFault.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/RelationshipFault.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/RelationshipFault.java Fri Jul 13 22:37:58 2012
@@ -29,7 +29,7 @@ import org.apache.cayenne.map.EntityReso
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.query.RelationshipQuery;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 
 /**
  * An abstract superclass of lazily faulted to-one and to-many relationships.
@@ -122,7 +122,7 @@ public abstract class RelationshipFault 
         ObjRelationship reverse = relationship.getReverseRelationship();
 
         if (reverse != null && !reverse.isToMany()) {
-            Property property = resolver.getClassDescriptor(
+            PropertyDescriptor property = resolver.getClassDescriptor(
                     reverse.getSourceEntity().getName()).getProperty(reverse.getName());
 
             Iterator it = resolved.iterator();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java Fri Jul 13 22:37:58 2012
@@ -26,7 +26,7 @@ import org.apache.cayenne.reflect.ClassD
 import org.apache.cayenne.reflect.LazyClassDescriptorDecorator;
 import org.apache.cayenne.reflect.MockClassDescriptor;
 import org.apache.cayenne.reflect.MockClassDescriptorFactory;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.testdo.mt.MtTable1;
 import org.apache.cayenne.testdo.mt.MtTable2;
 import org.apache.cayenne.unit.di.client.ClientCase;
@@ -78,7 +78,7 @@ public class EntityResolverClassDescript
         ClassDescriptor descriptor = resolver.getClassDescriptor("MtTable1");
         assertNotNull(descriptor);
 
-        Property p = descriptor.getProperty(MtTable1.TABLE2ARRAY_PROPERTY);
+        PropertyDescriptor p = descriptor.getProperty(MtTable1.TABLE2ARRAY_PROPERTY);
         assertTrue(p instanceof ArcProperty);
 
         ClassDescriptor target = ((ArcProperty) p).getTargetDescriptor();

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockClassDescriptor.java Fri Jul 13 22:37:58 2012
@@ -91,7 +91,7 @@ public class MockClassDescriptor impleme
     public void shallowMerge(Object from, Object to) throws PropertyException {
     }
 
-    public Property getDeclaredProperty(String propertyName) {
+    public PropertyDescriptor getDeclaredProperty(String propertyName) {
         return null;
     }
 
@@ -99,7 +99,7 @@ public class MockClassDescriptor impleme
         return null;
     }
 
-    public Property getProperty(String propertyName) {
+    public PropertyDescriptor getProperty(String propertyName) {
         return null;
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java?rev=1361427&r1=1361426&r2=1361427&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java Fri Jul 13 22:37:58 2012
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
 
 import org.apache.cayenne.reflect.FieldAccessor;
 import org.apache.cayenne.reflect.PersistentDescriptor;
-import org.apache.cayenne.reflect.Property;
+import org.apache.cayenne.reflect.PropertyDescriptor;
 import org.apache.cayenne.reflect.SimpleAttributeProperty;
 import org.apache.cayenne.unit.util.TestBean;
 
@@ -43,7 +43,7 @@ public class PersistentDescriptorTest ex
         PersistentDescriptor d1 = new PersistentDescriptor();
 
         FieldAccessor accessor = new FieldAccessor(TestBean.class, "string", String.class);
-        Property property = new SimpleAttributeProperty(d1, accessor, null);
+        PropertyDescriptor property = new SimpleAttributeProperty(d1, accessor, null);
 
         d1.declaredProperties.put(property.getName(), property);
 



Mime
View raw message