svn commit: r463698 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map: DataObjectDescriptor.java EntityDescriptor.java

[aa...@apache.org]

Author: aadamchik
Date: Fri Oct 13 08:05:23 2006
New Revision: 463698

URL: http://svn.apache.org/viewvc?view=rev&rev=463698
Log:
CAY-682: Generic Cayenne POJO enhancer
(refactoring ClassDescriptors to clearly separate the types of supported objects)

Modified:
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/DataObjectDescriptor.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/EntityDescriptor.java

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/DataObjectDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/DataObjectDescriptor.java?view=diff&rev=463698&r1=463697&r2=463698
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/DataObjectDescriptor.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/DataObjectDescriptor.java Fri Oct 13 08:05:23 2006
@@ -32,8 +32,7 @@
 import org.apache.cayenne.property.ToManyListProperty;
 
 /**
- * A ClassDescriptor for entities implementing {@link DataObject} interface, providing
- * access to the property values.
+ * A ClassDescriptor for entities implementing {@link DataObject} interface.
  * 
  * @since 3.0
  * @author Andrus Adamchik

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/EntityDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/EntityDescriptor.java?view=diff&rev=463698&r1=463697&r2=463698
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/EntityDescriptor.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/map/EntityDescriptor.java Fri Oct 13 08:05:23 2006
@@ -36,12 +36,11 @@
 import org.apache.cayenne.property.PropertyAccessException;
 import org.apache.cayenne.property.PropertyAccessor;
 import org.apache.cayenne.property.SimplePersistentProperty;
-import org.apache.cayenne.property.SimpleProperty;
 import org.apache.cayenne.property.ValueHolderProperty;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
- * A ClassDescriptor describing a persistent bean based on ObjEntity.
+ * A ClassDescriptor for an object implementing {@link Persistent} interface.
  * 
  * @since 1.2
  * @author Andrus Adamchik
@@ -50,9 +49,6 @@
 
     protected ObjEntity entity;
 
-    // compiled properties
-    boolean persistent;
-
     /**
      * Creates and compiles a class descriptor for a given entity. A second optional
      * 'superclassDescriptor' parameter should be used if an entity has a super-entity.
@@ -97,7 +93,6 @@
 
         // compile common stuff
         this.objectClass = entity.getJavaClass();
-        this.persistent = Persistent.class.isAssignableFrom(objectClass);
 
         compileSpecialProperties();
 
@@ -165,9 +160,10 @@
 
             Class propertyType = attribute.getJavaClass();
             PropertyAccessor accessor = makeAccessor(attribute.getName(), propertyType);
-            allDescriptors.put(attribute.getName(), persistent
-                    ? new SimplePersistentProperty(this, accessor, attribute)
-                    : new SimpleProperty(this, accessor));
+            allDescriptors.put(attribute.getName(), new SimplePersistentProperty(
+                    this,
+                    accessor,
+                    attribute));
         }
     }