DataNucleus

Revision: 2633
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=2633&view=rev
Author:   andy_jefferson
Date:     2008-08-14 17:50:47 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
Split initialisation of member position arrays into separate method at AbstractClassMetaData level so shared by class/interface cases. Add accessor for multivaluedMemberPositions - calculated on demand rather than storing at initialisation

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-08-14 15:44:03 UTC (rev 2632)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-08-14 17:50:47 UTC (rev 2633)
@@ -212,9 +212,12 @@
     /** Flags of the SCO mutable state for all fields/properties. */
     protected boolean[] scoMutableMemberFlags;
 
-    /** Postions of the PersistenceCapable fields/properties (inc superclasses). */
-    protected int[] persistenceCapableMemberPositions;    
+    /** Absolute positions of all SCO fields/properties that aren't containers. */
+    protected int[] scoNonContainerMemberPositions = null;
 
+    /** Absolute positions of the fields/properties that have relations. */
+    protected int[] relationPositions = null;
+
     /** No of managed fields/properties in superclasses, that are inherited by this class. */
     protected int noOfInheritedManagedMembers = 0;
 
@@ -1156,6 +1159,92 @@
     public abstract void initialise();
 
     /**
+     * Method to initialise all convenience information about member positions and what role
+     * each position performs.
+     */
+    protected void initialiseMemberPositionInformation()
+    {
+        memberCount = noOfInheritedManagedMembers + managedMembers.length;
+        dfgMemberFlags = new boolean[memberCount];
+        scoMutableMemberFlags = new boolean[memberCount];
+        nonPkMemberFlags = new boolean[memberCount];
+
+        int pk_field_count=0;
+        int dfg_field_count=0;
+        int scm_field_count=0;
+        for (int i=0;i<memberCount;i++)
+        {
+            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+            if (fmd.isPrimaryKey())
+            {
+                pk_field_count++;
+            }
+            else
+            {
+                nonPkMemberFlags[i] = true;
+            }
+            if (fmd.isDefaultFetchGroup())
+            {
+                dfgMemberFlags[i] = true;
+                dfg_field_count++;
+            }
+            if (fmd.calcIsSecondClassMutable())
+            {
+                scoMutableMemberFlags[i] = true;
+                scm_field_count++;
+            }
+        }
+ 
+        if (pk_field_count > 0 && identityType != IdentityType.APPLICATION)
+        {
+            // primary key fields found, but not using application identity
+            throw new InvalidMetaDataException(LOCALISER, "044078",
+                fullName, new Integer(pk_field_count), identityType);
+        }
+        else if (pk_field_count > 0)
+        {
+            pkMemberPositions = new int[pk_field_count];
+            for (int i=0,pk_num=0;i<memberCount;i++)
+            {
+                AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+                if (fmd.isPrimaryKey())
+                {
+                    pkMemberPositions[pk_num++] = i;
+                }
+            }
+        }
+        else if (pk_field_count == 0 && identityType == IdentityType.APPLICATION)
+        {
+            // No primary key fields found
+            throw new InvalidMetaDataException(LOCALISER, "044077", fullName, objectidClass);
+        }
+
+        nonPkMemberPositions = new int[memberCount-pk_field_count];
+        for (int i=0,npkf=0;i<memberCount;i++)
+        {
+            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+            if (!fmd.isPrimaryKey())
+            {
+                nonPkMemberPositions[npkf++] = i;
+            }
+        }
+
+        dfgMemberPositions = new int[dfg_field_count];
+        scoMutableMemberPositions = new int[scm_field_count];
+        for (int i=0,dfg_num=0,scm_num=0;i<memberCount;i++)
+        {
+            if (dfgMemberFlags[i])
+            {
+                dfgMemberPositions[dfg_num++] = i;
+            }
+            if (scoMutableMemberFlags[i])
+            {
+                scoMutableMemberPositions[scm_num++] = i;
+            }
+        }
+    }
+
+    /**
      * Impose a default inheritance strategy when one is not already specified.
      * Uses the PMF property for defaultInheritanceStrategy and works to the JDO2 spec etc.
      */
@@ -1845,6 +1934,25 @@
     }
 
     /**
+     * Whether this PersistenceCapable class uses SingleFieldIdentity
+     * @return true if using SingleFieldIdentity as objectid class
+     */
+    public boolean usesSingleFieldIdentityClass()
+    {
+        return usesSingleFieldIdentityClass;
+    }
+
+    /**
+     * Accessor for whether this class is fully specified by this metadata and that any
+     * annotations should be ignored.
+     * @return Whether we should ignore any annotations
+     */
+    public boolean isMetaDataComplete()
+    {
+        return metaDataComplete;
+    }
+
+    /**
      * Check if the argument cmd is the same as this or a descedent.
      * @param cmd the AbstractClassMetaData to be verify if this is an ancestor
      * @return true if the argument is a child or same as this
@@ -2326,16 +2434,24 @@
     }
 
     /**
-     * Accessor for all field/property positions. 
+     * Accessor for all field/property positions.
      * These are absolute numbers and include superclasses and are really just 0, 1, 2, ... n.
      * @return The positions of all (managed) fields/properties.
      */
     public int[] getAllMemberPositions()
     {
         checkInitialised();
+        if (allMemberPositions == null)
+        {
+            allMemberPositions = new int[memberCount];
+            for (int i=0;i<memberCount;i++)
+            {
+                allMemberPositions[i] = i;
+            }
+        }
         return allMemberPositions;
     }
- 
+
     /**
      * Accessor for the field numbers of the primary key fields/properties. 
      * These are absolute numbers (including superclasses).
@@ -2346,7 +2462,7 @@
         checkInitialised();
         return pkMemberPositions;
     }
- 
+
     /**
      * Accessor for the positions of the non primary key fields/properties (inc superclass fields).
      * @return The member positions
@@ -2388,6 +2504,44 @@
     }
 
     /**
+     * Accessor for the absolute positions of fields/properties that are considered multi-valued
+     * This category includes members of all multi-valued types, including
+     * Collection, array, and Map types of basic and relationship types.
+     * @return The absolute positions
+     */
+    public int[] getMultivaluedMemberPositions()
+    {
+        // Do double pass on members - first pass to get number of members, and second to set up array
+        // Could do single pass with ArrayList but want primitives and in JDK1.3/4 can't put direct in ArrayList
+        Iterator iter = members.iterator();
+        int numMultivalues = 0;
+        while (iter.hasNext())
+        {
+            AbstractMemberMetaData mmd = (AbstractMemberMetaData)iter.next();
+            if (mmd.getType().isArray() ||
+                Collection.class.isAssignableFrom(mmd.getType()) ||
+                Map.class.isAssignableFrom(mmd.getType()))
+            {
+                numMultivalues++;
+            }
+        }
+        int[] multivaluePositions = new int[numMultivalues];
+        iter = members.iterator();
+        int number = 0;
+        while (iter.hasNext())
+        {
+            AbstractMemberMetaData mmd = (AbstractMemberMetaData)iter.next();
+            if (mmd.getType().isArray() ||
+                Collection.class.isAssignableFrom(mmd.getType()) ||
+                Map.class.isAssignableFrom(mmd.getType()))
+            {
+                multivaluePositions[number++] = mmd.getAbsoluteFieldNumber();
+            }
+        }
+        return multivaluePositions;
+    }
+
+    /**
      * Accessor for the absolute positions of the second class mutable fields/properties.
      * @return The field numbers of the second class mutable fields (inc superclasses).
      */
@@ -2397,9 +2551,6 @@
         return scoMutableMemberPositions;
     }
 
-    /** Field numbers of all SCO fields/properties that arent containers. */
-    protected int[] scoNonContainerMemberPositions = null;
-
     /**
      * Accessor for the absolute positions of all SCO fields/properties that are NOT containers (e.g Dates, Points, etc)
      * @return Field numbers of all SCO non-container fields/properties
@@ -2480,16 +2631,6 @@
     }
 
     /**
-     * Accessor for the absolute positions of the PersistenceCapable fields/properties.
-     * @return The positions of the PersistenceCapable fields/properties (inc superclasses).
-     */
-    public int[] getPersistenceCapableMemberPositions()
-    {
-        checkInitialised();
-        return persistenceCapableMemberPositions;
-    }
-
-    /**
      * Accessor for the flags of the SCO mutable fields (inc superclass fields).
      * @return The flags whether the field is second class mutable
      */
@@ -2500,39 +2641,12 @@
     }
 
     /**
-     * Whether this PersistenceCapable class uses SingleFieldIdentity
-     * @return true if using SingleFieldIdentity as objectid class
-     */
-    public boolean usesSingleFieldIdentityClass()
-    {
-        return usesSingleFieldIdentityClass;
-    }
-
-    /**
-     * Accessor for whether this class is fully specified by this metadata and that any
-     * annotations should be ignored.
-     * @return Whether we should ignore any annotations
-     */
-    public boolean isMetaDataComplete()
-    {
-        return metaDataComplete;
-    }
-
-    /** Absolute positions of the fields/properties that have relations. */
-    int[] relationPositions = null;
-
-    /**
      * Convenience method to return if the class has relations to other objects. Includes superclasses.
      * @return Whether the class has any relations (that it knows about)
      */
     public boolean hasRelations(ClassLoaderResolver clr)
     {
-        if (relationPositions == null)
-        {
-            // Relations not yet calculated so do it now
-            getRelationMemberPositions(clr);
-        }
-        return (relationPositions.length > 0);
+        return (getRelationMemberPositions(clr).length > 0);
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2008-08-14 15:44:03 UTC (rev 2632)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2008-08-14 17:50:47 UTC (rev 2633)
@@ -706,7 +706,6 @@
                         {
                             mmd.setPrimaryKey();
                         }
-                        // TODO Add on any more info not present
                     }
                 }
             }
@@ -723,103 +722,8 @@
         }
 
         // Set up the various convenience arrays of field numbers
-        int total_field_count=noOfInheritedManagedMembers + managedMembers.length;
-        this.memberCount = total_field_count; 
-        allMemberPositions = new int[total_field_count];
-        dfgMemberFlags = new boolean[total_field_count];
-        scoMutableMemberFlags = new boolean[total_field_count];
-        nonPkMemberFlags = new boolean[total_field_count];
-        int pk_field_count=0;
-        int dfg_field_count=0;
-        int scm_field_count=0;
-        int pc_field_count=0;
-        for (int i=0;i<total_field_count;i++)
-        {
-            allMemberPositions[i] = i;
+        initialiseMemberPositionInformation();
 
-            AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (fmd.isPrimaryKey())
-            {
-                pk_field_count++;
-            }
-            else
-            {
-                nonPkMemberFlags[i] = true;
-            }
-            if (fmd.isDefaultFetchGroup())
-            {
-                dfgMemberFlags[i] = true;
-                dfg_field_count++;
-            }
-            if (fmd.calcIsSecondClassMutable())
-            {
-                scoMutableMemberFlags[i] = true;
-                scm_field_count++;
-            }
-            if (fmd.isFieldTypePersistable())
-            {
-                pc_field_count++;
-            }
-        }
- 
-        if (pk_field_count > 0 &&
-            identityType != IdentityType.APPLICATION)
-        {
-            // primary key fields found, but not using application identity
-            throw new InvalidMetaDataException(LOCALISER,
-                "044078",
-                fullName,new Integer(pk_field_count),identityType);
-        }
-        else if (pk_field_count > 0)
-        {
-            pkMemberPositions = new int[pk_field_count];
-            for (int i=0,pk_num=0;i<total_field_count;i++)
-            {
-                AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-                if (fmd.isPrimaryKey())
-                {
-                    pkMemberPositions[pk_num++] = i;
-                }
-            }
-        }
-        else if (pk_field_count == 0 &&
-            identityType == IdentityType.APPLICATION)
-        {
-            // No primary key fields found
-            throw new InvalidMetaDataException(LOCALISER,
-                "044077",
-                fullName,objectidClass);
-        }
-
-        nonPkMemberPositions = new int[total_field_count-pk_field_count];
-        persistenceCapableMemberPositions = new int[pc_field_count];
-        for (int i=0,npkf=0,npc=0;i<total_field_count;i++)
-        {
-            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (!fmd.isPrimaryKey())
-            {
-                nonPkMemberPositions[npkf++] = i;
-            }
-            if (fmd.isFieldTypePersistable())
-            {
-                persistenceCapableMemberPositions[npc++] = i;
-            }
-        }
-
-        dfgMemberPositions = new int[dfg_field_count];
-        scoMutableMemberPositions = new int[scm_field_count];
-        for (int i=0,dfg_num=0,scm_num=0;i<total_field_count;i++)
-        {
-            if (dfgMemberFlags[i])
-            {
-                dfgMemberPositions[dfg_num++] = i;
-            }
-            if (scoMutableMemberFlags[i])
-            {
-                scoMutableMemberPositions[scm_num++] = i;
-            }
-        }
-
         // Initialise any sub-objects
         implementsMetaData = new ImplementsMetaData[implementations.size()];
         for (int i=0; i<implementations.size(); i++)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2008-08-14 15:44:03 UTC (rev 2632)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2008-08-14 17:50:47 UTC (rev 2633)
@@ -179,103 +179,8 @@
         }
 
         // Set up the various convenience arrays of field numbers
-        int total_field_count=noOfInheritedManagedMembers + managedMembers.length;
-        this.memberCount = total_field_count; 
-        allMemberPositions = new int[total_field_count];
-        dfgMemberFlags = new boolean[total_field_count];
-        scoMutableMemberFlags = new boolean[total_field_count];
-        nonPkMemberFlags = new boolean[total_field_count];
-        int pk_field_count=0;
-        int dfg_field_count=0;
-        int scm_field_count=0;
-        int pc_field_count=0;
-        for (int i=0;i<total_field_count;i++)
-        {
-            allMemberPositions[i] = i;
+        initialiseMemberPositionInformation();
 
-            AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (fmd.isPrimaryKey())
-            {
-                pk_field_count++;
-            }
-            else
-            {
-                nonPkMemberFlags[i] = true;
-            }
-            if (fmd.isDefaultFetchGroup())
-            {
-                dfgMemberFlags[i] = true;
-                dfg_field_count++;
-            }
-            if (fmd.calcIsSecondClassMutable())
-            {
-                scoMutableMemberFlags[i] = true;
-                scm_field_count++;
-            }
-            if (fmd.isFieldTypePersistable())
-            {
-                pc_field_count++;
-            }
-        }
- 
-        if (pk_field_count > 0 &&
-            identityType != IdentityType.APPLICATION)
-        {
-            // primary key fields found, but not using application identity
-            throw new InvalidMetaDataException(LOCALISER,
-                "044078",
-                fullName,new Integer(pk_field_count),identityType);
-        }
-        else if (pk_field_count > 0)
-        {
-            pkMemberPositions = new int[pk_field_count];
-            for (int i=0,pk_num=0;i<total_field_count;i++)
-            {
-                AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-                if (fmd.isPrimaryKey())
-                {
-                    pkMemberPositions[pk_num++] = i;
-                }
-            }
-        }
-        else if (pk_field_count == 0 &&
-            identityType == IdentityType.APPLICATION)
-        {
-            // No primary key fields found
-            throw new InvalidMetaDataException(LOCALISER,
-                "044077",
-                fullName,objectidClass);
-        }
-
-        nonPkMemberPositions = new int[total_field_count-pk_field_count];
-        persistenceCapableMemberPositions = new int[pc_field_count];
-        for (int i=0,npkf=0,npc=0;i<total_field_count;i++)
-        {
-            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (!fmd.isPrimaryKey())
-            {
-                nonPkMemberPositions[npkf++] = i;
-            }
-            if (fmd.isFieldTypePersistable())
-            {
-                persistenceCapableMemberPositions[npc++] = i;
-            }
-        }
-
-        dfgMemberPositions = new int[dfg_field_count];
-        scoMutableMemberPositions = new int[scm_field_count];
-        for (int i=0,dfg_num=0,scm_num=0;i<total_field_count;i++)
-        {
-            if (dfgMemberFlags[i])
-            {
-                dfgMemberPositions[dfg_num++] = i;
-            }
-            if (scoMutableMemberFlags[i])
-            {
-                scoMutableMemberPositions[scm_num++] = i;
-            }
-        }
-
         joinMetaData = new JoinMetaData[joins.size()];
         for (int i=0; i<joinMetaData.length; i++)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2650
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=2650&view=rev
Author:   andy_jefferson
Date:     2008-08-18 13:32:39 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
[NUCCORE-100] Add convenience method for whether a field is "persistent-interface" (so should not be in basic members list, and should be in relation fields list).

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-08-18 08:54:58 UTC (rev 2649)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-08-18 13:32:39 UTC (rev 2650)
@@ -2520,7 +2520,7 @@
         while (iter.hasNext())
         {
             AbstractMemberMetaData mmd = (AbstractMemberMetaData)iter.next();
-            if (mmd.getRelationType(clr) == Relation.NONE &&
+            if (mmd.getRelationType(clr) == Relation.NONE && !mmd.isPersistentInterface(clr) &&
                 !Collection.class.isAssignableFrom(mmd.getType()) &&
                 !Map.class.isAssignableFrom(mmd.getType()) &&
                 !mmd.getType().isArray())
@@ -2549,7 +2549,7 @@
         while (iter.hasNext())
         {
             AbstractMemberMetaData mmd = (AbstractMemberMetaData)iter.next();
-            if (mmd.getRelationType(clr) == Relation.NONE &&
+            if (mmd.getRelationType(clr) == Relation.NONE && !mmd.isPersistentInterface(clr) &&
                 !Collection.class.isAssignableFrom(mmd.getType()) &&
                 !Map.class.isAssignableFrom(mmd.getType()) &&
                 !mmd.getType().isArray())
@@ -2742,7 +2742,8 @@
             int numRelations = numRelationsSuperclass;
             for (int i=0;i<managedMembers.length;i++)
             {
-                if (managedMembers[i].getRelationType(clr) != Relation.NONE)
+                if (managedMembers[i].getRelationType(clr) != Relation.NONE ||
+                    managedMembers[i].isPersistentInterface(clr))
                 {
                     numRelations++;
                 }
@@ -2761,7 +2762,8 @@
             {
                 for (int i=0;i<managedMembers.length;i++)
                 {
-                    if (managedMembers[i].getRelationType(clr) != Relation.NONE)
+                    if (managedMembers[i].getRelationType(clr) != Relation.NONE ||
+                        managedMembers[i].isPersistentInterface(clr))
                     {
                         relationPositions[num++] = managedMembers[i].getAbsoluteFieldNumber();
                     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2008-08-18 08:54:58 UTC (rev 2649)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2008-08-18 13:32:39 UTC (rev 2650)
@@ -2468,6 +2468,9 @@
      * Convenience method that sets up the relation type of this field, and the reference to 
      * any related field when it is bidirectional. If the relation is bidirectional then will also
      * set the other side of the relation (to relate to this side).
+     * Any member that refers to a PERSISTENT INTERFACE will have relation type as NONE.
+     * This should ultimately be changed to reflect the real relation, and relationMemberMetaData
+     * should also be set accordingly.
      * @param clr ClassLoader resolver
      * @throws NucleusUserException If mapped-by doesnt exist at other side
      */
@@ -2695,6 +2698,61 @@
     }
 
     /**
+     * Convenience method to return if this member relates to a persistent interface.
+     * All members that have a relation will return NONE from getRelationType but can be
+     * accessed through here.
+     * TODO Merge this with relation methods so we only need the relationType/relatedMemberMetaData.
+     * @param clr ClassLoader resolver
+     * @return Whether it is for a persistent interface
+     */
+    public boolean isPersistentInterface(ClassLoaderResolver clr)
+    {
+        if (hasCollection())
+        {
+            if (getMetaDataManager().isPersistentInterface(getCollection().getElementType()))
+            {
+                return true;
+            }
+        }
+        else if (hasMap())
+        {
+            if (getMetaDataManager().isPersistentInterface(getMap().getKeyType()))
+            {
+                return true;
+            }
+            if (getMetaDataManager().isPersistentInterface(getMap().getValueType()))
+            {
+                return true;
+            }
+        }
+        else if (hasArray())
+        {
+            if (getMetaDataManager().isPersistentInterface(getArray().getElementType()))
+            {
+                return true;
+            }
+        }
+        else
+        {
+            if (getType().isInterface())
+            {
+                if (getMetaDataManager().isPersistentInterface(getTypeName()))
+                {
+                    return true;
+                }
+                else if (fieldTypes != null)
+                {
+                    if (getMetaDataManager().isPersistentInterface(fieldTypes[0]))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
      * Convenience method for whether this field is the owner of the relation.
      * If the field has no relation will return true.
      * If the field is in a unidirectional relation will return true.
@@ -2709,6 +2767,7 @@
         {
             setRelation(clr);
         }
+
         if (relationType == Relation.NONE)
         {
             return true;
@@ -2808,13 +2867,12 @@
 
     /**
      * Accessor for all ClassMetaData referenced by this Field.
-     * <p>
      * Part of the "persistence-by-reachability" concept. 
      * @param orderedCMDs List of ordered ClassMetaData objects (added to).
      * @param referencedCMDs Set of referenced ClassMetaData objects (added to)
      * @param dba_vendor_id Vendor id of the DBA
      * @param clr the ClassLoaderResolver
-     **/
+     */
     void getReferencedClassMetaData(final List orderedCMDs,
                                     final Set referencedCMDs,
                                     final String dba_vendor_id,
@@ -2846,8 +2904,7 @@
     /**
      *  Calculate wether this field should be a second class mutable field.
      *  This calculation is a bit expensive.
-     *  Please note that this data will be cached in {@link AbstractClassMetaData#scoMutableMemberFlags}. 
-     *  
+     *  Please note that this data will be cached in {@link AbstractClassMetaData#scoMutableMemberFlags}.
      *  @return wether this field should be a second class mutable field.
      */
     public boolean calcIsSecondClassMutable()
@@ -2869,8 +2926,9 @@
             }
             else
             {
-                // Be nice to JDO mapping authors and remind them that they may have a misspelling.
-                throw new UnsupportedOperationException(this+": extensions \"is-second-class\" may have only values \"true\", \"false\", \"default\" or it may not be set at all. But it is set to \""+isSecondClass+"\".");
+                // Invalid value
+                throw new InvalidMetaDataException(LOCALISER, "044002", "is-second-class",
+                    "true/false/default", isSecondClass);
             }
         }
         else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4045
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4045&view=rev
Author:   andy_jefferson
Date:     2008-11-23 18:25:17 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
[NUCCORE-156] Remove parent from constructor of AbstractConstraintMetaData

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-11-23 18:12:58 UTC (rev 4044)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-11-23 18:25:17 UTC (rev 4045)
@@ -52,14 +52,11 @@
 
     /**
      * Constructor.
-     * @param parent Parent (if required to be set)
      * @param name Name of the constraint
      * @param table Name of table for the constraint
      */
-    public AbstractConstraintMetaData(MetaData parent, String name, String table)
+    public AbstractConstraintMetaData(String name, String table)
     {
-        super(parent);
-
         this.name = (StringUtils.isWhitespace(name) ? null : name);
         this.table = (StringUtils.isWhitespace(table) ? null : table);
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2008-11-23 18:12:58 UTC (rev 4044)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2008-11-23 18:25:17 UTC (rev 4045)
@@ -91,16 +91,14 @@
         Class field_type = getMemberMetaData().getType();
         if (!java.util.Collection.class.isAssignableFrom(field_type))
         {
-            throw new InvalidMetaDataException(LOCALISER,
-                    "044132",
+            throw new InvalidMetaDataException(LOCALISER, "044132",
                     getFieldName(),getMemberMetaData().getClassName(false));
         }
 
         // "element-type"
         if (element.type == null)
         {
-            throw new InvalidMetaDataException(LOCALISER,
-                    "044133",
+            throw new InvalidMetaDataException(LOCALISER, "044133",
                     getFieldName(),getMemberMetaData().getClassName(false));
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-11-23 18:12:58 UTC (rev 4044)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-11-23 18:25:17 UTC (rev 4045)
@@ -67,7 +67,7 @@
      */
     public ForeignKeyMetaData(ForeignKeyMetaData fkmd)
     {
-        super(null, fkmd.name, fkmd.table); // Ignore parent
+        super(fkmd.name, fkmd.table); // Ignore parent
 
         this.deferred = fkmd.deferred;
         this.deleteAction = fkmd.deleteAction;
@@ -134,7 +134,7 @@
                               final String delete_action,
                               final String update_action)
     {
-        super(null, name, table);    // Ignore parent
+        super(name, table);
 
         if (unique != null)
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-11-23 18:12:58 UTC (rev 4044)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-11-23 18:25:17 UTC (rev 4045)
@@ -59,7 +59,7 @@
      */
     public IndexMetaData(IndexMetaData imd)
     {
-        super(null, imd.name, imd.table); // Ignore parent
+        super(imd.name, imd.table);
 
         this.unique = imd.unique;
         AbstractMemberMetaData[] apmd = null;
@@ -111,7 +111,7 @@
      */
     public IndexMetaData(final String name, String table, String unique)
     {
-        super(null, name, table); // Ignore parent
+        super(name, table);
 
         if (unique != null)
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-11-23 18:12:58 UTC (rev 4044)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-11-23 18:25:17 UTC (rev 4045)
@@ -32,7 +32,7 @@
      */
     public UniqueMetaData(UniqueMetaData umd)
     {
-        super(null, umd.name, umd.table);
+        super(umd.name, umd.table);
 
         this.deferred = umd.deferred;
         // TODO Change these to copy rather than reference
@@ -54,7 +54,7 @@
      */
     public UniqueMetaData(final String name, final String table, final String deferredValue)
     {
-        super(null, name, table); // Ignore parent
+        super(name, table);
 
         if (deferredValue != null && deferredValue.equalsIgnoreCase("true"))
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4047
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4047&view=rev
Author:   andy_jefferson
Date:     2008-11-23 20:42:14 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
[NUCCORE-156] Clean up initialise of AbstractContainerMetaData. Move setting of default for cascade flags to populate

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-11-23 20:16:45 UTC (rev 4046)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-11-23 20:42:14 UTC (rev 4047)
@@ -62,12 +62,63 @@
     }
 
     /**
+     * Method to initialise the object, creating internal convenience arrays.
+     * Initialise all sub-objects.
+     */
+    public void initialise()
+    {
+        if (isInitialised())
+        {
+            return;
+        }
+
+        // Set up the fieldMetaData
+        if (members.size() == 0)
+        {
+            memberMetaData = null;
+        }
+        else
+        {
+            memberMetaData = new AbstractMemberMetaData[members.size()];
+            for (int i=0; i<memberMetaData.length; i++)
+            {
+                memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
+                memberMetaData[i].initialise();
+            }
+        }
+
+        // Set up the columnMetaData
+        if (columns.size() == 0)
+        {
+            columnMetaData = null;
+        }
+        else
+        {
+            columnMetaData = new ColumnMetaData[columns.size()];
+            for (int i=0; i<columnMetaData.length; i++)
+            {
+                columnMetaData[i] = (ColumnMetaData) columns.get(i);
+                columnMetaData[i].initialise();
+            }
+        }
+
+        // Clear out parsing data
+        members.clear();
+        members = null;
+        columns.clear();
+        columns = null;
+
+        setInitialised();
+    }
+
+    /**
      * Add a new member that is part of this constraint.
      * @param mmd MetaData for the field/property
      */
     public void addMember(AbstractMemberMetaData mmd)
     {
         members.add(mmd);
+        mmd.parent = this;
     }
 
     /**
@@ -90,6 +141,15 @@
     }
 
     /**
+     * Mutator for the table
+     * @param table Name of the table.
+     */
+    public void setTable(String table)
+    {
+        this.table = table;
+    }
+
+    /**
      * Accessor for the name of the constraint
      * @return Returns the name.
      */

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2008-11-23 20:16:45 UTC (rev 4046)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2008-11-23 20:42:14 UTC (rev 4047)
@@ -45,7 +45,7 @@
  * This class is extended for fields (FieldMetaData) and properties (PropertyMetaData) to provide
  * the explicit support for those components.
  */
-public abstract class AbstractMemberMetaData extends MetaData  implements Comparable, ColumnMetaDataContainer
+public abstract class AbstractMemberMetaData extends MetaData implements Comparable, ColumnMetaDataContainer
 {
     /** Contains the metadata for column(s). */
     protected ColumnMetaData[] columnMetaData;
@@ -108,16 +108,16 @@
     protected boolean cacheable = true;
 
     /** Whether to persist this relation when persisting the owning object. */
-    protected boolean cascadePersist;
+    protected Boolean cascadePersist;
 
     /** Whether to update this relation when updating the owning object. */
-    protected boolean cascadeUpdate;
+    protected Boolean cascadeUpdate;
 
     /** Whether to delete this relation when deleting the owning object (JPA). TODO Link this to dependent */
-    protected boolean cascadeDelete;
+    protected Boolean cascadeDelete;
 
     /** Whether to refresh this relation when refreshing the owning object (JPA). */
-    protected boolean cascadeRefresh;
+    protected Boolean cascadeRefresh;
 
     /** load-fetch-group value. */
     protected String loadFetchGroup;
@@ -487,7 +487,8 @@
         }
         if (persistenceModifier == null)
         {
-            NucleusLogger.METADATA.error(LOCALISER.msg("044117",name,getClassName(false),modifier,"persistence-modifier"));
+            NucleusLogger.METADATA.error(LOCALISER.msg("044117", name, getClassName(false), modifier,
+                "persistence-modifier"));
             throw new InvalidMetaDataException(LOCALISER,
                                                "044117",
                                                name,getClassName(false),
@@ -556,17 +557,6 @@
             // Split the passed value assuming that it is comma-separated
             this.fieldTypes = MetaDataUtils.getInstance().getValuesForCommaSeparatedAttribute(fieldType);
         }
-
-        if (getMetaDataManager() != null)
-        {
-            // Set defaults for cascading
-            // If we have no MetaDataManager here then we are likely a field for an Index/Unique etc so dont need this
-            ApiAdapter apiAdapter = getMetaDataManager().getOMFContext().getApiAdapter();
-            this.cascadePersist = apiAdapter.getDefaultCascadePersistForField();
-            this.cascadeUpdate = apiAdapter.getDefaultCascadeUpdateForField();
-            this.cascadeDelete = apiAdapter.getDefaultCascadeDeleteForField();
-            this.cascadeRefresh = apiAdapter.getDefaultCascadeRefreshForField();
-        }
     }
 
     /**
@@ -588,11 +578,32 @@
             return;
         }
 
+        if (getMetaDataManager() != null)
+        {
+            // Set defaults for cascading when not yet set
+            ApiAdapter apiAdapter = getMetaDataManager().getOMFContext().getApiAdapter();
+            if (cascadePersist == null)
+            {
+                cascadePersist = apiAdapter.getDefaultCascadePersistForField();
+            }
+            if (cascadeUpdate == null)
+            {
+                cascadeUpdate = apiAdapter.getDefaultCascadeUpdateForField();
+            }
+            if (cascadeDelete == null)
+            {
+                cascadeDelete = apiAdapter.getDefaultCascadeDeleteForField();
+            }
+            if (cascadeRefresh == null)
+            {
+                cascadeRefresh = apiAdapter.getDefaultCascadeRefreshForField();
+            }
+        }
+
         if (field == null && method == null)
         {
             NucleusLogger.METADATA.error(LOCALISER.msg("044106",name,getClassName(false)));
-            throw new InvalidMetaDataException(LOCALISER,
-                "MetaData.Field.PopulateWithNullError",
+            throw new InvalidMetaDataException(LOCALISER, "MetaData.Field.PopulateWithNullError",
                 name,getClassName(false));
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-11-23 20:16:45 UTC (rev 4046)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-11-23 20:42:14 UTC (rev 4047)
@@ -164,56 +164,6 @@
     }
 
     /**
-     * Method to initialise the object, setting up all internal arrays.
-     * Initialises all sub-objects.
-     */
-    public void initialise()
-    {
-        if (isInitialised())
-        {
-            return;
-        }
-
-        // Set up the columnMetaData
-        if (members.size() == 0)
-        {
-            memberMetaData = null;
-        }
-        else
-        {
-            memberMetaData = new AbstractMemberMetaData[members.size()];
-            for (int i=0; i<memberMetaData.length; i++)
-            {
-                memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
-                memberMetaData[i].initialise();
-            }
-        }
-
-        // Set up the columnMetaData
-        if (columns.size() == 0)
-        {
-            columnMetaData = null;
-        }
-        else
-        {
-            columnMetaData = new ColumnMetaData[columns.size()];
-            for (int i=0; i<columnMetaData.length; i++)
-            {
-                columnMetaData[i] = (ColumnMetaData) columns.get(i);
-                columnMetaData[i].initialise();
-            }
-        }
-
-        // Clear out parsing data
-        columns.clear();
-        columns = null;
-        members.clear();
-        members = null;
-
-        setInitialised();
-    }
-
-    /**
      * Accessor for whether the FK is deferred
      * @return Returns the deferred.
      */

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-11-23 20:16:45 UTC (rev 4046)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-11-23 20:42:14 UTC (rev 4047)
@@ -127,56 +127,6 @@
     }
 
     /**
-     * Method to initialise the object, creating internal convenience arrays.
-     * Initialise all sub-objects.
-     */
-    public void initialise()
-    {
-        if (isInitialised())
-        {
-            return;
-        }
-
-        // Set up the fieldMetaData
-        if (members.size() == 0)
-        {
-            memberMetaData = null;
-        }
-        else
-        {
-            memberMetaData = new AbstractMemberMetaData[members.size()];
-            for (int i=0; i<memberMetaData.length; i++)
-            {
-                memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
-                memberMetaData[i].initialise();
-            }
-        }
-
-        // Set up the columnMetaData
-        if (columns.size() == 0)
-        {
-            columnMetaData = null;
-        }
-        else
-        {
-            columnMetaData = new ColumnMetaData[columns.size()];
-            for (int i=0; i<columnMetaData.length; i++)
-            {
-                columnMetaData[i] = (ColumnMetaData) columns.get(i);
-                columnMetaData[i].initialise();
-            }
-        }
-
-        // Clean out parsing data
-        members.clear();
-        members = null;
-        columns.clear();
-        columns = null;
-
-        setInitialised();
-    }
-
-    /**
      * Accessor for whether the index is unique
      * @return Returns whether the index is unique.
      */

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-11-23 20:16:45 UTC (rev 4046)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-11-23 20:42:14 UTC (rev 4047)
@@ -67,58 +67,6 @@
     }
 
     /**
-     * Method to initialise the object, creating internal convenience arrays.
-     * Initialise all sub-objects.
-     */
-    public void initialise()
-    {
-        if (isInitialised())
-        {
-            return;
-        }
-
-        // Set up the fieldMetaData
-        if (members.size() == 0)
-        {
-            memberMetaData = null;
-        }
-        else
-        {
-            memberMetaData = new AbstractMemberMetaData[members.size()];
-            for (int i=0; i<memberMetaData.length; i++)
-            {
-                memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
-                memberMetaData[i].initialise();
-            }
-        }
-
-        // Set up the columnMetaData
-        if (columns.size() == 0)
-        {
-            columnMetaData = null;
-        }
-        else
-        {
-            columnMetaData = new ColumnMetaData[columns.size()];
-            for (int i=0; i<columnMetaData.length; i++)
-            {
-                columnMetaData[i] = (ColumnMetaData) columns.get(i);
-                columnMetaData[i].initialise();
-            }
-        }
-
-        // Clear out parsing data
-        members.clear();
-        members = null;
-        columns.clear();
-        columns = null;
-
-        setInitialised();
-    }
-
-    // -------------------------------- Mutators -------------------------------
-
-    /**
      * Accessor for whether the unique constraint is deferred.
      * @return Returns whether the unique constraint is deferred
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4071
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4071&view=rev
Author:   andy_jefferson
Date:     2008-11-27 14:00:07 +0000 (Thu, 27 Nov 2008)

Log Message:
-----------
[NUCCORE-156] More constructor cleanup

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/EventListenerMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceFileMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/QueryResultMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/TableGeneratorMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -83,7 +83,6 @@
      */
     public AbstractElementMetaData(AbstractElementMetaData aemd)
     {
-        super(null);
         this.columnName = aemd.columnName;
         this.uniqueConstraint = aemd.uniqueConstraint;
         this.indexed = aemd.indexed;
@@ -127,8 +126,6 @@
                                    String unique,
                                    String mappedBy)
     {
-        super(null);
-
         this.columnName = (StringUtils.isWhitespace(columnName) ? null : columnName);
 
         if (deleteAction != null || updateAction != null)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/EventListenerMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/EventListenerMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/EventListenerMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -37,7 +37,6 @@
      */
     public EventListenerMetaData(String className)
     {
-        super(null);
         this.className = className;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -41,7 +41,6 @@
      */
     public InheritanceMetaData(final String strategy)
     {
-        super(null);
         this.strategy = InheritanceStrategy.getInheritanceStrategy(strategy);
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceFileMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceFileMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceFileMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -38,8 +38,6 @@
      */
     public PersistenceFileMetaData(String filename)
     {
-        super(null);
-
         this.filename = filename;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -70,7 +70,6 @@
      */
     public PersistenceUnitMetaData(String name, String transactionType)
     {
-        super(null);
         this.name = name;
         this.transactionType = TransactionType.getValue(transactionType);
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -56,8 +56,6 @@
      */
     public PrimaryKeyMetaData(final String name, final String columnName)
     {
-        super(null);
-
         this.name = (StringUtils.isWhitespace(name) ? null : name);
         this.columnName = (StringUtils.isWhitespace(columnName) ? null : columnName);
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/QueryResultMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/QueryResultMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/QueryResultMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -50,8 +50,6 @@
      */
     public QueryResultMetaData(final String name)
     {
-        super(null);
-
         this.name = name;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -58,8 +58,6 @@
                          final String initialValue,
                          final String allocationSize)
     {
-        super(null);
-
         this.name = name;
         if (StringUtils.isWhitespace(name))
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/TableGeneratorMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/TableGeneratorMetaData.java	2008-11-27 13:56:32 UTC (rev 4070)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/TableGeneratorMetaData.java	2008-11-27 14:00:07 UTC (rev 4071)
@@ -73,8 +73,6 @@
                          final String initialValue,
                          final String allocationSize)
     {
-        super(null);
-
         if (StringUtils.isWhitespace(name))
         {
             throw new InvalidMetaDataException(LOCALISER,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4272
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4272&view=rev
Author:   andy_jefferson
Date:     2008-12-13 20:56:57 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
[NUCCORE-156] Change some setters to return the object type to allow chaining

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/QueryMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-12-13 20:41:07 UTC (rev 4271)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2008-12-13 20:56:57 UTC (rev 4272)
@@ -127,40 +127,24 @@
         colmd.parent = this;
     }
 
-    /**
-     * Mutator for the constraint name.
-     * @param name Name of the constraint.
-     */
-    public void setName(String name)
+    public final String getName()
     {
-        this.name = (StringUtils.isWhitespace(name) ? null : name);
+        return name;
     }
 
-    /**
-     * Mutator for the table
-     * @param table Name of the table.
-     */
-    public void setTable(String table)
+    public void setName(String name)
     {
-        this.table = (StringUtils.isWhitespace(table) ? null : table);
+        this.name = (StringUtils.isWhitespace(name) ? null : name);
     }
 
-    /**
-     * Accessor for the name of the constraint
-     * @return Returns the name.
-     */
-    public final String getName()
+    public final String getTable()
     {
-        return name;
+        return table;
     }
 
-    /**
-     * Accessor for the name of the table
-     * @return Returns the table.
-     */
-    public final String getTable()
+    public void setTable(String table)
     {
-        return table;
+        this.table = (StringUtils.isWhitespace(table) ? null : table);
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/QueryMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/QueryMetaData.java	2008-12-13 20:41:07 UTC (rev 4271)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/QueryMetaData.java	2008-12-13 20:56:57 UTC (rev 4272)
@@ -70,9 +70,10 @@
         return scope;
     }
 
-    public void setScope(String scope)
+    public QueryMetaData setScope(String scope)
     {
         this.scope = (StringUtils.isWhitespace(scope) ? null : scope);
+        return this;
     }
 
     public String getName()
@@ -90,7 +91,7 @@
         return language;
     }
 
-    public void setLanguage(String language)
+    public QueryMetaData setLanguage(String language)
     {
         if (!StringUtils.isWhitespace(language))
         {
@@ -108,6 +109,7 @@
                 this.language = QueryLanguage.JPQL.toString();
             }
         }
+        return this;
     }
 
     public boolean isUnmodifiable()
@@ -115,17 +117,19 @@
         return unmodifiable;
     }
 
-    public void setUnmodifiable(boolean unmodifiable)
+    public QueryMetaData setUnmodifiable(boolean unmodifiable)
     {
         this.unmodifiable = unmodifiable;
+        return this;
     }
 
-    public void setUnmodifiable(String unmodifiable)
+    public QueryMetaData setUnmodifiable(String unmodifiable)
     {
         if (!StringUtils.isWhitespace(unmodifiable))
         {
             this.unmodifiable = Boolean.parseBoolean(unmodifiable);
         }
+        return this;
     }
 
     public String getQuery()
@@ -133,9 +137,10 @@
         return query;
     }
 
-    public void setQuery(String query)
+    public QueryMetaData setQuery(String query)
     {
         this.query = query;
+        return this;
     }
 
     public String getResultClass()
@@ -143,9 +148,10 @@
         return resultClass;
     }
 
-    public void setResultClass(String resultClass)
+    public QueryMetaData setResultClass(String resultClass)
     {
         this.resultClass = (StringUtils.isWhitespace(resultClass) ? null : resultClass);
+        return this;
     }
 
     public String getResultMetaDataName()
@@ -153,9 +159,10 @@
         return resultMetaDataName;
     }
 
-    public void setResultMetaDataName(String mdName)
+    public QueryMetaData setResultMetaDataName(String mdName)
     {
         this.resultMetaDataName = (StringUtils.isWhitespace(mdName) ? null : mdName);
+        return this;
     }
 
     public boolean isUnique()
@@ -163,17 +170,19 @@
         return unique;
     }
 
-    public void setUnique(boolean unique)
+    public QueryMetaData setUnique(boolean unique)
     {
         this.unique = unique;
+        return this;
     }
 
-    public void setUnique(String unique)
+    public QueryMetaData setUnique(String unique)
     {
         if (!StringUtils.isWhitespace(unique))
         {
             this.unique = Boolean.parseBoolean(unique);
         }
+        return this;
     }
 
     public String getFetchPlanName()
@@ -181,9 +190,10 @@
         return fetchPlanName;
     }
 
-    public void setFetchPlanName(String fpName)
+    public QueryMetaData setFetchPlanName(String fpName)
     {
         this.fetchPlanName = (StringUtils.isWhitespace(fpName) ? null : fpName);
+        return this;
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java	2008-12-13 20:41:07 UTC (rev 4271)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/SequenceMetaData.java	2008-12-13 20:56:57 UTC (rev 4272)
@@ -60,7 +60,7 @@
 
     /**
      * Convenience accessor for the fully-qualified name of the sequence.
-     * @return Fully qualfiied name of the sequence (including the package name).
+     * @return Fully-qualified name of the sequence (including the package name).
      */
     public String getFullyQualifiedName()
     {
@@ -73,9 +73,10 @@
         return name;
     }
 
-    public void setName(String name)
+    public SequenceMetaData setName(String name)
     {
         this.name = (StringUtils.isWhitespace(name) ? this.name : name);
+        return this;
     }
 
     public SequenceStrategy getStrategy()
@@ -83,9 +84,10 @@
         return strategy;
     }
 
-    public void setStrategy(SequenceStrategy strategy)
+    public SequenceMetaData setStrategy(SequenceStrategy strategy)
     {
         this.strategy = strategy;
+        return this;
     }
 
     public String getDatastoreSequence()
@@ -93,9 +95,10 @@
         return datastoreSequence;
     }
 
-    public void setDatastoreSequence(String datastoreSequence)
+    public SequenceMetaData setDatastoreSequence(String datastoreSequence)
     {
         this.datastoreSequence = (StringUtils.isWhitespace(datastoreSequence) ? null : datastoreSequence);
+        return this;
     }
 
     public String getFactoryClass()
@@ -103,9 +106,10 @@
         return factoryClass;
     }
 
-    public void setFactoryClass(String factoryClass)
+    public SequenceMetaData setFactoryClass(String factoryClass)
     {
         this.factoryClass = (StringUtils.isWhitespace(factoryClass) ? null : factoryClass);
+        return this;
     }
 
     public long getInitialValue()
@@ -113,12 +117,13 @@
         return initialValue;
     }
 
-    public void setInitialValue(long initialValue)
+    public SequenceMetaData setInitialValue(long initialValue)
     {
         this.initialValue = initialValue;
+        return this;
     }
 
-    public void setInitialValue(String initialValue)
+    public SequenceMetaData setInitialValue(String initialValue)
     {
         if (!StringUtils.isWhitespace(initialValue))
         {
@@ -130,6 +135,7 @@
             {
             }
         }
+        return this;
     }
 
     public long getAllocationSize()
@@ -137,12 +143,13 @@
         return allocationSize;
     }
 
-    public void setAllocationSize(long allocationSize)
+    public SequenceMetaData setAllocationSize(long allocationSize)
     {
         this.allocationSize = allocationSize;
+        return this;
     }
 
-    public void setAllocationSize(String allocationSize)
+    public SequenceMetaData setAllocationSize(String allocationSize)
     {
         if (!StringUtils.isWhitespace(allocationSize))
         {
@@ -154,6 +161,7 @@
             {
             }
         }
+        return this;
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-12-13 20:41:07 UTC (rev 4271)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2008-12-13 20:56:57 UTC (rev 4272)
@@ -60,17 +60,19 @@
         return deferred;
     }
 
-    public void setDeferred(boolean deferred)
+    public UniqueMetaData setDeferred(boolean deferred)
     {
         this.deferred = deferred;
+        return this;
     }
 
-    public void setDeferred(String deferred)
+    public UniqueMetaData setDeferred(String deferred)
     {
         if (!StringUtils.isWhitespace(deferred))
         {
             this.deferred = Boolean.parseBoolean(deferred);
         }
+        return this;
     }
 
     // -------------------------------- Utilities ------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4278
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4278&view=rev
Author:   andy_jefferson
Date:     2008-12-14 11:04:02 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
[NUCCORE-156] more setter return changes

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-12-14 11:01:38 UTC (rev 4277)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2008-12-14 11:04:02 UTC (rev 4278)
@@ -132,17 +132,19 @@
         return deferred;
     }
 
-    public void setDeferred(boolean deferred)
+    public ForeignKeyMetaData setDeferred(boolean deferred)
     {
         this.deferred = deferred;
+        return this;
     }
 
-    public void setDeferred(String deferred)
+    public ForeignKeyMetaData setDeferred(String deferred)
     {
         if (!StringUtils.isWhitespace(deferred))
         {
             this.deferred = Boolean.parseBoolean(deferred);
         }
+        return this;
     }
 
     public final ForeignKeyAction getDeleteAction()
@@ -160,17 +162,19 @@
         return unique;
     }
 
-    public void setUnique(boolean unique)
+    public ForeignKeyMetaData setUnique(boolean unique)
     {
         this.unique = unique;
+        return this;
     }
 
-    public void setUnique(String unique)
+    public ForeignKeyMetaData setUnique(String unique)
     {
         if (!StringUtils.isWhitespace(unique))
         {
             this.deferred = Boolean.parseBoolean(unique);
         }
+        return this;
     }
 
     public final ForeignKeyAction getUpdateAction()
@@ -178,9 +182,10 @@
         return updateAction;
     }
 
-    public void setUpdateAction(ForeignKeyAction updateAction)
+    public ForeignKeyMetaData setUpdateAction(ForeignKeyAction updateAction)
     {
         this.updateAction = updateAction;
+        return this;
     }
 
     // ---------------------------- Utilities ----------------------------------

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-12-14 11:01:38 UTC (rev 4277)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2008-12-14 11:04:02 UTC (rev 4278)
@@ -117,17 +117,19 @@
         return unique;
     }
 
-    public void setUnique(Boolean unique)
+    public IndexMetaData setUnique(Boolean unique)
     {
         this.unique = unique;
+        return this;
     }
 
-    public void setUnique(String unique)
+    public IndexMetaData setUnique(String unique)
     {
         if (!StringUtils.isWhitespace(unique))
         {
             this.unique = Boolean.valueOf(unique);
         }
+        return this;
     }
 
     // -------------------------------- Utilities ------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4291
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4291&view=rev
Author:   andy_jefferson
Date:     2008-12-15 19:51:19 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
[NUCCORE-156] Some changes around populate() of AbstractClassMetaData

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FetchPlanMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-12-15 19:50:53 UTC (rev 4290)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2008-12-15 19:51:19 UTC (rev 4291)
@@ -122,7 +122,7 @@
     protected FetchGroupMetaData[] fetchGroupMetaData;
 
     /** Convenience lookup map of fetch group by the name. */
-    protected Map fetchGroupMetaDataByName;
+    protected Map<String, FetchGroupMetaData> fetchGroupMetaDataByName;
 
     /** Class MetaData for the Persistence-Capable superclass (if any) */
     protected AbstractClassMetaData pcSuperclassMetaData = null;
@@ -131,10 +131,10 @@
     protected boolean metaDataComplete = false;
 
     /** Named queries */
-    protected Collection queries = null;
+    protected Collection<QueryMetaData> queries = null;
 
     /** List of query result MetaData defined for this file. */
-    protected Collection queryResultMetaData = null;
+    protected Collection<QueryResultMetaData> queryResultMetaData = null;
 
     /** JoinMetaData */
     protected JoinMetaData[] joinMetaData;
@@ -152,25 +152,25 @@
     protected List members = new ArrayList();
 
     /** The columns that are present in the datastore yet not mapped to fields in this class. */
-    protected List unmappedColumns = null;
+    protected List<ColumnMetaData> unmappedColumns = null;
 
     // These fields are only used when the MetaData is read by the parser and elements are dynamically added to 
     // the other elements. At initialise() they are cleared and nulled so shouldn't be used internally.
 
     /** List of joins */
-    protected List joins = new ArrayList();
+    protected List<JoinMetaData> joins = new ArrayList();
 
     /** List of foreign-key */
-    protected List foreignKeys = new ArrayList();
+    protected List<ForeignKeyMetaData> foreignKeys = new ArrayList();
 
     /** List of indexes */
-    protected List indexes = new ArrayList();
+    protected List<IndexMetaData> indexes = new ArrayList();
 
     /** List of uniqueConstraints */
-    protected List uniqueConstraints = new ArrayList();
+    protected List<UniqueMetaData> uniqueConstraints = new ArrayList();
 
     /** List of fetch-group */
-    protected List fetchGroups = new ArrayList();
+    protected List<FetchGroupMetaData> fetchGroups = new ArrayList();
 
     // Fields below here are not represented in the output MetaData. They are for use internally in the operation of the system.
     // The majority are for convenience to save iterating through the fields since the fields are fixed once initialised.
@@ -229,26 +229,19 @@
 
     protected boolean implementationOfPersistentDefinition = false;
 
-    // ----------------------------- Constructors ------------------------------
- 
     /**
      * Constructor. Set fields using setters, before populate().
      * @param parent The package to which this class/interface belongs
-     * @param name (Simple) name of class (omits package name)
+     * @param name (Simple) name of class (omitting the package name)
      */
     protected AbstractClassMetaData(final PackageMetaData parent, final String name)
     {
         super(parent);
 
-        if (name == null)
-        {
-            throw new NucleusUserException(LOCALISER.msg("044041","name", getPackageName(), "class"));
-        }
         if (StringUtils.isWhitespace(name))
         {
             throw new InvalidMetaDataException(LOCALISER, "044061",parent.name);
         }
-
         this.name = name;
         this.fullName = ClassUtils.createFullClassName(parent.name, name);
     }
@@ -450,7 +443,7 @@
 
     /**
      * Method to check whether the Meta-Data has been initialised.
-     * @throws JDOFatalInternalException Thrown if the Meta-Data hasn't been initialised. 
+     * @throws NucleusException Thrown if the Meta-Data hasn't been initialised. 
      **/
     protected void checkInitialised()
     {
@@ -566,8 +559,8 @@
                 ClassUtils.createFullClassName(((PackageMetaData)parent).name, persistenceCapableSuperclass);
         }
 
+        // Find the true superclass name (using reflection)
         String realPcSuperclassName = null;
-
         Collection superclasses = null;
         if (cls.isInterface())
         {
@@ -577,15 +570,16 @@
         {
             superclasses = ClassUtils.getSuperclasses(cls);
         }
-
         if (!superclasses.isEmpty())
         {
             Iterator superclassesIter = superclasses.iterator();
             while (superclassesIter.hasNext())
             {
                 Class superclass = (Class) superclassesIter.next();
-                AbstractClassMetaData superCmd = getMetaDataManager().getMetaDataForClassInternal(superclass, clr);
-                if (superCmd != null && superCmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
+                AbstractClassMetaData superCmd = 
+                    getMetaDataManager().getMetaDataForClassInternal(superclass, clr);
+                if (superCmd != null &&
+                    superCmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
                 {
                     realPcSuperclassName = superclass.getName();
                     break;
@@ -593,13 +587,17 @@
             }
         }
 
-        if (persistenceCapableSuperclass != null && !persistenceCapableSuperclass.equals(realPcSuperclassName))
+        // Validate any specified superclass name
+        if (persistenceCapableSuperclass != null && 
+            !persistenceCapableSuperclass.equals(realPcSuperclassName))
         {
-            // Valifies the defined persistenceCapableSuperclass
+            // Validate the defined superclass
             try
             {
-                AbstractClassMetaData superCmd = getMetaDataManager().getMetaDataForClassInternal(clr.classForName(persistenceCapableSuperclass), clr);
-                if (superCmd == null || superCmd.getPersistenceModifier() != ClassPersistenceModifier.PERSISTENCE_CAPABLE)
+                AbstractClassMetaData superCmd = 
+                    getMetaDataManager().getMetaDataForClassInternal(clr.classForName(persistenceCapableSuperclass), clr);
+                if (superCmd == null || 
+                    superCmd.getPersistenceModifier() != ClassPersistenceModifier.PERSISTENCE_CAPABLE)
                 {
                     throw new InvalidMetaDataException(LOCALISER, "044083", name, persistenceCapableSuperclass);
                 }
@@ -621,7 +619,7 @@
                     persistenceCapableSuperclass);
             }
         }
-        if (persistenceCapableSuperclass == null && realPcSuperclassName != null)
+        else if (persistenceCapableSuperclass == null && realPcSuperclassName != null)
         {
             persistenceCapableSuperclass = realPcSuperclassName;
             if (NucleusLogger.METADATA.isDebugEnabled())
@@ -630,11 +628,20 @@
             }
         }
         validateSuperClass(clr, cls, superclasses);
+
+        if (persistenceCapableSuperclass != null)
+        {
+            // Inherit detachable flag from superclass
+            if (!isDetachable() && pcSuperclassMetaData.isDetachable())
+            {
+                detachable = true;
+            }
+        }
     }
 
     /**
      * Check if the previously determined super class implements PersistenceCapable and has 
-     * reachable MetaData file. The super class MetaData is populated if not yet populated or initilised.
+     * reachable MetaData file. The super class MetaData is populated if not yet populated or initialised.
      * @param clr the ClassLoaderResolver
      * @param cls This class
      * @param superclasses A List of super classes of this class, starting from the least derived super class up to the root class
@@ -661,8 +668,7 @@
                 throw new InvalidMetaDataException(LOCALISER, "044081", name, persistenceCapableSuperclass);
             }
 
-            if (persistenceCapableSuperclass.equals(fullName) ||
-                !(pcsc.isAssignableFrom(cls)))
+            if (persistenceCapableSuperclass.equals(fullName) || !(pcsc.isAssignableFrom(cls)))
             {
                 throw new InvalidMetaDataException(LOCALISER, "044082", name, persistenceCapableSuperclass);
             }
@@ -670,26 +676,25 @@
             // Retrieve the Meta-Data for the superclass
             if (getMetaDataManager() != null)
             {
-                // JPOX normal operation will have a MetaDataManager and so we
-                // can ask that for the MetaData of the superclass.
+                // Normal operation will have a MetaDataManager and so ask that for MetaData of superclass.
                 pcSuperclassMetaData = getMetaDataManager().getMetaDataForClassInternal(pcsc, clr);
                 if (pcSuperclassMetaData == null)
                 {
-                    // Superclass isn't persistence capable since no MetaData
-                    // could be found.
+                    // Superclass isn't persistence capable since no MetaData could be found.
                     throw new InvalidMetaDataException(LOCALISER, "044083", name, persistenceCapableSuperclass);
                 }
             }
             else
             {
-                // The enhancer doesn't need MetaDataManager so we just
-                // navigate up to the FileMetaData and find it.
+                // The enhancer doesn't need MetaDataManager so just navigate to FileMetaData and find it.
                 // NOTE : assumes that the class is specified in the same file 
-                String superclass_pkg_name=persistenceCapableSuperclass.substring(0,persistenceCapableSuperclass.lastIndexOf('.'));
+                String superclass_pkg_name = 
+                    persistenceCapableSuperclass.substring(0,persistenceCapableSuperclass.lastIndexOf('.'));
                 PackageMetaData pmd=getPackageMetaData().getFileMetaData().getPackage(superclass_pkg_name);
                 if (pmd != null)
                 {
-                    String superclass_class_name=persistenceCapableSuperclass.substring(persistenceCapableSuperclass.lastIndexOf('.')+1);
+                    String superclass_class_name = 
+                        persistenceCapableSuperclass.substring(persistenceCapableSuperclass.lastIndexOf('.')+1);
                     pcSuperclassMetaData = pmd.getClass(superclass_class_name);
                 }
             }
@@ -697,8 +702,7 @@
             {
                 throw new InvalidMetaDataException(LOCALISER, "044084", name, persistenceCapableSuperclass);
             }
-            if (!pcSuperclassMetaData.isPopulated() &&
-                !pcSuperclassMetaData.isInitialised())
+            if (!pcSuperclassMetaData.isPopulated() && !pcSuperclassMetaData.isInitialised())
             {
                 // Populate the superclass since we will be needing it
                 pcSuperclassMetaData.populate(clr,cls.getClassLoader());
@@ -715,7 +719,8 @@
                 {
                     Class superclass = (Class)superclassesIter.next();
                     AbstractClassMetaData superCmd = getMetaDataManager().getMetaDataForClassInternal(superclass, clr);
-                    if (superCmd != null && superCmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
+                    if (superCmd != null && 
+                        superCmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
                     {
                         throw new InvalidMetaDataException(LOCALISER, "044091", fullName, superclass.getName());
                     }
@@ -726,7 +731,7 @@
 
     /**
      * Check for conflicts on super class and this class MetaData identity
-     * @throws InvalidMetaDataException if the user tries to overwrite a super class identity / strategy
+     * @throws InvalidMetaDataException if the user tries to overwrite a superclass identity / strategy
      */
     protected void validateUserInputForIdentity()
     {
@@ -745,7 +750,7 @@
             }
         }
     }
-    
+
     /**
      * Convenience accessor for the AbstractClassMetaData of the base object in this hierarchy.
      * @return The AbstractClassMetaData for the base object.
@@ -761,25 +766,8 @@
             return this;
         }
     }
-    
+
     /**
-     * Inherit detach settings from super classes. This class is forced to be detachable if the super classes is.
-     */
-    protected void inheritDetachableSettings()
-    {
-        // "persistence-capable-superclass"
-        // Check that the class can be loaded, and is a true superclass 
-        if (persistenceCapableSuperclass != null)
-        {
-            if (!isDetachable() && pcSuperclassMetaData.isDetachable())
-            {
-                // If the superclass is detachable then we are by definition since we extend
-                detachable = true;
-            }
-        }
-    }
-    
-    /**
      * Inherit the identity definition from super classes. 
      * @throws InvalidMetaDataException if the MetaData of this class conflicts with super classes definition
      */
@@ -1348,19 +1336,6 @@
     }
 
     /**
-     * Check usage of deprecated MetaData
-     * @throws InvalidMetaDataException if deprecated MetaData is used
-     */
-    protected void validateDeprecatedMetaData()
-    {
-        // "use-poid-generator" was used in JPOX 1.0, and 1.1 until beta-2. Now replaced by "value-strategy".
-        if (hasExtension("use-poid-generator"))
-        {
-            throw new InvalidMetaDataException(LOCALISER, "044092", fullName);
-        }
-    }
-    
-    /**
      * Method to return the ClassMetaData records for classes referenced
      * by this object. This adds the entries to orderedCMDs ordered by
      * dependency, and to referencedCMDs for fast lookups.
@@ -1515,7 +1490,7 @@
         {
             return null;
         }
-        return (QueryResultMetaData[])queryResultMetaData.toArray(new QueryResultMetaData[queryResultMetaData.size()]);
+        return queryResultMetaData.toArray(new QueryResultMetaData[queryResultMetaData.size()]);
     }
 
     /**
@@ -1635,7 +1610,7 @@
      */
     public FetchGroupMetaData getFetchGroupMetaData(String groupname)
     {
-        FetchGroupMetaData fgmd = (FetchGroupMetaData) fetchGroupMetaDataByName.get(groupname);
+        FetchGroupMetaData fgmd = fetchGroupMetaDataByName.get(groupname);
         if (fgmd == null && pcSuperclassMetaData != null)
         {
             return pcSuperclassMetaData.getFetchGroupMetaData(groupname);

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2008-12-15 19:50:53 UTC (rev 4290)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2008-12-15 19:51:19 UTC (rev 4291)
@@ -197,23 +197,18 @@
 
             determineSuperClassName(clr, cls);
 
-            inheritDetachableSettings();
-            
             inheritIdentity();
-            
             determineIdentity();
-            
             validateUserInputForIdentity();
-            
+
             addMetaDataForMembersNotInMetaData(cls);
 
             if (objectidClass == null)
             {
                 // No user-defined objectid-class but potentially have SingleFieldIdentity so make sure PK fields are set
-                // Make sure all PK fields (and superclasses) are set before objectid-class
-                populateMemberMetaData(clr, cls, true, primary);
+                populateMemberMetaData(clr, cls, true, primary); // PK fields
                 determineObjectIdClass();
-                populateMemberMetaData(clr, cls, false, primary);
+                populateMemberMetaData(clr, cls, false, primary); // Non-PK fields
             }
             else
             {
@@ -223,11 +218,8 @@
             }
 
             validateUserInputForInheritanceMetaData();
-            
             determineInheritanceMetaData();
 
-            validateDeprecatedMetaData();
-
             validateUnmappedColumns();
 
             // populate the implements
@@ -683,25 +675,25 @@
         joinMetaData = new JoinMetaData[joins.size()];
         for (int i=0; i<joinMetaData.length; i++)
         {
-            joinMetaData[i] = (JoinMetaData) joins.get(i);
+            joinMetaData[i] = joins.get(i);
             joinMetaData[i].initialise();
         }
         indexMetaData = new IndexMetaData[indexes.size()];
         for (int i=0; i<indexMetaData.length; i++)
         {
-            indexMetaData[i] = (IndexMetaData) indexes.get(i);
+            indexMetaData[i] = indexes.get(i);
             indexMetaData[i].initialise();
         }
         foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
         for (int i=0; i<foreignKeyMetaData.length; i++)
         {
-            foreignKeyMetaData[i] = (ForeignKeyMetaData) foreignKeys.get(i);
+            foreignKeyMetaData[i] = foreignKeys.get(i);
             foreignKeyMetaData[i].initialise();
         }
         uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
         for (int i=0; i<uniqueMetaData.length; i++)
         {
-            uniqueMetaData[i] = (UniqueMetaData) uniqueConstraints.get(i);
+            uniqueMetaData[i] = uniqueConstraints.get(i);
             uniqueMetaData[i].initialise();
         }
 
@@ -709,7 +701,7 @@
         fetchGroupMetaDataByName = new HashMap();
         for (int i=0; i<fetchGroupMetaData.length; i++)
         {
-            fetchGroupMetaData[i] = (FetchGroupMetaData) fetchGroups.get(i);
+            fetchGroupMetaData[i] = fetchGroups.get(i);
             fetchGroupMetaData[i].initialise();
             fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
         }         
@@ -974,7 +966,7 @@
         {
             for (int i=0;i<unmappedColumns.size();i++)
             {
-                ColumnMetaData col = (ColumnMetaData)unmappedColumns.get(i);
+                ColumnMetaData col = unmappedColumns.get(i);
                 sb.append(col.toString(prefix + indent, indent));
             }
         }
@@ -982,10 +974,10 @@
         // Add queries
         if (queries != null)
         {
-            Iterator iter = queries.iterator();
+            Iterator<QueryMetaData> iter = queries.iterator();
             while (iter.hasNext())
             {
-                QueryMetaData q = (QueryMetaData)iter.next();
+                QueryMetaData q = iter.next();
                 sb.append(q.toString(prefix + indent,indent));
             }
         }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java	2008-12-15 19:50:53 UTC (rev 4290)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java	2008-12-15 19:51:19 UTC (rev 4291)
@@ -149,12 +149,13 @@
         return postLoad;
     }
 
-    public void setPostLoad(Boolean postLoad)
+    public FetchGroupMetaData setPostLoad(Boolean postLoad)
     {
         this.postLoad = postLoad;
+        return this;
     }
 
-    public void setPostLoad(String postLoad)
+    public FetchGroupMetaData setPostLoad(String postLoad)
     {
         if (!StringUtils.isWhitespace(postLoad))
         {
@@ -167,6 +168,7 @@
                 this.postLoad = Boolean.FALSE;
             }
         }
+        return this;
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FetchPlanMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FetchPlanMetaData.java	2008-12-15 19:50:53 UTC (rev 4290)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FetchPlanMetaData.java	2008-12-15 19:51:19 UTC (rev 4291)
@@ -63,16 +63,17 @@
         return maxFetchDepth;
     }
 
-    public void setMaxFetchDepth(int maxFetchDepth)
+    public FetchPlanMetaData setMaxFetchDepth(int maxFetchDepth)
     {
         this.maxFetchDepth = maxFetchDepth;
+        return this;
     }
 
-    public void setMaxFetchDepth(String maxFetchDepth)
+    public FetchPlanMetaData setMaxFetchDepth(String maxFetchDepth)
     {
         if (StringUtils.isWhitespace(maxFetchDepth))
         {
-            return;
+            return this;
         }
         try
         {
@@ -82,6 +83,7 @@
         catch (NumberFormatException nfe)
         {
         }
+        return this;
     }
 
     public final int getFetchSize()
@@ -89,16 +91,17 @@
         return fetchSize;
     }
 
-    public void setFetchSize(int fetchSize)
+    public FetchPlanMetaData setFetchSize(int fetchSize)
     {
         this.fetchSize = fetchSize;
+        return this;
     }
 
-    public void setFetchSize(String fetchSize)
+    public FetchPlanMetaData setFetchSize(String fetchSize)
     {
         if (StringUtils.isWhitespace(fetchSize))
         {
-            return;
+            return this;
         }
         try
         {
@@ -108,6 +111,7 @@
         catch (NumberFormatException nfe)
         {
         }
+        return this;
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2008-12-15 19:50:53 UTC (rev 4290)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2008-12-15 19:51:19 UTC (rev 4291)
@@ -161,25 +161,25 @@
         joinMetaData = new JoinMetaData[joins.size()];
         for (int i=0; i<joinMetaData.length; i++)
         {
-            joinMetaData[i] = (JoinMetaData) joins.get(i);
+            joinMetaData[i] = joins.get(i);
             joinMetaData[i].initialise();
         }
         indexMetaData = new IndexMetaData[indexes.size()];
         for (int i=0; i<indexMetaData.length; i++)
         {
-            indexMetaData[i] = (IndexMetaData) indexes.get(i);
+            indexMetaData[i] = indexes.get(i);
             indexMetaData[i].initialise();
         }
         foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
         for (int i=0; i<foreignKeyMetaData.length; i++)
         {
-            foreignKeyMetaData[i] = (ForeignKeyMetaData) foreignKeys.get(i);
+            foreignKeyMetaData[i] = foreignKeys.get(i);
             foreignKeyMetaData[i].initialise();
         }
         uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
         for (int i=0; i<uniqueMetaData.length; i++)
         {
-            uniqueMetaData[i] = (UniqueMetaData) uniqueConstraints.get(i);
+            uniqueMetaData[i] = uniqueConstraints.get(i);
             uniqueMetaData[i].initialise();
         }
 
@@ -187,7 +187,7 @@
         fetchGroupMetaDataByName = new HashMap();
         for (int i=0; i<fetchGroupMetaData.length; i++)
         {
-            fetchGroupMetaData[i] = (FetchGroupMetaData) fetchGroups.get(i);
+            fetchGroupMetaData[i] = fetchGroups.get(i);
             fetchGroupMetaData[i].initialise();
             fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
         }         
@@ -297,22 +297,18 @@
 
             determineSuperClassName(clr, cls);
 
-            inheritDetachableSettings();
-            
             inheritIdentity();
-            
             determineIdentity();
-            
             validateUserInputForIdentity();
-            
+
             addMetaDataForMembersNotInMetaData(cls);
 
             if (objectidClass == null)
             {
                 // No user-defined objectid-class but potentially have SingleFieldIdentity so make sure PK fields are set
-                populatePropertyMetaData(clr, cls, true, primary); // Make sure all PK fields (and superclasses) are set before objectid-class
+                populatePropertyMetaData(clr, cls, true, primary); // PK fields
                 determineObjectIdClass();
-                populatePropertyMetaData(clr, cls, false, primary); // Populate non-PK fields
+                populatePropertyMetaData(clr, cls, false, primary); // Non-PK fields
             }
             else
             {
@@ -320,13 +316,10 @@
                 populatePropertyMetaData(clr, cls, false, primary);
                 determineObjectIdClass();
             }
-            
+
             validateUserInputForInheritanceMetaData();
-            
             determineInheritanceMetaData();
 
-            validateDeprecatedMetaData();
-
             setPopulated();
         }
         catch (RuntimeException e)
@@ -544,7 +537,7 @@
         {
             for (int i=0; i<joins.size(); i++)
             {
-                JoinMetaData jmd = (JoinMetaData)joins.get(i);
+                JoinMetaData jmd = joins.get(i);
                 sb.append(jmd.toString(prefix + indent, indent));
             }
         }
@@ -554,7 +547,7 @@
         {
             for (int i=0; i<foreignKeys.size(); i++)
             {
-                ForeignKeyMetaData fkmd = (ForeignKeyMetaData)foreignKeys.get(i);
+                ForeignKeyMetaData fkmd = foreignKeys.get(i);
                 sb.append(fkmd.toString(prefix + indent, indent));
             }
         }
@@ -564,7 +557,7 @@
         {
             for (int i=0; i<indexes.size(); i++)
             {
-                IndexMetaData imd = (IndexMetaData)indexes.get(i);
+                IndexMetaData imd = indexes.get(i);
                 sb.append(imd.toString(prefix + indent, indent));
             }
         }
@@ -574,7 +567,7 @@
         {
             for (int i=0; i<uniqueConstraints.size(); i++)
             {
-                UniqueMetaData unimd = (UniqueMetaData)uniqueConstraints.get(i);
+                UniqueMetaData unimd = uniqueConstraints.get(i);
                 sb.append(unimd.toString(prefix + indent, indent));
             }
         }
@@ -605,7 +598,7 @@
         {
             for (int i=0; i<fetchGroups.size(); i++)
             {
-                FetchGroupMetaData fgmd = (FetchGroupMetaData)fetchGroups.get(i);
+                FetchGroupMetaData fgmd = fetchGroups.get(i);
                 sb.append(fgmd.toString(prefix + indent, indent));
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4726
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4726&view=rev
Author:   andy_jefferson
Date:     2009-01-22 09:57:03 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
toString() mod for loadFetchGroup

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PropertyMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java	2009-01-22 08:08:03 UTC (rev 4725)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java	2009-01-22 09:57:03 UTC (rev 4726)
@@ -126,7 +126,7 @@
             }
             sb.append("\"");
         }
-        if (loadFetchGroup != null)
+        if (!StringUtils.isWhitespace(loadFetchGroup))
         {
             sb.append("\n").append(prefix).append("       load-fetch-group=\"" + loadFetchGroup + "\"");
         }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PropertyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PropertyMetaData.java	2009-01-22 08:08:03 UTC (rev 4725)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PropertyMetaData.java	2009-01-22 09:57:03 UTC (rev 4726)
@@ -141,7 +141,7 @@
             }
             sb.append("\"");
         }
-        if (loadFetchGroup != null)
+        if (!StringUtils.isWhitespace(loadFetchGroup))
         {
             sb.append("\n").append(prefix).append("       load-fetch-group=\"" + loadFetchGroup + "\"");
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4780
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4780&view=rev
Author:   andy_jefferson
Date:     2009-01-26 09:24:22 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Add convenience setters

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-01-26 09:23:48 UTC (rev 4779)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-01-26 09:24:22 UTC (rev 4780)
@@ -297,18 +297,36 @@
         return this;
     }
 
+    public ArrayMetaData setEmbeddedElement(boolean embedded)
+    {
+        element.setEmbedded(embedded);
+        return this;
+    }
+
     public ArrayMetaData setSerializedElement(String serialized)
     {
         element.setSerialized(serialized);
         return this;
     }
 
+    public ArrayMetaData setSerializedElement(boolean serialized)
+    {
+        element.setSerialized(serialized);
+        return this;
+    }
+
     public ArrayMetaData setDependentElement(String dependent)
     {
         element.setDependent(dependent);
         return this;
     }
 
+    public ArrayMetaData setDependentElement(boolean dependent)
+    {
+        element.setDependent(dependent);
+        return this;
+    }
+
     /**
      * Accessor for all AbstractClassMetaData referenced by this array.
      * @param orderedCMDs List of ordered AbstractClassMetaData objects (added to).

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-01-26 09:23:48 UTC (rev 4779)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-01-26 09:24:22 UTC (rev 4780)
@@ -265,18 +265,36 @@
         return this;
     }
 
+    public CollectionMetaData setEmbeddedElement(boolean embedded)
+    {
+        element.setEmbedded(embedded);
+        return this;
+    }
+
     public CollectionMetaData setSerializedElement(String serialized)
     {
         element.setSerialized(serialized);
         return this;
     }
 
+    public CollectionMetaData setSerializedElement(boolean serialized)
+    {
+        element.setSerialized(serialized);
+        return this;
+    }
+
     public CollectionMetaData setDependentElement(String dependent)
     {
         element.setDependent(dependent);
         return this;
     }
 
+    public CollectionMetaData setDependentElement(boolean dependent)
+    {
+        element.setDependent(dependent);
+        return this;
+    }
+
     // ------------------------------- Utilities -------------------------------
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-01-26 09:23:48 UTC (rev 4779)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-01-26 09:24:22 UTC (rev 4780)
@@ -459,18 +459,36 @@
         return this;
     }
 
+    public MapMetaData setEmbeddedKey(boolean embedded)
+    {
+        key.setEmbedded(embedded);
+        return this;
+    }
+
     public MapMetaData setSerializedKey(String serialized)
     {
         key.setSerialized(serialized);
         return this;
     }
 
+    public MapMetaData setSerializedKey(boolean serialized)
+    {
+        key.setSerialized(serialized);
+        return this;
+    }
+
     public MapMetaData setDependentKey(String dependent)
     {
         key.setDependent(dependent);
         return this;
     }
 
+    public MapMetaData setDependentKey(boolean dependent)
+    {
+        key.setDependent(dependent);
+        return this;
+    }
+
     public MapMetaData setValueType(String type)
     {
         value.setType(type);
@@ -483,18 +501,36 @@
         return this;
     }
 
+    public MapMetaData setEmbeddedValue(boolean embedded)
+    {
+        value.setEmbedded(embedded);
+        return this;
+    }
+
     public MapMetaData setSerializedValue(String serialized)
     {
         value.setSerialized(serialized);
         return this;
     }
 
+    public MapMetaData setSerializedValue(boolean serialized)
+    {
+        value.setSerialized(serialized);
+        return this;
+    }
+
     public MapMetaData setDependentValue(String dependent)
     {
         value.setDependent(dependent);
         return this;
     }
 
+    public MapMetaData setDependentValue(boolean dependent)
+    {
+        value.setDependent(dependent);
+        return this;
+    }
+
     // ----------------------------- Utilities ---------------------------------
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2009-01-26 09:23:48 UTC (rev 4779)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2009-01-26 09:24:22 UTC (rev 4780)
@@ -106,6 +106,11 @@
         return this;
     }
 
+    public String getColumnName()
+    {
+        return columnName;
+    }
+
     /**
      * Add a new ColumnMetaData element
      * @param colmd The ColumnMetaData to add


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4811
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4811&view=rev
Author:   andy_jefferson
Date:     2009-01-27 09:12:55 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
More convenience mutators

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-01-27 08:48:30 UTC (rev 4810)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-01-27 09:12:55 UTC (rev 4811)
@@ -2316,7 +2316,7 @@
      * Method to create a new collection metadata, set it, and return it.
      * @return The collection metadata
      */
-    public CollectionMetaData newCollectionMetadata()
+    public CollectionMetaData newCollectionMetaData()
     {
         CollectionMetaData collmd = new CollectionMetaData();
         setContainer(collmd);
@@ -2327,7 +2327,7 @@
      * Method to create a new array metadata, set it, and return it.
      * @return The array metadata
      */
-    public ArrayMetaData newArrayMetadata()
+    public ArrayMetaData newArrayMetaData()
     {
         ArrayMetaData arrmd = new ArrayMetaData();
         setContainer(arrmd);
@@ -2338,7 +2338,7 @@
      * Method to create a new map metadata, set it, and return it.
      * @return The map metadata
      */
-    public MapMetaData newMapMetadata()
+    public MapMetaData newMapMetaData()
     {
         MapMetaData mapmd = new MapMetaData();
         setContainer(mapmd);
@@ -2356,6 +2356,17 @@
     }
 
     /**
+     * Method to create a new element metadata, set it, and return it.
+     * @return The element metadata
+     */
+    public ElementMetaData newElementMetaData()
+    {
+        ElementMetaData elemmd = new ElementMetaData();
+        setElementMetaData(elemmd);
+        return elemmd;
+    }
+
+    /**
      * Mutator for the key MetaData 
      * @param keyMetaData The keyMetaData to set.
      */
@@ -2366,13 +2377,14 @@
     }
 
     /**
-     * Mutator for the order MetaData 
-     * @param orderMetaData The orderMetaData to set.
+     * Method to create a new key metadata, set it, and return it.
+     * @return The key metadata
      */
-    public final void setOrderMetaData(OrderMetaData orderMetaData)
+    public KeyMetaData newKeyMetaData()
     {
-        this.orderMetaData = orderMetaData;
-        this.orderMetaData.parent = this;
+        KeyMetaData keymd = new KeyMetaData();
+        setKeyMetaData(keymd);
+        return keymd;
     }
 
     /**
@@ -2386,6 +2398,38 @@
     }
 
     /**
+     * Method to create a new value metadata, set it, and return it.
+     * @return The value metadata
+     */
+    public ValueMetaData newValueMetaData()
+    {
+        ValueMetaData valuemd = new ValueMetaData();
+        setValueMetaData(valuemd);
+        return valuemd;
+    }
+
+    /**
+     * Mutator for the order MetaData 
+     * @param orderMetaData The orderMetaData to set.
+     */
+    public final void setOrderMetaData(OrderMetaData orderMetaData)
+    {
+        this.orderMetaData = orderMetaData;
+        this.orderMetaData.parent = this;
+    }
+
+    /**
+     * Method to create a new order metadata, set it, and return it.
+     * @return The order metadata
+     */
+    public OrderMetaData newOrderMetaData()
+    {
+        OrderMetaData ordermd = new OrderMetaData();
+        setOrderMetaData(ordermd);
+        return ordermd;
+    }
+
+    /**
      * Mutator for the embedded MetaData 
      * @param embeddedMetaData The embeddedMetaData to set.
      */
@@ -2396,6 +2440,17 @@
     }
 
     /**
+     * Method to create a new embedded metadata, set it, and return it.
+     * @return The embedded metadata
+     */
+    public EmbeddedMetaData newEmbeddedMetaData()
+    {
+        EmbeddedMetaData embmd = new EmbeddedMetaData();
+        setEmbeddedMetaData(embmd);
+        return embmd;
+    }
+
+    /**
      * Mutator for the foreignKey MetaData 
      * @param foreignKeyMetaData The foreignKeyMetaData to set.
      */
@@ -2406,6 +2461,17 @@
     }
 
     /**
+     * Method to create a new FK metadata, set it, and return it.
+     * @return The FK metadata
+     */
+    public ForeignKeyMetaData newForeignKeyMetaData()
+    {
+        ForeignKeyMetaData fkmd = new ForeignKeyMetaData();
+        setForeignKeyMetaData(fkmd);
+        return fkmd;
+    }
+
+    /**
      * Mutator for the index MetaData 
      * @param indexMetaData The indexMetaData to set.
      */
@@ -2416,6 +2482,17 @@
     }
 
     /**
+     * Method to create a new index metadata, set it, and return it.
+     * @return The index metadata
+     */
+    public IndexMetaData newIndexMetaData()
+    {
+        IndexMetaData idxmd = new IndexMetaData();
+        setIndexMetaData(idxmd);
+        return idxmd;
+    }
+
+    /**
      * Mutator for the unique MetaData 
      * @param uniqueMetaData The uniqueMetaData to set.
      */
@@ -2426,6 +2503,17 @@
     }
 
     /**
+     * Method to create a new unique metadata, set it, and return it.
+     * @return The unique metadata
+     */
+    public UniqueMetaData newUniqueMetaData()
+    {
+        UniqueMetaData unimd = new UniqueMetaData();
+        setUniqueMetaData(unimd);
+        return unimd;
+    }
+
+    /**
      * Mutator for the join MetaData 
      * @param joinMetaData The joinMetaData to set.
      */
@@ -2436,6 +2524,17 @@
     }
 
     /**
+     * Method to create a new join metadata, set it, and return it.
+     * @return The join metadata
+     */
+    public JoinMetaData newJoinMetaData()
+    {
+        JoinMetaData joinmd = new JoinMetaData();
+        setJoinMetaData(joinmd);
+        return joinmd;
+    }
+
+    /**
      * Method to create a new JoinMetaData, set it, and return it.
      * @return The join metadata
      */

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2009-01-27 08:48:30 UTC (rev 4810)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2009-01-27 09:12:55 UTC (rev 4811)
@@ -249,6 +249,17 @@
         colmd.parent = this;
     }
 
+    /**
+     * Method to create a new column metadata, set it, and return it.
+     * @return The column metadata
+     */
+    public ColumnMetaData newColumnMetaData()
+    {
+        ColumnMetaData colmd = new ColumnMetaData();
+        addColumn(colmd);
+        return colmd;
+    }
+
     public final OrderMetaData setIndexed(IndexedValue val)
     {
         this.indexed = val;
@@ -266,7 +277,7 @@
      * Method to create a new index metadata, set it, and return it.
      * @return The index metadata
      */
-    public IndexMetaData newIndexMetadata()
+    public IndexMetaData newIndexMetaData()
     {
         IndexMetaData idxmd = new IndexMetaData();
         setIndexMetaData(idxmd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4824
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4824&view=rev
Author:   andy_jefferson
Date:     2009-01-27 16:38:52 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Update toString() handling for cases where not yet initialised

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-01-27 14:11:15 UTC (rev 4823)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-01-27 16:38:52 UTC (rev 4824)
@@ -960,6 +960,16 @@
                 sb.append(managedMembers[i].toString(prefix + indent,indent));
             }
         }
+        else if (members != null && members.size() > 0)
+        {
+            // Not yet initialised so use input members
+            Iterator iter = members.iterator();
+            while (iter.hasNext())
+            {
+                AbstractMemberMetaData mmd = (AbstractMemberMetaData)iter.next();
+                sb.append(mmd.toString(prefix + indent,indent));
+            }
+        }
 
         // Add unmapped columns
         if (unmappedColumns != null)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java	2009-01-27 14:11:15 UTC (rev 4823)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FieldMetaData.java	2009-01-27 16:38:52 UTC (rev 4824)
@@ -142,6 +142,18 @@
         {
             sb.append("\n").append(prefix).append("       sequence=\"" + sequence + "\"");
         }
+        if (indexMetaData == null && indexed != null)
+        {
+            sb.append("\n").append(prefix).append("       indexed=\"" + indexed.toString() + "\"");
+        }
+        if (uniqueMetaData == null)
+        {
+            sb.append("\n").append(prefix).append("       unique=\"" + uniqueConstraint + "\"");
+        }
+        if (columnMetaData == null && column != null)
+        {
+            sb.append("\n").append(prefix).append("       column=\"" + column + "\"");
+        }
         sb.append(">\n");
 
         // Add field containers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4832
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4832&view=rev
Author:   andy_jefferson
Date:     2009-01-28 11:46:41 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Change addXXX methods to check if already exist and return existing one if already present

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-01-28 11:21:45 UTC (rev 4831)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-01-28 11:46:41 UTC (rev 4832)
@@ -272,45 +272,33 @@
     }
 
     /**
-     * Method to add a package
-     * @param pkg The PackageMetaData to add.
+     * Method to create and return a package metadata for the specified package name.
+     * @param name Name of the package
+     * @return The PackageMetadata
      */
-    protected void addPackage(PackageMetaData pkg)
+    public PackageMetaData newPackageMetadata(String name)
     {
-        if (pkg == null)
-        {
-            return;
-        }
+        PackageMetaData pmd = new PackageMetaData(name);
         if (packages == null)
         {
             packages = new ArrayList();
         }
         else
         {
-            // Check if already exists
+            // Check if already exists and return the current one if so
             Iterator iter = packages.iterator();
             while (iter.hasNext())
             {
-                PackageMetaData p=(PackageMetaData)iter.next();
-                if (pkg.getName().equals(p.getName()))
+                PackageMetaData p = (PackageMetaData)iter.next();
+                if (pmd.getName().equals(p.getName()))
                 {
-                    return;
+                    return p;
                 }
             }
         }
-        packages.add(pkg);
-        pkg.parent = this;
-    }
 
-    /**
-     * Method to create and return a package metadata for the specified package name.
-     * @param name Name of the package
-     * @return The PackageMetadata
-     */
-    public PackageMetaData newPackageMetadata(String name)
-    {
-        PackageMetaData pmd = new PackageMetaData(name);
-        addPackage(pmd);
+        packages.add(pmd);
+        pmd.parent = this;
         return pmd;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java	2009-01-28 11:21:45 UTC (rev 4831)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java	2009-01-28 11:46:41 UTC (rev 4832)
@@ -276,19 +276,35 @@
     /**
      * Method to add a class Meta-Data to the package.
      * @param cmd Meta-Data for the class
+     * @return The class metadata that was added (or already existing)
      */
-    public void addClass(ClassMetaData cmd)
+    public ClassMetaData addClass(ClassMetaData cmd)
     {
         if (cmd == null)
         {
-            return;
+            return null;
         }
         if (classes == null)
         {
             classes = new ArrayList();
         }
+        else
+        {
+            // Check if already exists and return the current one if so
+            Iterator iter = classes.iterator();
+            while (iter.hasNext())
+            {
+                AbstractClassMetaData c = (AbstractClassMetaData)iter.next();
+                if (cmd.getName().equals(c.getName()) && c instanceof ClassMetaData)
+                {
+                    return (ClassMetaData)c;
+                }
+            }
+        }
+
         classes.add(cmd);
         cmd.parent = this;
+        return cmd;
     }
 
     /**
@@ -299,26 +315,41 @@
     public ClassMetaData newClassMetadata(String className)
     {
         ClassMetaData cmd = new ClassMetaData(this, className);
-        addClass(cmd);
-        return cmd;
+        return addClass(cmd);
     }
 
     /**
      * Method to add a interface Meta-Data to the package.
      * @param imd Meta-Data for the interface
+     * @return The interface metadata that was added (or already existing)
      */
-    public void addInterface(InterfaceMetaData imd)
+    public InterfaceMetaData addInterface(InterfaceMetaData imd)
     {
         if (imd == null)
         {
-            return;
+            return null;
         }
         if (interfaces == null)
         {
             interfaces = new ArrayList();
         }
+        else
+        {
+            // Check if already exists and return the current one if so
+            Iterator iter = interfaces.iterator();
+            while (iter.hasNext())
+            {
+                AbstractClassMetaData c = (AbstractClassMetaData)iter.next();
+                if (imd.getName().equals(c.getName()) && c instanceof InterfaceMetaData)
+                {
+                    return (InterfaceMetaData)c;
+                }
+            }
+        }
+
         interfaces.add(imd);
         imd.parent = this;
+        return imd;
     }
 
     /**
@@ -329,8 +360,7 @@
     public InterfaceMetaData newInterfaceMetadata(String intfName)
     {
         InterfaceMetaData imd = new InterfaceMetaData(this, intfName);
-        addInterface(imd);
-        return imd;
+        return addInterface(imd);
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5036
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5036&view=rev
Author:   ebengtso
Date:     2009-02-10 19:05:18 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
[NUCCORE-176] Metadata initialise methods taking the ClassLoaderResolver as argument

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/EmbeddedMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IdentityMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/JoinMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
    platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/VersionMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -1128,7 +1128,7 @@
      * If populate() is going to be used it should be used BEFORE calling this method.
      * Subclasses must overwrite this method and invoke this
      */
-    public abstract void initialise();
+    public abstract void initialise(ClassLoaderResolver clr);
 
     /**
      * Method to initialise all convenience information about member positions and what role

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -20,6 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
+
 /**
  * Abstract representation of an ORM constraint.
  */
@@ -59,7 +61,7 @@
      * Method to initialise the object, creating internal convenience arrays.
      * Initialise all sub-objects.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (isInitialised())
         {
@@ -77,7 +79,7 @@
             for (int i=0; i<memberMetaData.length; i++)
             {
                 memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
-                memberMetaData[i].initialise();
+                memberMetaData[i].initialise(clr);
             }
         }
 
@@ -92,7 +94,7 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = (ColumnMetaData) columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractElementMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -127,7 +127,7 @@
      * Method to initialise the object, creating any convenience arrays needed.
      * Initialises all sub-objects. 
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         // Cater for user specifying column name, or columns
         if (columns.size() == 0 && columnName != null)
@@ -136,7 +136,7 @@
             columnMetaData[0] = new ColumnMetaData();
             columnMetaData[0].setName(columnName);
             columnMetaData[0].parent = this;
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else
         {
@@ -144,7 +144,7 @@
         	for (int i=0; i<columnMetaData.length; i++)
         	{
             	columnMetaData[i] = columns.get(i);
-            	columnMetaData[i].initialise();
+            	columnMetaData[i].initialise(clr);
         	}
         }
 
@@ -160,7 +160,7 @@
         }
         if (indexMetaData != null)
         {
-            indexMetaData.initialise();
+            indexMetaData.initialise(clr);
         }
 
         if (uniqueMetaData == null && unique)
@@ -174,17 +174,17 @@
         }
         if (uniqueMetaData != null)
         {
-            uniqueMetaData.initialise();
+            uniqueMetaData.initialise(clr);
         }
 
         if (foreignKeyMetaData != null)
         {
-            foreignKeyMetaData.initialise();
+            foreignKeyMetaData.initialise(clr);
         }
 
         if (embeddedMetaData != null)
         {
-            embeddedMetaData.initialise();
+            embeddedMetaData.initialise(clr);
         }
 
         setInitialised();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -987,7 +987,7 @@
      * method if you are going to use populate. It creates the internal
      * convenience arrays etc needed for normal operation.
      */
-    public synchronized void initialise()
+    public synchronized void initialise(ClassLoaderResolver clr)
     {
         if (persistenceModifier == FieldPersistenceModifier.NONE)
         {
@@ -1002,7 +1002,7 @@
             columnMetaData[0] = new ColumnMetaData();
             columnMetaData[0].setName(column);
             columnMetaData[0].parent = this;
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else if (columns.size() == 1 && column != null)
         {
@@ -1013,7 +1013,7 @@
             {
                 columnMetaData[0].setName(column);
             }
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else
         {
@@ -1021,34 +1021,34 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 
         // Initialise all sub-objects
         if (container != null)
         {
-            container.initialise();
+            container.initialise(clr);
         }
         if (embeddedMetaData != null)
         {
-            embeddedMetaData.initialise();
+            embeddedMetaData.initialise(clr);
         }
         if (joinMetaData != null)
         {
-            joinMetaData.initialise();
+            joinMetaData.initialise(clr);
         }
         if (elementMetaData != null)
         {
-            elementMetaData.initialise();
+            elementMetaData.initialise(clr);
         }
         if (keyMetaData != null)
         {
-            keyMetaData.initialise();
+            keyMetaData.initialise(clr);
         }
         if (valueMetaData != null)
         {
-            valueMetaData.initialise();
+            valueMetaData.initialise(clr);
         }
 
         // Interpret the "indexed" value to create our IndexMetaData where it wasn't specified that way
@@ -1063,7 +1063,7 @@
         }
         if (indexMetaData != null)
         {
-            indexMetaData.initialise();
+            indexMetaData.initialise(clr);
         }
         if (uniqueMetaData == null && uniqueConstraint)
         {
@@ -1076,16 +1076,16 @@
         }
         if (uniqueMetaData != null)
         {
-            uniqueMetaData.initialise();
+            uniqueMetaData.initialise(clr);
         }
 
         if (foreignKeyMetaData != null)
         {
-            foreignKeyMetaData.initialise();
+            foreignKeyMetaData.initialise(clr);
         }
         if (orderMetaData != null)
         {
-            orderMetaData.initialise();
+            orderMetaData.initialise(clr);
         }
 
         if (hasExtension("cascade-persist"))

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -195,11 +195,11 @@
     }
 
     /**
-     * Accessor for the Element ClassMetaData
-     * @return element ClassMetaData
+     * Initialize the element metadata, if necessary
      */
-    public AbstractClassMetaData getElementClassMetaData()
+    public void initialise(final ClassLoaderResolver clr)
     {
+        super.initialise(clr);
         if (element.classMetaData != null && !element.classMetaData.isInitialised())
         {
             // Do as PrivilegedAction since uses reflection
@@ -208,11 +208,19 @@
             {
                 public Object run()
                 {
-                    element.classMetaData.initialise();
+                    element.classMetaData.initialise(clr);
                     return null;
                 }
             });
         }
+    }
+    
+    /**
+     * Accessor for the Element ClassMetaData
+     * @return element ClassMetaData
+     */
+    public AbstractClassMetaData getElementClassMetaData()
+    {
         return element.classMetaData;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -99,6 +99,8 @@
 
     /** whether the populate method is running **/
     private boolean populating = false;
+    /** whether the initialise method is running **/
+    private boolean initialising = false;
 
     // ----------------------------- Constructors ------------------------------
  
@@ -562,205 +564,213 @@
      * Method to initialise the object, creating internal convenience arrays.
      * Initialises all sub-objects. populate() should be called BEFORE calling this.
      */
-    public synchronized void initialise()
+    public synchronized void initialise(ClassLoaderResolver clr)
     {
-        if (populating)
+        if (populating || initialising)
         {
             return;
         }
-        checkPopulated();
-        if (isInitialised())
+        try
         {
-            return;
-        }
-
-        if (pcSuperclassMetaData != null)
-        {
-            // We need our superclass to be initialised before us because we rely on information there
-            if (!pcSuperclassMetaData.isInitialised())
+            initialising = true;
+            checkPopulated();
+            if (isInitialised())
             {
-                pcSuperclassMetaData.initialise();
+                return;
             }
-        }
 
-        if (NucleusLogger.METADATA.isDebugEnabled())
-        {
-            NucleusLogger.METADATA.debug(LOCALISER.msg("044076",fullName));
-        }
-
-        // Validate the objectid-class
-        // This must be in initialise() since can be dependent on other classes being populated
-        ClassLoaderResolver clr = getMetaDataManager().getOMFContext().getClassLoaderResolver(null);
-        validateObjectIdClass(clr);
-
-        // Count the fields/properties of the relevant category
-        Iterator membersIter = members.iterator();
-        int numManaged = 0;
-        int numOverridden = 0;
-        while (membersIter.hasNext())
-        {
-            AbstractMemberMetaData fmd = (AbstractMemberMetaData)membersIter.next();
-
-            // Initialise the FieldMetaData (and its sub-objects)
-            fmd.initialise();
-            if (fmd.isJdoField())
+            if (pcSuperclassMetaData != null)
             {
-                if (fmd.fieldBelongsToClass())
+                // We need our superclass to be initialised before us because we rely on information there
+                if (!pcSuperclassMetaData.isInitialised())
                 {
-                    numManaged++;
+                    pcSuperclassMetaData.initialise(clr);
                 }
-                else
+            }
+    
+            if (NucleusLogger.METADATA.isDebugEnabled())
+            {
+                NucleusLogger.METADATA.debug(LOCALISER.msg("044076",fullName));
+            }
+    
+            // Validate the objectid-class
+            // This must be in initialise() since can be dependent on other classes being populated
+            //ClassLoaderResolver clr = getMetaDataManager().getOMFContext().getClassLoaderResolver(null);
+            validateObjectIdClass(clr);
+    
+            // Count the fields/properties of the relevant category
+            Iterator membersIter = members.iterator();
+            int numManaged = 0;
+            int numOverridden = 0;
+            while (membersIter.hasNext())
+            {
+                AbstractMemberMetaData fmd = (AbstractMemberMetaData)membersIter.next();
+    
+                // Initialise the FieldMetaData (and its sub-objects)
+                fmd.initialise(clr);
+                if (fmd.isJdoField())
                 {
-                    numOverridden++;
+                    if (fmd.fieldBelongsToClass())
+                    {
+                        numManaged++;
+                    }
+                    else
+                    {
+                        numOverridden++;
+                    }
                 }
             }
-        }
-
-        // Generate the "managed members" list
-        managedMembers = new AbstractMemberMetaData[numManaged];
-        overriddenMembers = new AbstractMemberMetaData[numOverridden];
-
-        membersIter = members.iterator();
-        int field_id = 0;
-        int overridden_field_id = 0;
-        memberPositionsByName = new HashMap();
-        while (membersIter.hasNext())
-        {
-            AbstractMemberMetaData mmd = (AbstractMemberMetaData)membersIter.next();
-            if (mmd.isJdoField())
+    
+            // Generate the "managed members" list
+            managedMembers = new AbstractMemberMetaData[numManaged];
+            overriddenMembers = new AbstractMemberMetaData[numOverridden];
+    
+            membersIter = members.iterator();
+            int field_id = 0;
+            int overridden_field_id = 0;
+            memberPositionsByName = new HashMap();
+            while (membersIter.hasNext())
             {
-                if (mmd.fieldBelongsToClass())
+                AbstractMemberMetaData mmd = (AbstractMemberMetaData)membersIter.next();
+                if (mmd.isJdoField())
                 {
-                    mmd.setFieldId(field_id);
-                    managedMembers[field_id] = mmd;
-                    memberPositionsByName.put(mmd.getName(),new Integer(field_id));
-                    field_id++;
-                }
-                else
-                {
-                    overriddenMembers[overridden_field_id++] = mmd;
-                    AbstractMemberMetaData superFmd = pcSuperclassMetaData.getMemberBeingOverridden(mmd.getName());
-                    if (superFmd != null)
+                    if (mmd.fieldBelongsToClass())
                     {
-                        // Merge in any additional info not specified in the overridden field
-                        if (superFmd.isPrimaryKey())
+                        mmd.setFieldId(field_id);
+                        managedMembers[field_id] = mmd;
+                        memberPositionsByName.put(mmd.getName(),new Integer(field_id));
+                        field_id++;
+                    }
+                    else
+                    {
+                        overriddenMembers[overridden_field_id++] = mmd;
+                        AbstractMemberMetaData superFmd = pcSuperclassMetaData.getMemberBeingOverridden(mmd.getName());
+                        if (superFmd != null)
                         {
-                            mmd.setPrimaryKey(true);
+                            // Merge in any additional info not specified in the overridden field
+                            if (superFmd.isPrimaryKey())
+                            {
+                                mmd.setPrimaryKey(true);
+                            }
                         }
                     }
                 }
             }
-        }
-
-        if (pcSuperclassMetaData != null)
-        {
-            if (!pcSuperclassMetaData.isInitialised())
+    
+            if (pcSuperclassMetaData != null)
             {
-                pcSuperclassMetaData.initialise();
+                if (!pcSuperclassMetaData.isInitialised())
+                {
+                    pcSuperclassMetaData.initialise(clr);
+                }
+                noOfInheritedManagedMembers = pcSuperclassMetaData.getNoOfInheritedManagedMembers() + 
+                    pcSuperclassMetaData.getNoOfManagedMembers();
             }
-            noOfInheritedManagedMembers = pcSuperclassMetaData.getNoOfInheritedManagedMembers() + 
-                pcSuperclassMetaData.getNoOfManagedMembers();
-        }
-
-        // Set up the various convenience arrays of field numbers
-        initialiseMemberPositionInformation();
-
-        // Initialise any sub-objects
-        implementsMetaData = new ImplementsMetaData[implementations.size()];
-        for (int i=0; i<implementations.size(); i++)
-        {
-            implementsMetaData[i] = (ImplementsMetaData) implementations.get(i);
-            implementsMetaData[i].initialise();
-        }
-        joinMetaData = new JoinMetaData[joins.size()];
-        for (int i=0; i<joinMetaData.length; i++)
-        {
-            joinMetaData[i] = joins.get(i);
-            joinMetaData[i].initialise();
-        }
-        indexMetaData = new IndexMetaData[indexes.size()];
-        for (int i=0; i<indexMetaData.length; i++)
-        {
-            indexMetaData[i] = indexes.get(i);
-            indexMetaData[i].initialise();
-        }
-        foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
-        for (int i=0; i<foreignKeyMetaData.length; i++)
-        {
-            foreignKeyMetaData[i] = foreignKeys.get(i);
-            foreignKeyMetaData[i].initialise();
-        }
-        uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
-        for (int i=0; i<uniqueMetaData.length; i++)
-        {
-            uniqueMetaData[i] = uniqueConstraints.get(i);
-            uniqueMetaData[i].initialise();
-        }
-
-        fetchGroupMetaData = new FetchGroupMetaData[fetchGroups.size()];
-        fetchGroupMetaDataByName = new HashMap();
-        for (int i=0; i<fetchGroupMetaData.length; i++)
-        {
-            fetchGroupMetaData[i] = fetchGroups.get(i);
-            fetchGroupMetaData[i].initialise();
-            fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
-        }         
-        
-        // If using datastore id and user hasn't provided the identity element,
-        // add a defaulted one (using the superclass if available)
-        if (identityType == IdentityType.DATASTORE && identityMetaData == null)
-        {
-            if (pcSuperclassMetaData != null)
+    
+            // Set up the various convenience arrays of field numbers
+            initialiseMemberPositionInformation();
+    
+            // Initialise any sub-objects
+            implementsMetaData = new ImplementsMetaData[implementations.size()];
+            for (int i=0; i<implementations.size(); i++)
             {
-                IdentityMetaData superImd = pcSuperclassMetaData.getIdentityMetaData();
-                identityMetaData = new IdentityMetaData();
-                identityMetaData.setColumnName(superImd.getColumnName());
-                identityMetaData.setValueStrategy(superImd.getValueStrategy());
-                identityMetaData.setSequence(superImd.getSequence());
+                implementsMetaData[i] = (ImplementsMetaData) implementations.get(i);
+                implementsMetaData[i].initialise(clr);
             }
-            else
+            joinMetaData = new JoinMetaData[joins.size()];
+            for (int i=0; i<joinMetaData.length; i++)
             {
-                identityMetaData = new IdentityMetaData();
+                joinMetaData[i] = joins.get(i);
+                joinMetaData[i].initialise(clr);
             }
+            indexMetaData = new IndexMetaData[indexes.size()];
+            for (int i=0; i<indexMetaData.length; i++)
+            {
+                indexMetaData[i] = indexes.get(i);
+                indexMetaData[i].initialise(clr);
+            }
+            foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
+            for (int i=0; i<foreignKeyMetaData.length; i++)
+            {
+                foreignKeyMetaData[i] = foreignKeys.get(i);
+                foreignKeyMetaData[i].initialise(clr);
+            }
+            uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
+            for (int i=0; i<uniqueMetaData.length; i++)
+            {
+                uniqueMetaData[i] = uniqueConstraints.get(i);
+                uniqueMetaData[i].initialise(clr);
+            }
+    
+            fetchGroupMetaData = new FetchGroupMetaData[fetchGroups.size()];
+            fetchGroupMetaDataByName = new HashMap();
+            for (int i=0; i<fetchGroupMetaData.length; i++)
+            {
+                fetchGroupMetaData[i] = fetchGroups.get(i);
+                fetchGroupMetaData[i].initialise(clr);
+                fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
+            }         
+            
+            // If using datastore id and user hasn't provided the identity element,
+            // add a defaulted one (using the superclass if available)
+            if (identityType == IdentityType.DATASTORE && identityMetaData == null)
+            {
+                if (pcSuperclassMetaData != null)
+                {
+                    IdentityMetaData superImd = pcSuperclassMetaData.getIdentityMetaData();
+                    identityMetaData = new IdentityMetaData();
+                    identityMetaData.setColumnName(superImd.getColumnName());
+                    identityMetaData.setValueStrategy(superImd.getValueStrategy());
+                    identityMetaData.setSequence(superImd.getSequence());
+                }
+                else
+                {
+                    identityMetaData = new IdentityMetaData();
+                }
+            }
+    
+            if (primaryKeyMetaData != null)
+            {
+                primaryKeyMetaData.initialise(clr);
+            }
+            if (versionMetaData != null)
+            {
+                versionMetaData.initialise(clr);
+            }
+            if (identityMetaData != null)
+            {
+                identityMetaData.initialise(clr);
+            }
+            if (inheritanceMetaData != null)
+            {
+                inheritanceMetaData.initialise(clr);
+            }
+    
+            if (identityType == IdentityType.APPLICATION)
+            {
+                usesSingleFieldIdentityClass = 
+                    getMetaDataManager().getApiAdapter().isSingleFieldIdentityClass(getObjectidClass());
+            }
+    
+            // Clear out the collections that we used when loading the MetaData
+            joins.clear();
+            joins = null;
+            fetchGroups.clear();
+            fetchGroups = null;
+            foreignKeys.clear();
+            foreignKeys = null;
+            indexes.clear();
+            indexes = null;
+            uniqueConstraints.clear();
+            uniqueConstraints = null;
+            implementations.clear();
+            implementations = null;
+            setInitialised();
         }
-
-        if (primaryKeyMetaData != null)
+        finally
         {
-            primaryKeyMetaData.initialise();
+            initialising = false;
         }
-        if (versionMetaData != null)
-        {
-            versionMetaData.initialise();
-        }
-        if (identityMetaData != null)
-        {
-            identityMetaData.initialise();
-        }
-        if (inheritanceMetaData != null)
-        {
-            inheritanceMetaData.initialise();
-        }
-
-        if (identityType == IdentityType.APPLICATION)
-        {
-            usesSingleFieldIdentityClass = 
-                getMetaDataManager().getApiAdapter().isSingleFieldIdentityClass(getObjectidClass());
-        }
-
-        // Clear out the collections that we used when loading the MetaData
-        joins.clear();
-        joins = null;
-        fetchGroups.clear();
-        fetchGroups = null;
-        foreignKeys.clear();
-        foreignKeys = null;
-        indexes.clear();
-        indexes = null;
-        uniqueConstraints.clear();
-        uniqueConstraints = null;
-        implementations.clear();
-        implementations = null;
-        setInitialised();
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -177,11 +177,11 @@
     }
 
     /**
-     * Accessor for the Element ClassMetaData
-     * @return element ClassMetaData
+     * Initialize the element metadata, if necessary
      */
-    public AbstractClassMetaData getElementClassMetaData()
+    public void initialise(final ClassLoaderResolver clr)
     {
+        super.initialise(clr);
         if (element.classMetaData != null && !element.classMetaData.isInitialised())
         {
             // Do as PrivilegedAction since uses reflection
@@ -190,11 +190,19 @@
             {
                 public Object run()
                 {
-                    element.classMetaData.initialise();
+                    element.classMetaData.initialise(clr);
                     return null;
                 }
             });
         }
+    }
+
+    /**
+     * Accessor for the Element ClassMetaData
+     * @return element ClassMetaData
+     */
+    public AbstractClassMetaData getElementClassMetaData()
+    {
         return element.classMetaData;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/DiscriminatorMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -19,6 +19,7 @@
 **********************************************************************/
 package org.datanucleus.metadata;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
 
@@ -77,7 +78,7 @@
      * method if you are going to use populate. It creates the internal
      * convenience arrays etc needed for normal operation.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (value != null && strategy == null)
         {
@@ -108,7 +109,7 @@
         }
         if (indexMetaData != null)
         {
-            indexMetaData.initialise();
+            indexMetaData.initialise(clr);
         }
 
         if (columnMetaData == null && columnName != null)
@@ -116,7 +117,7 @@
             columnMetaData = new ColumnMetaData();
             columnMetaData.setName(columnName);
             columnMetaData.parent = this;
-            columnMetaData.initialise();
+            columnMetaData.initialise(clr);
         }
 
         setInitialised();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/EmbeddedMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/EmbeddedMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/EmbeddedMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -347,13 +347,13 @@
      * Method to initialise the object, creating all internal convenience
      * arrays.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         fieldMetaData = new AbstractMemberMetaData[members.size()];
         for (int i=0; i<fieldMetaData.length; i++)
         {
             fieldMetaData[i] = (AbstractMemberMetaData) members.get(i);
-            fieldMetaData[i].initialise();
+            fieldMetaData[i].initialise(clr);
         }
 
         setInitialised();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FetchGroupMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.util.StringUtils;
 
 /**
@@ -93,7 +94,7 @@
      * method if you are going to use populate. It creates the internal
      * convenience arrays etc needed for normal operation.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (this.postLoad == null)
         {
@@ -127,10 +128,10 @@
         }
         for (int i=0; i<fetchGroupMetaData.length; i++)
         {
-            fetchGroupMetaData[i].initialise();
+            fetchGroupMetaData[i].initialise(clr);
         }
 
-        super.initialise();
+        super.initialise(clr);
 
         // Clear out parsing data
         fetchGroups.clear();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IdentityMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IdentityMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IdentityMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.util.StringUtils;
 
 /**
@@ -63,7 +64,7 @@
     /**
      * Method to initialise all internal convenience arrays needed.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (strategy == null)
         {
@@ -84,7 +85,7 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InheritanceMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -18,6 +18,8 @@
 **********************************************************************/
 package org.datanucleus.metadata;
 
+import org.datanucleus.ClassLoaderResolver;
+
 /**
  * Representation of the Meta-Data defining inherited classes.
  */
@@ -46,15 +48,15 @@
      * Method to initialise the object, creating internal convenience arrays.
      * Initialises all sub-objects.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (joinMetaData != null)
         {
-            joinMetaData.initialise();
+            joinMetaData.initialise(clr);
         }
         if (discriminatorMetaData != null)
         {
-            discriminatorMetaData.initialise();
+            discriminatorMetaData.initialise(clr);
         }
 
         setInitialised();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -64,7 +64,7 @@
      * Initialises all sub-objects. If populate() is going to be used it should
      * be used BEFORE calling this method.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (populating)
         {
@@ -81,7 +81,7 @@
             // We need our superclass to be initialised before us because we rely on information there
             if (!pcSuperclassMetaData.isInitialised())
             {
-                pcSuperclassMetaData.initialise();
+                pcSuperclassMetaData.initialise(clr);
             }
         }
 
@@ -92,7 +92,6 @@
 
         // Validate the objectid-class
         // This must be in initialise() since can be dependent on other classes being populated
-        ClassLoaderResolver clr = getMetaDataManager().getOMFContext().getClassLoaderResolver(null);
         validateObjectIdClass(clr);
 
         // Count the fields of the relevant category
@@ -104,7 +103,7 @@
             AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
 
             // Initialise the AbstractMemberMetaData (and its sub-objects)
-            fmd.initialise();
+            fmd.initialise(clr);
             if (fmd.isJdoField())
             {
                 if (fmd.fieldBelongsToClass())
@@ -150,7 +149,7 @@
         {
             if (!pcSuperclassMetaData.isInitialised())
             {
-                pcSuperclassMetaData.initialise();
+                pcSuperclassMetaData.initialise(clr);
             }
             noOfInheritedManagedMembers = pcSuperclassMetaData.getNoOfInheritedManagedMembers() + pcSuperclassMetaData.getNoOfManagedMembers();
         }
@@ -162,25 +161,25 @@
         for (int i=0; i<joinMetaData.length; i++)
         {
             joinMetaData[i] = joins.get(i);
-            joinMetaData[i].initialise();
+            joinMetaData[i].initialise(clr);
         }
         indexMetaData = new IndexMetaData[indexes.size()];
         for (int i=0; i<indexMetaData.length; i++)
         {
             indexMetaData[i] = indexes.get(i);
-            indexMetaData[i].initialise();
+            indexMetaData[i].initialise(clr);
         }
         foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
         for (int i=0; i<foreignKeyMetaData.length; i++)
         {
             foreignKeyMetaData[i] = foreignKeys.get(i);
-            foreignKeyMetaData[i].initialise();
+            foreignKeyMetaData[i].initialise(clr);
         }
         uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
         for (int i=0; i<uniqueMetaData.length; i++)
         {
             uniqueMetaData[i] = uniqueConstraints.get(i);
-            uniqueMetaData[i].initialise();
+            uniqueMetaData[i].initialise(clr);
         }
 
         fetchGroupMetaData = new FetchGroupMetaData[fetchGroups.size()];
@@ -188,7 +187,7 @@
         for (int i=0; i<fetchGroupMetaData.length; i++)
         {
             fetchGroupMetaData[i] = fetchGroups.get(i);
-            fetchGroupMetaData[i].initialise();
+            fetchGroupMetaData[i].initialise(clr);
             fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
         }         
         
@@ -212,15 +211,15 @@
 
         if (versionMetaData != null)
         {
-            versionMetaData.initialise();
+            versionMetaData.initialise(clr);
         }
         if (identityMetaData != null)
         {
-            identityMetaData.initialise();
+            identityMetaData.initialise(clr);
         }
         if (inheritanceMetaData != null)
         {
-            inheritanceMetaData.initialise();
+            inheritanceMetaData.initialise(clr);
         }
 
         if (identityType == IdentityType.APPLICATION)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/JoinMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/JoinMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/JoinMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.util.StringUtils;
 
 /**
@@ -114,7 +115,7 @@
      * Method to initialise the object, creating internal convenience arrays.
      * Initialises all sub-objects.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (table != null && parent instanceof AbstractMemberMetaData)
         {
@@ -131,7 +132,7 @@
             columnMetaData[0] = new ColumnMetaData();
             columnMetaData[0].setName(columnName);
             columnMetaData[0].parent = this;
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else
         {
@@ -139,13 +140,13 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 
         if (foreignKeyMetaData != null)
         {
-            foreignKeyMetaData.initialise();
+            foreignKeyMetaData.initialise(clr);
         }
 
         // Interpret the "indexed" value to create our IndexMetaData where it wasn't specified that way
@@ -160,7 +161,7 @@
         }
         if (indexMetaData != null)
         {
-            indexMetaData.initialise();
+            indexMetaData.initialise(clr);
         }
 
         if (uniqueMetaData == null && unique)
@@ -174,12 +175,12 @@
         }
         if (uniqueMetaData != null)
         {
-            uniqueMetaData.initialise();
+            uniqueMetaData.initialise(clr);
         }
 
         if (primaryKeyMetaData != null)
         {
-            primaryKeyMetaData.initialise();
+            primaryKeyMetaData.initialise(clr);
         }
 
         setInitialised();

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -292,6 +292,15 @@
      */
     public AbstractClassMetaData getKeyClassMetaData()
     {
+        return key.classMetaData;
+    }
+
+    /**
+     * Initialize the key and values metadata
+     */
+    public void initialise(final ClassLoaderResolver clr)
+    {
+        super.initialise(clr);
         if (key.classMetaData != null && !key.classMetaData.isInitialised())
         {
             // Do as PrivilegedAction since uses reflection
@@ -300,14 +309,26 @@
             {
                 public Object run()
                 {
-                    key.classMetaData.initialise();
+                    key.classMetaData.initialise(clr);
                     return null;
                 }
             });
         }
-        return key.classMetaData;
+        if (value.classMetaData != null && !value.classMetaData.isInitialised())
+        {
+            // Do as PrivilegedAction since uses reflection
+            // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]
+            AccessController.doPrivileged(new PrivilegedAction()
+            {
+                public Object run()
+                {
+                    value.classMetaData.initialise(clr);
+                    return null;
+                }
+            });
+        }
     }
-
+    
     /**
      * Accessor for the value-type tag value.
      * May be comma-separated if several value types are possible.
@@ -324,19 +345,6 @@
      */
     public AbstractClassMetaData getValueClassMetaData()
     {
-        if (value.classMetaData != null && !value.classMetaData.isInitialised())
-        {
-            // Do as PrivilegedAction since uses reflection
-            // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]
-            AccessController.doPrivileged(new PrivilegedAction()
-            {
-                public Object run()
-                {
-                    value.classMetaData.initialise();
-                    return null;
-                }
-            });
-        }
         return value.classMetaData;
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -27,6 +27,7 @@
 import org.datanucleus.ObjectManagerFactoryImpl;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.util.Localiser;
+import org.datanucleus.ClassLoaderResolver;
 
 /**
  * Base class for all MetaData.
@@ -90,7 +91,7 @@
         this.parent = parent;
     }
 
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         setInitialised();
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaDataManager.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -2074,7 +2074,7 @@
         for (int i=0;i<filemd.getNoOfPackages();i++)
         {
             PackageMetaData pmd = filemd.getPackage(i);
-            pmd.initialise();
+            pmd.initialise(clr);
             
             for (int j=0;j<pmd.getNoOfClasses();j++)
             {
@@ -2242,9 +2242,9 @@
     /**
      * Convenience method to initialise the MetaData for the specified class/interface.
      * @param acmd MetaData
-     * @param clr ClassLoader resolver
+     * @param clr ClassLoaderResolver
      */
-    protected void initialiseAbstractClassMetaData(final AbstractClassMetaData acmd, ClassLoaderResolver clr)
+    protected void initialiseAbstractClassMetaData(final AbstractClassMetaData acmd, final ClassLoaderResolver clr)
     {
         if (!acmd.isInitialised())
         {
@@ -2256,7 +2256,7 @@
                 {
                     try
                     {
-                        acmd.initialise();
+                        acmd.initialise(clr);
                     }
                     // Catch and rethrow exception since AccessController.doPriveleged swallows it!
                     catch (NucleusException ne)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/OrderMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.util.StringUtils;
 
@@ -107,7 +108,7 @@
      * Method to initialise the object, creating internal convenience arrays.
      * Initialises all sub-objects.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (hasExtension("list-ordering"))
         {
@@ -127,7 +128,7 @@
             columnMetaData[0] = new ColumnMetaData();
             columnMetaData[0].setName(columnName);
             columnMetaData[0].parent = this;
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else
         {
@@ -135,7 +136,7 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 
@@ -152,7 +153,7 @@
         }
         if (indexMetaData != null)
         {
-            indexMetaData.initialise();
+            indexMetaData.initialise(clr);
         }
 
         if (mappedBy != null)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PackageMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.util.StringUtils;
 
@@ -66,7 +67,7 @@
         }
     }
 
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (this.catalog == null && ((FileMetaData)parent).getCatalog() != null)
         {
@@ -78,7 +79,7 @@
             // Nothing specified for this package, but file has a value
             this.schema = ((FileMetaData)parent).getSchema();
         }
-        super.initialise();
+        super.initialise(clr);
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PrimaryKeyMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.util.StringUtils;
 
 /**
@@ -61,7 +62,7 @@
      * method if you are going to use populate. It creates the internal
      * convenience arrays etc needed for normal operation.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         // Set up the columnMetaData
         if (columns.size() == 0 && columnName != null)
@@ -70,7 +71,7 @@
             columnMetaData[0] = new ColumnMetaData();
             columnMetaData[0].setName(columnName);
             columnMetaData[0].parent = this;
-            columnMetaData[0].initialise();
+            columnMetaData[0].initialise(clr);
         }
         else
         {
@@ -78,7 +79,7 @@
             for (int i=0; i<columnMetaData.length; i++)
             {
                 columnMetaData[i] = (ColumnMetaData) columns.get(i);
-                columnMetaData[i].initialise();
+                columnMetaData[i].initialise(clr);
             }
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/VersionMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/VersionMetaData.java	2009-02-10 19:03:58 UTC (rev 5035)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/VersionMetaData.java	2009-02-10 19:05:18 UTC (rev 5036)
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.util.StringUtils;
 
@@ -87,7 +88,7 @@
      * method if you are going to use populate. It creates the internal
      * convenience arrays etc needed for normal operation.
      */
-    public void initialise()
+    public void initialise(ClassLoaderResolver clr)
     {
         if (hasExtension("field-name"))
         {
@@ -115,7 +116,7 @@
             }
             if (indexMetaData != null)
             {
-                indexMetaData.initialise();
+                indexMetaData.initialise(clr);
             }
 
             // Cater for user specifying column name, or columns
@@ -132,7 +133,7 @@
                 for (int i=0; i<columnMetaData.length; i++)
                 {
                     columnMetaData[i] = columns.get(i);
-                    columnMetaData[i].initialise();
+                    columnMetaData[i].initialise(clr);
                 }
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5056
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5056&view=rev
Author:   andy_jefferson
Date:     2009-02-11 13:45:48 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
Fix metadata initialisation for JDO TCK, caused by code for NUCCORE-176 not being run with those tests

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -229,6 +229,12 @@
 
     protected boolean implementationOfPersistentDefinition = false;
 
+    /** whether the populate method is running **/
+    boolean populating = false;
+
+    /** whether the initialise method is running **/
+    boolean initialising = false;
+
     /**
      * Constructor. Set fields using setters, before populate().
      * @param parent The package to which this class/interface belongs

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ArrayMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -128,7 +128,7 @@
                 !api.isPersistable(getMemberMetaData().getType().getComponentType()) &&
                 getMetaDataManager().supportsORM())
             {
-                // JPOX only supports persisting particular array types as byte-streams (non-Java-serialised)
+                // We only support persisting particular array types as byte-streams (non-Java-serialised)
                 String arrayComponentType = getMemberMetaData().getType().getComponentType().getName();
                 if (!arrayComponentType.equals(ClassNameConstants.BOOLEAN) &&
                     !arrayComponentType.equals(ClassNameConstants.BYTE) &&
@@ -185,22 +185,12 @@
     }
 
     /**
-     * Accessor for the element implementation types (when element is a reference type).
-     * The return can contain comma-separated values.
-     * @return element implementation types
-     */
-    public String getElementType()
-    {
-        return element.type;
-    }
-
-    /**
      * Initialize the element metadata, if necessary
      */
     public void initialise(final ClassLoaderResolver clr)
     {
         super.initialise(clr);
-        if (element.classMetaData != null && !element.classMetaData.isInitialised())
+        if (element.classMetaData != null && !element.classMetaData.isInitialised() && !element.classMetaData.initialising)
         {
             // Do as PrivilegedAction since uses reflection
             // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]
@@ -216,6 +206,16 @@
     }
     
     /**
+     * Accessor for the element implementation types (when element is a reference type).
+     * The return can contain comma-separated values.
+     * @return element implementation types
+     */
+    public String getElementType()
+    {
+        return element.type;
+    }
+
+    /**
      * Accessor for the Element ClassMetaData
      * @return element ClassMetaData
      */

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -97,11 +97,6 @@
     /** is the persistable class abstract. */
     protected boolean isAbstractPersistenceCapable;
 
-    /** whether the populate method is running **/
-    private boolean populating = false;
-    /** whether the initialise method is running **/
-    private boolean initialising = false;
-
     // ----------------------------- Constructors ------------------------------
  
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/CollectionMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -182,7 +182,7 @@
     public void initialise(final ClassLoaderResolver clr)
     {
         super.initialise(clr);
-        if (element.classMetaData != null && !element.classMetaData.isInitialised())
+        if (element.classMetaData != null && !element.classMetaData.isInitialised() && !element.classMetaData.initialising)
         {
             // Do as PrivilegedAction since uses reflection
             // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -37,17 +37,6 @@
  */
 public class InterfaceMetaData extends AbstractClassMetaData
 {
-    // -------------------------------------------------------------------------
-    // Fields below here are not represented in the output MetaData. They are
-    // for use internally in the operation of the JDO system. The majority are
-    // for convenience to save iterating through the fields since the fields
-    // are fixed once initialised.
- 
-    /** whether the populate method is running **/
-    private boolean populating = false;
-
-    // ----------------------------- Constructors ------------------------------
-
     /**
      * Constructor.
      * Takes the basic string information found in the MetaData file.
@@ -66,179 +55,188 @@
      */
     public void initialise(ClassLoaderResolver clr)
     {
-        if (populating)
+        if (populating || initialising)
         {
             return;
         }
-        checkPopulated();
-        if (isInitialised())
-        {
-            return;
-        }
 
-        if (pcSuperclassMetaData != null)
+        try
         {
-            // We need our superclass to be initialised before us because we rely on information there
-            if (!pcSuperclassMetaData.isInitialised())
+            initialising = true;
+            checkPopulated();
+            if (isInitialised())
             {
-                pcSuperclassMetaData.initialise(clr);
+                return;
             }
-        }
 
-        if (NucleusLogger.METADATA.isDebugEnabled())
-        {
-            NucleusLogger.METADATA.debug(LOCALISER.msg("044076",fullName));
-        }
+            if (pcSuperclassMetaData != null)
+            {
+                // We need our superclass to be initialised before us because we rely on information there
+                if (!pcSuperclassMetaData.isInitialised())
+                {
+                    pcSuperclassMetaData.initialise(clr);
+                }
+            }
 
-        // Validate the objectid-class
-        // This must be in initialise() since can be dependent on other classes being populated
-        validateObjectIdClass(clr);
+            if (NucleusLogger.METADATA.isDebugEnabled())
+            {
+                NucleusLogger.METADATA.debug(LOCALISER.msg("044076",fullName));
+            }
 
-        // Count the fields of the relevant category
-        Iterator fields_iter = members.iterator();
-        int no_of_managed_fields = 0;
-        int no_of_overridden_fields = 0;
-        while (fields_iter.hasNext())
-        {
-            AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
+            // Validate the objectid-class
+            // This must be in initialise() since can be dependent on other classes being populated
+            validateObjectIdClass(clr);
 
-            // Initialise the AbstractMemberMetaData (and its sub-objects)
-            fmd.initialise(clr);
-            if (fmd.isJdoField())
+            // Count the fields of the relevant category
+            Iterator fields_iter = members.iterator();
+            int no_of_managed_fields = 0;
+            int no_of_overridden_fields = 0;
+            while (fields_iter.hasNext())
             {
-                if (fmd.fieldBelongsToClass())
+                AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
+
+                // Initialise the AbstractMemberMetaData (and its sub-objects)
+                fmd.initialise(clr);
+                if (fmd.isJdoField())
                 {
-                    no_of_managed_fields++;
+                    if (fmd.fieldBelongsToClass())
+                    {
+                        no_of_managed_fields++;
+                    }
+                    else
+                    {
+                        no_of_overridden_fields++;
+                    }
                 }
-                else
+            }
+
+            // Generate the "managed fields" list
+            managedMembers = new AbstractMemberMetaData[no_of_managed_fields];
+            overriddenMembers = new AbstractMemberMetaData[no_of_overridden_fields];
+
+            fields_iter = members.iterator();
+            int field_id = 0;
+            int overridden_field_id = 0;
+            memberPositionsByName = new HashMap();
+            while (fields_iter.hasNext())
+            {
+                AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
+
+                if (fmd.isJdoField())
                 {
-                    no_of_overridden_fields++;
+                    if (fmd.fieldBelongsToClass())
+                    {
+                        fmd.setFieldId(field_id);
+                        managedMembers[field_id] = fmd;
+                        memberPositionsByName.put(fmd.getName(),new Integer(field_id));
+                        field_id++;
+                    }
+                    else
+                    {
+                        overriddenMembers[overridden_field_id++] = fmd;
+                    }
                 }
             }
-        }
 
-        // Generate the "managed fields" list
-        managedMembers = new AbstractMemberMetaData[no_of_managed_fields];
-        overriddenMembers = new AbstractMemberMetaData[no_of_overridden_fields];
+            if (pcSuperclassMetaData != null)
+            {
+                if (!pcSuperclassMetaData.isInitialised())
+                {
+                    pcSuperclassMetaData.initialise(clr);
+                }
+                noOfInheritedManagedMembers = pcSuperclassMetaData.getNoOfInheritedManagedMembers() + pcSuperclassMetaData.getNoOfManagedMembers();
+            }
 
-        fields_iter = members.iterator();
-        int field_id = 0;
-        int overridden_field_id = 0;
-        memberPositionsByName = new HashMap();
-        while (fields_iter.hasNext())
-        {
-            AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
+            // Set up the various convenience arrays of field numbers
+            initialiseMemberPositionInformation();
 
-            if (fmd.isJdoField())
+            joinMetaData = new JoinMetaData[joins.size()];
+            for (int i=0; i<joinMetaData.length; i++)
             {
-                if (fmd.fieldBelongsToClass())
+                joinMetaData[i] = joins.get(i);
+                joinMetaData[i].initialise(clr);
+            }
+            indexMetaData = new IndexMetaData[indexes.size()];
+            for (int i=0; i<indexMetaData.length; i++)
+            {
+                indexMetaData[i] = indexes.get(i);
+                indexMetaData[i].initialise(clr);
+            }
+            foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
+            for (int i=0; i<foreignKeyMetaData.length; i++)
+            {
+                foreignKeyMetaData[i] = foreignKeys.get(i);
+                foreignKeyMetaData[i].initialise(clr);
+            }
+            uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
+            for (int i=0; i<uniqueMetaData.length; i++)
+            {
+                uniqueMetaData[i] = uniqueConstraints.get(i);
+                uniqueMetaData[i].initialise(clr);
+            }
+
+            fetchGroupMetaData = new FetchGroupMetaData[fetchGroups.size()];
+            fetchGroupMetaDataByName = new HashMap();
+            for (int i=0; i<fetchGroupMetaData.length; i++)
+            {
+                fetchGroupMetaData[i] = fetchGroups.get(i);
+                fetchGroupMetaData[i].initialise(clr);
+                fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
+            }         
+
+            // If using datastore id and user hasn't provided the identity element,
+            // add a defaulted one (using the superclass if available)
+            if (identityType == IdentityType.DATASTORE && identityMetaData == null)
+            {
+                if (pcSuperclassMetaData != null)
                 {
-                    fmd.setFieldId(field_id);
-                    managedMembers[field_id] = fmd;
-                    memberPositionsByName.put(fmd.getName(),new Integer(field_id));
-                    field_id++;
+                    IdentityMetaData superImd = pcSuperclassMetaData.getIdentityMetaData();
+                    identityMetaData = new IdentityMetaData();
+                    identityMetaData.setColumnName(superImd.getColumnName());
+                    identityMetaData.setValueStrategy(superImd.getValueStrategy());
+                    identityMetaData.setSequence(superImd.getSequence());
                 }
                 else
                 {
-                    overriddenMembers[overridden_field_id++] = fmd;
+                    identityMetaData = new IdentityMetaData();
                 }
             }
-        }
 
-        if (pcSuperclassMetaData != null)
-        {
-            if (!pcSuperclassMetaData.isInitialised())
+            if (versionMetaData != null)
             {
-                pcSuperclassMetaData.initialise(clr);
+                versionMetaData.initialise(clr);
             }
-            noOfInheritedManagedMembers = pcSuperclassMetaData.getNoOfInheritedManagedMembers() + pcSuperclassMetaData.getNoOfManagedMembers();
-        }
-
-        // Set up the various convenience arrays of field numbers
-        initialiseMemberPositionInformation();
-
-        joinMetaData = new JoinMetaData[joins.size()];
-        for (int i=0; i<joinMetaData.length; i++)
-        {
-            joinMetaData[i] = joins.get(i);
-            joinMetaData[i].initialise(clr);
-        }
-        indexMetaData = new IndexMetaData[indexes.size()];
-        for (int i=0; i<indexMetaData.length; i++)
-        {
-            indexMetaData[i] = indexes.get(i);
-            indexMetaData[i].initialise(clr);
-        }
-        foreignKeyMetaData = new ForeignKeyMetaData[foreignKeys.size()];
-        for (int i=0; i<foreignKeyMetaData.length; i++)
-        {
-            foreignKeyMetaData[i] = foreignKeys.get(i);
-            foreignKeyMetaData[i].initialise(clr);
-        }
-        uniqueMetaData = new UniqueMetaData[uniqueConstraints.size()];
-        for (int i=0; i<uniqueMetaData.length; i++)
-        {
-            uniqueMetaData[i] = uniqueConstraints.get(i);
-            uniqueMetaData[i].initialise(clr);
-        }
-
-        fetchGroupMetaData = new FetchGroupMetaData[fetchGroups.size()];
-        fetchGroupMetaDataByName = new HashMap();
-        for (int i=0; i<fetchGroupMetaData.length; i++)
-        {
-            fetchGroupMetaData[i] = fetchGroups.get(i);
-            fetchGroupMetaData[i].initialise(clr);
-            fetchGroupMetaDataByName.put(fetchGroupMetaData[i].getName(), fetchGroupMetaData[i]);
-        }         
-        
-        // If using datastore id and user hasn't provided the identity element,
-        // add a defaulted one (using the superclass if available)
-        if (identityType == IdentityType.DATASTORE && identityMetaData == null)
-        {
-            if (pcSuperclassMetaData != null)
+            if (identityMetaData != null)
             {
-                IdentityMetaData superImd = pcSuperclassMetaData.getIdentityMetaData();
-                identityMetaData = new IdentityMetaData();
-                identityMetaData.setColumnName(superImd.getColumnName());
-                identityMetaData.setValueStrategy(superImd.getValueStrategy());
-                identityMetaData.setSequence(superImd.getSequence());
+                identityMetaData.initialise(clr);
             }
-            else
+            if (inheritanceMetaData != null)
             {
-                identityMetaData = new IdentityMetaData();
+                inheritanceMetaData.initialise(clr);
             }
-        }
 
-        if (versionMetaData != null)
-        {
-            versionMetaData.initialise(clr);
+            if (identityType == IdentityType.APPLICATION)
+            {
+                usesSingleFieldIdentityClass = getMetaDataManager().getApiAdapter().isSingleFieldIdentityClass(getObjectidClass());
+            }
+
+            // Clear out the collections that we used when loading the MetaData
+            joins.clear();
+            joins = null;
+            fetchGroups.clear();
+            fetchGroups = null;
+            foreignKeys.clear();
+            foreignKeys = null;
+            indexes.clear();
+            indexes = null;
+            uniqueConstraints.clear();
+            uniqueConstraints = null;
+            setInitialised();
         }
-        if (identityMetaData != null)
+        finally
         {
-            identityMetaData.initialise(clr);
+            initialising = false;
         }
-        if (inheritanceMetaData != null)
-        {
-            inheritanceMetaData.initialise(clr);
-        }
-
-        if (identityType == IdentityType.APPLICATION)
-        {
-            usesSingleFieldIdentityClass = getMetaDataManager().getApiAdapter().isSingleFieldIdentityClass(getObjectidClass());
-        }
-
-        // Clear out the collections that we used when loading the MetaData
-        joins.clear();
-        joins = null;
-        fetchGroups.clear();
-        fetchGroups = null;
-        foreignKeys.clear();
-        foreignKeys = null;
-        indexes.clear();
-        indexes = null;
-        uniqueConstraints.clear();
-        uniqueConstraints = null;
-        setInitialised();
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-02-11 13:17:41 UTC (rev 5055)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MapMetaData.java	2009-02-11 13:45:48 UTC (rev 5056)
@@ -301,7 +301,7 @@
     public void initialise(final ClassLoaderResolver clr)
     {
         super.initialise(clr);
-        if (key.classMetaData != null && !key.classMetaData.isInitialised())
+        if (key.classMetaData != null && !key.classMetaData.isInitialised() && !key.classMetaData.initialising)
         {
             // Do as PrivilegedAction since uses reflection
             // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]
@@ -314,7 +314,7 @@
                 }
             });
         }
-        if (value.classMetaData != null && !value.classMetaData.isInitialised())
+        if (value.classMetaData != null && !value.classMetaData.isInitialised() && !value.classMetaData.initialising)
         {
             // Do as PrivilegedAction since uses reflection
             // [JDOAdapter.isValidPrimaryKeyClass calls reflective methods]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6513
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6513&view=rev
Author:   andy_jefferson
Date:     2009-05-16 11:31:05 +0000 (Sat, 16 May 2009)

Log Message:
-----------
[NUCCORE-294] Apply default value when using value-map and value not specified

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-05-16 10:40:08 UTC (rev 6512)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-05-16 11:31:05 UTC (rev 6513)
@@ -1398,6 +1398,32 @@
         }
     }
 
+    protected void applyDefaultDiscriminatorValueWhenNotSpecified()
+    {
+        if (inheritanceMetaData != null &&
+            inheritanceMetaData.getStrategy() == InheritanceStrategy.SUPERCLASS_TABLE)
+        {
+            AbstractClassMetaData superCmd = getClassManagingTableForClass(this);
+            DiscriminatorMetaData superDismd = superCmd.getInheritanceMetaData().getDiscriminatorMetaData();
+            DiscriminatorMetaData dismd = inheritanceMetaData.getDiscriminatorMetaData();
+            if (superDismd.getStrategy() == DiscriminatorStrategy.VALUE_MAP &&
+                (dismd == null || dismd.getValue() == null))
+            {
+                // Impose the full class name as the discriminator value since not set
+                if (dismd == null)
+                {
+                    dismd = inheritanceMetaData.newDiscriminatorMetadata();
+                }
+                if (NucleusLogger.METADATA.isDebugEnabled())
+                {
+                    NucleusLogger.METADATA.debug("No discriminator value specified for " + getFullClassName() +
+                    " so using fully-qualified class name");
+                }
+                dismd.setValue(getFullClassName());
+            }
+        }
+    }
+
     /**
      * Method to return the ClassMetaData records for classes referenced
      * by this object. This adds the entries to orderedCMDs ordered by

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-05-16 10:40:08 UTC (rev 6512)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-05-16 11:31:05 UTC (rev 6513)
@@ -216,6 +216,7 @@
 
             validateUserInputForInheritanceMetaData();
             determineInheritanceMetaData();
+            applyDefaultDiscriminatorValueWhenNotSpecified();
 
             validateUnmappedColumns();
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-05-16 10:40:08 UTC (rev 6512)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-05-16 11:31:05 UTC (rev 6513)
@@ -316,6 +316,7 @@
 
             validateUserInputForInheritanceMetaData();
             determineInheritanceMetaData();
+            applyDefaultDiscriminatorValueWhenNotSpecified();
 
             setPopulated();
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6658
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6658&view=rev
Author:   andy_jefferson
Date:     2009-06-04 07:30:40 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
some clean up of javadoc, generics, variable naming

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -124,7 +124,7 @@
     /** Convenience lookup map of fetch group by the name. */
     protected Map<String, FetchGroupMetaData> fetchGroupMetaDataByName;
 
-    /** Class MetaData for the Persistence-Capable superclass (if any) */
+    /** Class MetaData for the persistable superclass (if any) */
     protected AbstractClassMetaData pcSuperclassMetaData = null;
 
     /** Flag for whether the MetaData here is complete without annotations. Used by JPA. */
@@ -1171,8 +1171,8 @@
         int scm_field_count=0;
         for (int i=0;i<memberCount;i++)
         {
-            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (fmd.isPrimaryKey())
+            AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+            if (mmd.isPrimaryKey())
             {
                 pk_field_count++;
             }
@@ -1180,12 +1180,12 @@
             {
                 nonPkMemberFlags[i] = true;
             }
-            if (fmd.isDefaultFetchGroup())
+            if (mmd.isDefaultFetchGroup())
             {
                 dfgMemberFlags[i] = true;
                 dfg_field_count++;
             }
-            if (fmd.calcIsSecondClassMutable())
+            if (mmd.calcIsSecondClassMutable())
             {
                 scoMutableMemberFlags[i] = true;
                 scm_field_count++;
@@ -1203,8 +1203,8 @@
             pkMemberPositions = new int[pk_field_count];
             for (int i=0,pk_num=0;i<memberCount;i++)
             {
-                AbstractMemberMetaData fmd=getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-                if (fmd.isPrimaryKey())
+                AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+                if (mmd.isPrimaryKey())
                 {
                     pkMemberPositions[pk_num++] = i;
                 }
@@ -1219,8 +1219,8 @@
         nonPkMemberPositions = new int[memberCount-pk_field_count];
         for (int i=0,npkf=0;i<memberCount;i++)
         {
-            AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
-            if (!fmd.isPrimaryKey())
+            AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePositionInternal(i);
+            if (!mmd.isPrimaryKey())
             {
                 nonPkMemberPositions[npkf++] = i;
             }
@@ -1471,8 +1471,8 @@
 
             for (int i=0;i<managedMembers.length;i++)
             {
-                AbstractMemberMetaData fmd=managedMembers[i];
-                fmd.getReferencedClassMetaData(orderedCMDs, referencedCMDs, clr);
+                AbstractMemberMetaData mmd = managedMembers[i];
+                mmd.getReferencedClassMetaData(orderedCMDs, referencedCMDs, clr);
             }
 
             // Add on any superclass
@@ -2380,20 +2380,20 @@
             }
             else
             {
-                AbstractMemberMetaData fmd = pcSuperclassMetaData.getMetaDataForManagedMemberAtAbsolutePositionInternal(abs_position);
-                if (fmd != null)
+                AbstractMemberMetaData mmd = pcSuperclassMetaData.getMetaDataForManagedMemberAtAbsolutePositionInternal(abs_position);
+                if (mmd != null)
                 {
                     for (int i=0;i<overriddenMembers.length;i++)
                     {
-                        if (overriddenMembers[i].getName().equals(fmd.getName()) &&
-                            overriddenMembers[i].getClassName().equals(fmd.getClassName()))
+                        if (overriddenMembers[i].getName().equals(mmd.getName()) &&
+                            overriddenMembers[i].getClassName().equals(mmd.getClassName()))
                         {
                             // Return the overriding field if we have one (class and field name is the safest comparison)
                             return overriddenMembers[i];
                         }
                     }
                     
-                    return fmd;
+                    return mmd;
                 }
                 return null;
             }
@@ -2525,8 +2525,8 @@
         int noOfPks = 0;
         while (fields_iter.hasNext())
         {
-            AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
-            if (fmd.isPrimaryKey())
+            AbstractMemberMetaData mmd = (AbstractMemberMetaData)fields_iter.next();
+            if (mmd.isPrimaryKey())
             {
                 noOfPks++;
             }
@@ -2754,9 +2754,9 @@
             int numberNonContainerSCOFields = 0;
             for (int i=0;i<scoMutableMemberPositions.length;i++)
             {
-                AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
-                if (!(java.util.Collection.class.isAssignableFrom(fmd.getType())) &&
-                    !(java.util.Map.class.isAssignableFrom(fmd.getType())))
+                AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
+                if (!(java.util.Collection.class.isAssignableFrom(mmd.getType())) &&
+                    !(java.util.Map.class.isAssignableFrom(mmd.getType())))
                 {
                     numberNonContainerSCOFields++;
                 }
@@ -2766,9 +2766,9 @@
             int nonContNum = 0;
             for (int i=0;i<scoMutableMemberPositions.length;i++)
             {
-                AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
-                if (!(java.util.Collection.class.isAssignableFrom(fmd.getType())) &&
-                    !(java.util.Map.class.isAssignableFrom(fmd.getType())))
+                AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
+                if (!(java.util.Collection.class.isAssignableFrom(mmd.getType())) &&
+                    !(java.util.Map.class.isAssignableFrom(mmd.getType())))
                 {
                     noncontainerMemberPositions[nonContNum++] = scoMutableMemberPositions[i];
                 }
@@ -2795,9 +2795,9 @@
             int numberContainerSCOFields = 0;
             for (int i=0;i<scoMutableMemberPositions.length;i++)
             {
-                AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
-                if (java.util.Collection.class.isAssignableFrom(fmd.getType()) ||
-                    java.util.Map.class.isAssignableFrom(fmd.getType()))
+                AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
+                if (java.util.Collection.class.isAssignableFrom(mmd.getType()) ||
+                    java.util.Map.class.isAssignableFrom(mmd.getType()))
                 {
                     numberContainerSCOFields++;
                 }
@@ -2807,9 +2807,9 @@
             int contNum = 0;
             for (int i=0;i<scoMutableMemberPositions.length;i++)
             {
-                AbstractMemberMetaData fmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
-                if (java.util.Collection.class.isAssignableFrom(fmd.getType()) ||
-                    java.util.Map.class.isAssignableFrom(fmd.getType()))
+                AbstractMemberMetaData mmd = getMetaDataForManagedMemberAtAbsolutePosition(scoMutableMemberPositions[i]);
+                if (java.util.Collection.class.isAssignableFrom(mmd.getType()) ||
+                    java.util.Map.class.isAssignableFrom(mmd.getType()))
                 {
                     containerMemberPositions[contNum++] = scoMutableMemberPositions[i];
                 }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractConstraintMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -45,10 +45,10 @@
     // They are typically cleared at the point of initialise() and not used thereafter.
 
     /** The fields/properties for this constraint. */
-    protected List members = new ArrayList();
+    protected List<AbstractMemberMetaData> members = new ArrayList();
 
     /** The columns for this constraint. */
-    protected List columns = new ArrayList();
+    protected List<ColumnMetaData> columns = new ArrayList();
 
     /**
      * Default constructor. Set fields using setters before populate().
@@ -78,7 +78,7 @@
             memberMetaData = new AbstractMemberMetaData[members.size()];
             for (int i=0; i<memberMetaData.length; i++)
             {
-                memberMetaData[i] = (AbstractMemberMetaData) members.get(i);
+                memberMetaData[i] = members.get(i);
                 memberMetaData[i].initialise(clr);
             }
         }
@@ -93,7 +93,7 @@
             columnMetaData = new ColumnMetaData[columns.size()];
             for (int i=0; i<columnMetaData.length; i++)
             {
-                columnMetaData[i] = (ColumnMetaData) columns.get(i);
+                columnMetaData[i] = columns.get(i);
                 columnMetaData[i].initialise(clr);
             }
         }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -83,7 +83,7 @@
 public class ClassMetaData extends AbstractClassMetaData
 {
     /** List of implements. */
-    protected List implementations = new ArrayList();
+    protected List<ImplementsMetaData> implementations = new ArrayList();
 
     // -------------------------------------------------------------------------
     // Fields below here are not represented in the output MetaData. They are
@@ -97,8 +97,6 @@
     /** is the persistable class abstract. */
     protected boolean isAbstractPersistenceCapable;
 
-    // ----------------------------- Constructors ------------------------------
- 
     /**
      * Constructor.
      * Takes the basic string information found in the MetaData file.
@@ -223,7 +221,7 @@
             // populate the implements
             for (int i=0; i<implementations.size(); i++)
             {
-                ((ImplementsMetaData)implementations.get(i)).populate(clr, primary);
+                implementations.get(i).populate(clr, primary);
             }
 
             if (persistentInterfaceImplNeedingTableFromSuperclass)
@@ -308,11 +306,11 @@
         Collections.sort(members);
         try
         {
-            // check if we have any persistent properties (JPA)
+            // check if we have any persistent properties
             boolean hasProperties = false;
             for (int i=0; i<members.size(); i++)
             {
-                if (((AbstractMemberMetaData)members.get(i)) instanceof PropertyMetaData)
+                if (members.get(i) instanceof PropertyMetaData)
                 {
                     hasProperties = true;
                     break;
@@ -341,8 +339,8 @@
                             // No field/property of this name - add a default PropertyMetaData for this method
                             NucleusLogger.METADATA.debug(LOCALISER.msg("044060",
                                 propertyName, name));
-                            AbstractMemberMetaData fmd = new PropertyMetaData(this, propertyName);
-                            members.add(fmd);
+                            AbstractMemberMetaData mmd = new PropertyMetaData(this, propertyName);
+                            members.add(mmd);
                             Collections.sort(members);
                         }
                         else
@@ -372,9 +370,9 @@
                         if (hasProperties && api.equalsIgnoreCase("JPA"))
                         {
                             // JPA : Class has properties but field not present, so add as transient field (JPA)
-                            AbstractMemberMetaData fmd = new FieldMetaData(this, clsFields[i].getName());
-                            fmd.setNotPersistent();
-                            members.add(fmd);
+                            AbstractMemberMetaData mmd = new FieldMetaData(this, clsFields[i].getName());
+                            mmd.setNotPersistent();
+                            members.add(mmd);
                             Collections.sort(members);
                         }
                         else
@@ -382,8 +380,8 @@
                             // Class has fields but field not present, so add as field
                             NucleusLogger.METADATA.debug(LOCALISER.msg("044060",
                                 clsFields[i].getName(), name));
-                            AbstractMemberMetaData fmd = new FieldMetaData(this, clsFields[i].getName());
-                            members.add(fmd);
+                            AbstractMemberMetaData mmd = new FieldMetaData(this, clsFields[i].getName());
+                            members.add(mmd);
                             Collections.sort(members);
                         }
                     }
@@ -410,55 +408,54 @@
     {
         Collections.sort(members);
         
-        // Populate the FieldMetaData with their real field values
-        // This will populate any containers in these fields also
-        Iterator fields_iter=members.iterator();
-        while (fields_iter.hasNext())
+        // Populate the real field values. This will populate any containers in these members also
+        Iterator memberIter = members.iterator();
+        while (memberIter.hasNext())
         {
-            AbstractMemberMetaData fmd=(AbstractMemberMetaData)fields_iter.next();
-            if (pkMembers == fmd.isPrimaryKey())
+            AbstractMemberMetaData mmd = (AbstractMemberMetaData)memberIter.next();
+            if (pkMembers == mmd.isPrimaryKey())
             {
                 Class fieldCls = cls;
-                if (fmd.className != null && fmd.className.equals("#UNKNOWN"))
+                if (mmd.className != null && mmd.className.equals("#UNKNOWN"))
                 {
-                    // Field is for a superclass but we didnt know which at creation so resolve it
+                    // Field is for a superclass but we didn't know which at creation so resolve it
                     if (pcSuperclassMetaData != null)
                     {
-                        AbstractMemberMetaData superFmd = pcSuperclassMetaData.getMetaDataForMember(fmd.getName());
+                        AbstractMemberMetaData superFmd = pcSuperclassMetaData.getMetaDataForMember(mmd.getName());
                         if (superFmd != null)
                         {
                             // Field is for a superclass so set its "className"
                             if (superFmd.className != null)
                             {
-                                fmd.className = superFmd.className;
+                                mmd.className = superFmd.className;
                             }
                             else
                             {
-                                fmd.className = superFmd.getClassName();
+                                mmd.className = superFmd.getClassName();
                             }
                         }
                     }
                     else
                     {
                         // No superclass so it doenst make sense so assume to be for this class
-                        fmd.className = null;
+                        mmd.className = null;
                     }
                 }
-                if (!fmd.fieldBelongsToClass())
+                if (!mmd.fieldBelongsToClass())
                 {
                     // Field overrides a field in a superclass, so find the class
                     try
                     {
-                        fieldCls = clr.classForName(fmd.getClassName());
+                        fieldCls = clr.classForName(mmd.getClassName());
                     }
                     catch (ClassNotResolvedException cnre)
                     {
                         // Not found at specified location, so try the same package as this class
-                        String fieldClassName = getPackageName() + "." + fmd.getClassName();
+                        String fieldClassName = getPackageName() + "." + mmd.getClassName();
                         try
                         {
                             fieldCls = clr.classForName(fieldClassName);
-                            fmd.setClassName(fieldClassName);
+                            mmd.setClassName(fieldClassName);
                         }
                         catch (ClassNotResolvedException cnre2)
                         {
@@ -469,7 +466,7 @@
                 }
 
                 boolean populated = false;
-                if (fmd instanceof PropertyMetaData)
+                if (mmd instanceof PropertyMetaData)
                 {
                     // User class must have a getter and setter for this property as per Java Beans
                     Method getMethod = null;
@@ -478,7 +475,7 @@
                         // Find the getter
                         // a). Try as a standard form of getter (getXXX)
                         getMethod = fieldCls.getDeclaredMethod(
-                            ClassUtils.getJavaBeanGetterName(fmd.getName(), false));
+                            ClassUtils.getJavaBeanGetterName(mmd.getName(), false));
                     }
                     catch (Exception e)
                     {
@@ -486,24 +483,24 @@
                         {
                             // b). Try as a boolean form of getter (isXXX)
                             getMethod = fieldCls.getDeclaredMethod(
-                                ClassUtils.getJavaBeanGetterName(fmd.getName(), true));
+                                ClassUtils.getJavaBeanGetterName(mmd.getName(), true));
                         }
                         catch (Exception e2)
                         {
                         }
                     }
-                    if (getMethod == null && fmd.getPersistenceModifier() != FieldPersistenceModifier.NONE)
+                    if (getMethod == null && mmd.getPersistenceModifier() != FieldPersistenceModifier.NONE)
                     {
                         // Property is persistent yet no getter!
                         throw new InvalidMetaDataException(LOCALISER,
-                            "044073", fullName, fmd.getName());
+                            "044073", fullName, mmd.getName());
                     }
 
                     Method setMethod = null;
                     try
                     {
                         // Find the setter
-                        String setterName = ClassUtils.getJavaBeanSetterName(fmd.getName());
+                        String setterName = ClassUtils.getJavaBeanSetterName(mmd.getName());
                         Method[] methods = fieldCls.getDeclaredMethods();
                         for (int i=0;i<methods.length;i++)
                         {
@@ -517,16 +514,16 @@
                     catch (Exception e)
                     {
                     }
-                    if (setMethod == null && fmd.getPersistenceModifier() != FieldPersistenceModifier.NONE)
+                    if (setMethod == null && mmd.getPersistenceModifier() != FieldPersistenceModifier.NONE)
                     {
                         // Property is persistent yet no setter!
-                        throw new InvalidMetaDataException(LOCALISER, "044074", fullName, fmd.getName());
+                        throw new InvalidMetaDataException(LOCALISER, "044074", fullName, mmd.getName());
                     }
 
                     // Populate the property using the getter
                     if (getMethod != null)
                     {
-                        fmd.populate(clr, null, getMethod, primary);
+                        mmd.populate(clr, null, getMethod, primary);
                         populated = true;
                     }
                 }
@@ -536,21 +533,21 @@
                     Field cls_field = null;
                     try
                     {
-                        cls_field = fieldCls.getDeclaredField(fmd.getName());
+                        cls_field = fieldCls.getDeclaredField(mmd.getName());
                     }
                     catch (Exception e)
                     {
                     }
                     if (cls_field != null)
                     {
-                        fmd.populate(clr, cls_field, null, primary);
+                        mmd.populate(clr, cls_field, null, primary);
                         populated = true;
                     }
                 }
                 if (!populated)
                 {
                     // MetaData field doesn't exist in the class!
-                    throw new InvalidMetaDataException(LOCALISER, "044071", fullName,fmd.getFullFieldName());
+                    throw new InvalidMetaDataException(LOCALISER, "044071", fullName,mmd.getFullFieldName());
                 }
             }
         }
@@ -600,13 +597,13 @@
             int numOverridden = 0;
             while (membersIter.hasNext())
             {
-                AbstractMemberMetaData fmd = (AbstractMemberMetaData)membersIter.next();
+                AbstractMemberMetaData mmd = (AbstractMemberMetaData)membersIter.next();
     
                 // Initialise the FieldMetaData (and its sub-objects)
-                fmd.initialise(clr);
-                if (fmd.isJdoField())
+                mmd.initialise(clr);
+                if (mmd.isJdoField())
                 {
-                    if (fmd.fieldBelongsToClass())
+                    if (mmd.fieldBelongsToClass())
                     {
                         numManaged++;
                     }
@@ -670,7 +667,7 @@
             implementsMetaData = new ImplementsMetaData[implementations.size()];
             for (int i=0; i<implementations.size(); i++)
             {
-                implementsMetaData[i] = (ImplementsMetaData) implementations.get(i);
+                implementsMetaData[i] = implementations.get(i);
                 implementsMetaData[i].initialise(clr);
             }
             joinMetaData = new JoinMetaData[joins.size()];
@@ -741,13 +738,13 @@
             {
                 inheritanceMetaData.initialise(clr);
             }
-    
+
             if (identityType == IdentityType.APPLICATION)
             {
                 usesSingleFieldIdentityClass = 
                     getMetaDataManager().getApiAdapter().isSingleFieldIdentityClass(getObjectidClass());
             }
-    
+
             // Clear out the collections that we used when loading the MetaData
             joins.clear();
             joins = null;

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -30,6 +30,7 @@
  */
 public class FileMetaData extends MetaData
 {
+    // TODO Remove this, and pass in to populate/initialise as required
     /** Manager for this MetaData object. Used in populate/initialise processes. */
     transient protected MetaDataManager metaDataManager;
 
@@ -55,13 +56,13 @@
     protected Collection<FetchPlanMetaData> fetchPlans = null;
 
     /** List of packages in this file (uses List to retain file positioning) */
-    protected List packages = null;
+    protected List<PackageMetaData> packages = null;
 
     /** List of event listeners defined for this file. */
-    protected List listeners = null;
+    protected List<EventListenerMetaData> listeners = null;
 
     /**
-     * Constructor. Set the fields using setters, before populate().
+     * Constructor.
      */
     public FileMetaData()
     {
@@ -189,7 +190,7 @@
             return null;
         }
 
-        return (PackageMetaData)packages.get(i);
+        return packages.get(i);
     }
 
     /**
@@ -204,10 +205,10 @@
             return null;
         }
 
-        Iterator iter = packages.iterator();
+        Iterator<PackageMetaData> iter = packages.iterator();
         while (iter.hasNext())
         {
-            PackageMetaData p = (PackageMetaData)iter.next();
+            PackageMetaData p = iter.next();
             if (p.name.equals(name))
             {
                 return p;
@@ -286,10 +287,10 @@
         else
         {
             // Check if already exists and return the current one if so
-            Iterator iter = packages.iterator();
+            Iterator<PackageMetaData> iter = packages.iterator();
             while (iter.hasNext())
             {
-                PackageMetaData p = (PackageMetaData)iter.next();
+                PackageMetaData p = iter.next();
                 if (pmd.getName().equals(p.getName()))
                 {
                     return p;
@@ -400,10 +401,10 @@
         // Add packages
         if (packages != null)
         {
-            Iterator iter = packages.iterator();
+            Iterator<PackageMetaData> iter = packages.iterator();
             while (iter.hasNext())
             {
-                sb.append(((PackageMetaData)iter.next()).toString(indent,indent));
+                sb.append(iter.next().toString(indent,indent));
             }
         }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ForeignKeyMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -110,12 +110,12 @@
                 }
                 else
                 {
-                    addMember(new FieldMetaData(this,(AbstractMemberMetaData) fkmd.members.get(i)));
+                    addMember(new FieldMetaData(this, fkmd.members.get(i)));
                 }
             }
             for (int i=0;i<fkmd.columns.size();i++)
             {
-                addColumn(new ColumnMetaData((ColumnMetaData)fkmd.columns.get(i)));
+                addColumn(new ColumnMetaData(fkmd.columns.get(i)));
             }
         }
     }

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/IndexMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -67,7 +67,7 @@
         AbstractMemberMetaData[] apmd = null;
         if (imd.members != null)
         {
-            apmd = (AbstractMemberMetaData[]) imd.members.toArray(new AbstractMemberMetaData[imd.members.size()]);
+            apmd = imd.members.toArray(new AbstractMemberMetaData[imd.members.size()]);
         }
         else
         {
@@ -90,7 +90,7 @@
         ColumnMetaData[] colmd = null;
         if (imd.columns != null)
         {
-            colmd = (ColumnMetaData[]) imd.columns.toArray(new ColumnMetaData[imd.columns.size()]);
+            colmd = imd.columns.toArray(new ColumnMetaData[imd.columns.size()]);
         }
         else
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2009-06-03 16:36:56 UTC (rev 6657)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/UniqueMetaData.java	2009-06-04 07:30:40 UTC (rev 6658)
@@ -40,11 +40,11 @@
         // TODO Change these to copy rather than reference
         for (int i=0;i<umd.members.size();i++)
         {
-            addMember((AbstractMemberMetaData)umd.members.get(i));
+            addMember(umd.members.get(i));
         }
         for (int i=0;i<umd.columns.size();i++)
         {
-            addColumn((ColumnMetaData)umd.columns.get(i));
+            addColumn(umd.columns.get(i));
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7241
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=7241&view=rev
Author:   andy_jefferson
Date:     2009-07-23 14:05:15 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
[NUCCORE-192] Eliminate more usage of MetaDataManager from the metadata model tree

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-07-23 13:58:05 UTC (rev 7240)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-07-23 14:05:15 UTC (rev 7241)
@@ -1165,7 +1165,7 @@
      * Method to initialise all convenience information about member positions and what role
      * each position performs.
      */
-    protected void initialiseMemberPositionInformation()
+    protected void initialiseMemberPositionInformation(MetaDataManager mmgr)
     {
         memberCount = noOfInheritedManagedMembers + managedMembers.length;
         dfgMemberFlags = new boolean[memberCount];
@@ -1191,7 +1191,7 @@
                 dfgMemberFlags[i] = true;
                 dfg_field_count++;
             }
-            if (mmd.calcIsSecondClassMutable())
+            if (mmd.calcIsSecondClassMutable(mmgr))
             {
                 scoMutableMemberFlags[i] = true;
                 scm_field_count++;

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-07-23 13:58:05 UTC (rev 7240)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-07-23 14:05:15 UTC (rev 7241)
@@ -489,7 +489,7 @@
         // Update "persistence-modifier" according to type etc
         if (FieldPersistenceModifier.DEFAULT.equals(persistenceModifier))
         {
-            boolean isPcClass = getType().isArray() ? isFieldArrayTypePersistable() : isFieldTypePersistable(); 
+            boolean isPcClass = getType().isArray() ? isFieldArrayTypePersistable(mmgr) : isFieldTypePersistable(mmgr); 
             if (!isPcClass)
             {
                 if (getType().isArray() && getType().getComponentType().isInterface())
@@ -503,7 +503,7 @@
                 }
             }
 
-            persistenceModifier = getDefaultFieldPersistenceModifier(getType(), modifiers, isPcClass);
+            persistenceModifier = getDefaultFieldPersistenceModifier(getType(), modifiers, isPcClass, mmgr);
         }
 
         // TODO If this field is NONE in superclass, make it NONE here too
@@ -876,7 +876,7 @@
                 getArray().populate(clr, primary, mmgr);
             }
         }
-        if (isFieldTypePersistable() && cascadeDelete)
+        if (isFieldTypePersistable(mmgr) && cascadeDelete)
         {
             setDependent(true);
         }
@@ -962,9 +962,11 @@
      * @param c The class
      * @param modifier The modifiers for the field
      * @param isPCclass Whether it is persistence capable.
+     * @param mmgr MetaData manager
      * @return The default field PersistenceModifier.
      */
-    public final FieldPersistenceModifier getDefaultFieldPersistenceModifier(Class c, int modifier, boolean isPCclass)
+    public final FieldPersistenceModifier getDefaultFieldPersistenceModifier(Class c, int modifier,
+            boolean isPCclass, MetaDataManager mmgr)
     {
         // Static, Transient and Final fields are all not persistent
         if (Modifier.isStatic(modifier) || Modifier.isTransient(modifier) || Modifier.isFinal(modifier))
@@ -983,13 +985,13 @@
         {
             throw new NucleusException("class is null");
         }
-        if (c.isArray() && getMetaDataManager().getOMFContext().getApiAdapter().isPersistable(c.getComponentType()))
+        if (c.isArray() && mmgr.getOMFContext().getApiAdapter().isPersistable(c.getComponentType()))
         {
             // Arrays of PC types are, by default, persistent
             return FieldPersistenceModifier.PERSISTENT;
         }
 
-        if (getMetaDataManager().getOMFContext().getTypeManager().isDefaultPersistent(c))
+        if (mmgr.getOMFContext().getTypeManager().isDefaultPersistent(c))
         {
             return FieldPersistenceModifier.PERSISTENT;
         }
@@ -1148,11 +1150,11 @@
     /**
      * Utility to return if this field is persistable.
      * Not valid for use by the enhancer. Must be overridden for that mode.
+     * @param mmgr MetaData manager
      * @return Whether the field type is persistable.
      */
-    public boolean isFieldTypePersistable()
+    public boolean isFieldTypePersistable(MetaDataManager mmgr)
     {
-        MetaDataManager mmgr = getMetaDataManager();
         if (mmgr.isEnhancing())
         {
             // Enhancing so return if we have MetaData that is persistable
@@ -1170,16 +1172,16 @@
      * Utility to return if this array field has elements that are Persistable.
      * Not valid for use by the enhancer. Must be overridden for that mode.
      * If the field is not an array will return false.
+     * @param mmgr MetaData manager
      * @return Whether the field type is persistable.
      */
-    public boolean isFieldArrayTypePersistable()
+    public boolean isFieldArrayTypePersistable(MetaDataManager mmgr)
     {
         if (!type.isArray())
         {
             return false;
         }
 
-        MetaDataManager mmgr = getMetaDataManager();
         if (mmgr.isEnhancing())
         {
             // Enhancing so return if we have MetaData that is PersistenceCapable
@@ -3028,7 +3030,7 @@
      *  Please note that this data will be cached in {@link AbstractClassMetaData#scoMutableMemberFlags}.
      *  @return wether this field should be a second class mutable field.
      */
-    public boolean calcIsSecondClassMutable()
+    public boolean calcIsSecondClassMutable(MetaDataManager mmgr)
     {
         if (hasExtension("is-second-class"))
         {
@@ -3057,7 +3059,7 @@
             // fall through to default behaviour
         }
 
-        return getMetaDataManager().getOMFContext().getTypeManager().isSecondClassMutableType(getTypeName());
+        return mmgr.getOMFContext().getTypeManager().isSecondClassMutableType(getTypeName());
     }
 
     /**

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-07-23 13:58:05 UTC (rev 7240)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-07-23 14:05:15 UTC (rev 7241)
@@ -668,7 +668,7 @@
             }
     
             // Set up the various convenience arrays of field numbers
-            initialiseMemberPositionInformation();
+            initialiseMemberPositionInformation(mmgr);
     
             // Initialise any sub-objects
             implementsMetaData = new ImplementsMetaData[implementations.size()];

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-07-23 13:58:05 UTC (rev 7240)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2009-07-23 14:05:15 UTC (rev 7241)
@@ -150,7 +150,7 @@
             }
 
             // Set up the various convenience arrays of field numbers
-            initialiseMemberPositionInformation();
+            initialiseMemberPositionInformation(mmgr);
 
             joinMetaData = new JoinMetaData[joins.size()];
             for (int i=0; i<joinMetaData.length; i++)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8066
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8066&view=rev
Author:   andy_jefferson
Date:     2009-11-16 16:23:40 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
[NUCENHANCER-48] Disable exception on multiple PK fields but no objectidClass - detected by enhancer (if enhancer is not generating it for the user)

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-11-16 15:44:25 UTC (rev 8065)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-11-16 16:23:40 UTC (rev 8066)
@@ -537,9 +537,9 @@
                         noOfPkKeys++;
                     }
                 }
-                if (noOfPkKeys == 1)
+                if (noOfPkKeys > 0)
                 {
-                    // 1 PK so we use application-identity (SingleFieldIdentity)
+                    // Use application-identity since there are primary-key field(s) defined
                     identityType = IdentityType.APPLICATION; // SingleFieldIdentity
                 }
                 else
@@ -817,9 +817,9 @@
                 {
                     throw new InvalidMetaDataException(LOCALISER, "044085", name, persistenceCapableSuperclass);
                 }
+
                 // by default users should only specify the object-id class in the root persistent class
-                NucleusLogger.METADATA.warn(LOCALISER.msg("044086",
-                    name, persistenceCapableSuperclass));
+                NucleusLogger.METADATA.warn(LOCALISER.msg("044086", name, persistenceCapableSuperclass));
             }
             else
             {
@@ -988,52 +988,58 @@
                 }
             }
 
-            // Check for more than 1 field
-            if (no_of_pk_fields > 1 || no_of_pk_fields == 0)
+            if (no_of_pk_fields == 0)
             {
                 NucleusLogger.METADATA.error(LOCALISER.msg("044065", fullName, "" + no_of_pk_fields));
                 throw new InvalidMetaDataException(LOCALISER, "044065", fullName, "" + no_of_pk_fields);
             }
-
-            // Assign associated SingleField identity class
-            Class pk_type = fmd_pk.getType();
-            if (Byte.class.isAssignableFrom(pk_type) ||
-                byte.class.isAssignableFrom(pk_type))
+            else if (no_of_pk_fields > 1)
             {
-                objectidClass = api.getSingleFieldIdentityClassNameForByte();
+                // More than 1 PK yet no objectidClass - maybe added by enhancer later, so log warning
+                NucleusLogger.METADATA.warn(LOCALISER.msg("044065", fullName, "" + no_of_pk_fields));
             }
-            else if (Character.class.isAssignableFrom(pk_type) ||
-                     char.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForChar();
-            }
-            else if (Integer.class.isAssignableFrom(pk_type) ||
-                     int.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForInt();
-            }
-            else if (Long.class.isAssignableFrom(pk_type) ||
-                     long.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForLong();
-            }
-            else if (Short.class.isAssignableFrom(pk_type) ||
-                     short.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForShort();
-            }
-            else if (String.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForString();
-            }
-            else if (Object.class.isAssignableFrom(pk_type))
-            {
-                objectidClass = api.getSingleFieldIdentityClassNameForObject();
-            }
             else
             {
-                NucleusLogger.METADATA.error(LOCALISER.msg("044066", fullName, pk_type.getName()));
-                throw new InvalidMetaDataException(LOCALISER, "044066", fullName, pk_type.getName());
+                // Assign associated SingleField identity class
+                Class pk_type = fmd_pk.getType();
+                if (Byte.class.isAssignableFrom(pk_type) ||
+                        byte.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForByte();
+                }
+                else if (Character.class.isAssignableFrom(pk_type) ||
+                        char.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForChar();
+                }
+                else if (Integer.class.isAssignableFrom(pk_type) ||
+                        int.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForInt();
+                }
+                else if (Long.class.isAssignableFrom(pk_type) ||
+                        long.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForLong();
+                }
+                else if (Short.class.isAssignableFrom(pk_type) ||
+                        short.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForShort();
+                }
+                else if (String.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForString();
+                }
+                else if (Object.class.isAssignableFrom(pk_type))
+                {
+                    objectidClass = api.getSingleFieldIdentityClassNameForObject();
+                }
+                else
+                {
+                    NucleusLogger.METADATA.error(LOCALISER.msg("044066", fullName, pk_type.getName()));
+                    throw new InvalidMetaDataException(LOCALISER, "044066", fullName, pk_type.getName());
+                }
             }
             if (NucleusLogger.METADATA.isDebugEnabled())
             {
@@ -1057,44 +1063,66 @@
      */
     protected void validateObjectIdClass(ClassLoaderResolver clr, MetaDataManager mmgr)
     {
-        if (objectidClass != null && getPersistenceCapableSuperclass() == null)
+        if (getPersistenceCapableSuperclass() == null)
         {
-            // Only check least derived persistable class
-            int no_of_pk_fields = getNoOfPopulatedPKMembers();
-            ApiAdapter api = mmgr.getApiAdapter();
-            Class obj_cls = null;
-            try
+            // Only check root persistable class PK
+            if (objectidClass == null && !mmgr.isEnhancing() && getNoOfPrimaryKeyMembers() > 0)
             {
-                // Load the class, using the same class loader resolver as this class
-                obj_cls=clr.classForName(objectidClass);
+                // At runtime and we have PK field(s) defined but no objectidClass so assume it means 
+                // the enhancer-generated PK class
+                NucleusLogger.METADATA.debug("Class " + fullName + " has " + getNoOfPrimaryKeyMembers() + 
+                    " primary-key field(s) yet no objectidClass defined. Assumed to be " + objectidClass);
+                objectidClass = fullName + "$PK";
             }
-            catch (ClassNotResolvedException cnre)
-            {
-                // ObjectIdClass not found
-                throw new InvalidMetaDataException(LOCALISER, "044079", fullName, objectidClass);
-            }
 
-            boolean validated = false;
-            Set errors = new HashSet();
-            try
+            if (objectidClass != null)
             {
-                // Check against the API Adapter in use for this MetaData
-                if (api.isValidPrimaryKeyClass(obj_cls, this, clr, no_of_pk_fields, mmgr))
+                int no_of_pk_fields = getNoOfPopulatedPKMembers();
+                ApiAdapter api = mmgr.getApiAdapter();
+                Class obj_cls = null;
+                try
                 {
-                    validated = true;
+                    // Load the class, using the same class loader resolver as this class
+                    obj_cls=clr.classForName(objectidClass);
                 }
+                catch (ClassNotResolvedException cnre)
+                {
+                    // ObjectIdClass not found
+                    throw new InvalidMetaDataException(LOCALISER, "044079", fullName, objectidClass);
+                }
+
+                boolean validated = false;
+                Set errors = new HashSet();
+                try
+                {
+                    // Check against the API Adapter in use for this MetaData
+                    if (api.isValidPrimaryKeyClass(obj_cls, this, clr, no_of_pk_fields, mmgr))
+                    {
+                        validated = true;
+                    }
+                }
+                catch (NucleusException ex)
+                {
+                    errors.add(ex);
+                }
+                if (!validated)
+                {
+                    // Why is this wrapping all exceptions into 1 single exception? 
+                    // This needs coordinating with the test expectations in the enhancer unit tests.
+                    throw new NucleusUserException(LOCALISER_API.msg("019016", obj_cls.getName()), 
+                        (Throwable[]) errors.toArray(new Throwable[errors.size()]));
+                }
             }
-            catch (NucleusException ex)
+            else if (getNoOfPrimaryKeyMembers() > 0)
             {
-                errors.add(ex);
+                NucleusLogger.METADATA.debug("Class " + fullName + " has " + getNoOfPrimaryKeyMembers() + 
+                    " primary-key field(s) yet no objectidClass defined. Assumed to be " + objectidClass);
+                objectidClass = fullName + "$PK";
+                if (!mmgr.isEnhancing())
+                {
+                    // Generated PK class should exist now so check it
+                }
             }
-            if (!validated)
-            {
-                // Why is this wrapping all exceptions into 1 single exception? 
-                // This needs coordinating with the test expectations in the enhancer unit tests.
-                throw new NucleusUserException(LOCALISER_API.msg("019016", obj_cls.getName()), 
-                    (Throwable[]) errors.toArray(new Throwable[errors.size()]));
-            }
         }
     }
 

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-11-16 15:44:25 UTC (rev 8065)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2009-11-16 16:23:40 UTC (rev 8066)
@@ -570,6 +570,7 @@
         {
             return;
         }
+
         try
         {
             initialising = true;
@@ -592,12 +593,11 @@
             {
                 NucleusLogger.METADATA.debug(LOCALISER.msg("044076",fullName));
             }
-    
+
             // Validate the objectid-class
             // This must be in initialise() since can be dependent on other classes being populated
-            //ClassLoaderResolver clr = getMetaDataManager().getOMFContext().getClassLoaderResolver(null);
             validateObjectIdClass(clr, mmgr);
-    
+
             // Count the fields/properties of the relevant category
             Iterator membersIter = members.iterator();
             int numManaged = 0;
@@ -620,11 +620,11 @@
                     }
                 }
             }
-    
+
             // Generate the "managed members" list
             managedMembers = new AbstractMemberMetaData[numManaged];
             overriddenMembers = new AbstractMemberMetaData[numOverridden];
-    
+
             membersIter = members.iterator();
             int field_id = 0;
             int overridden_field_id = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8153
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8153&view=rev
Author:   ebengtso
Date:     2009-11-23 21:00:12 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
[NUCJPA-46] add validation-mode element handling; modified caching to shared-cache-mode

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/xml/PersistenceFileMetaDataHandler.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java	2009-11-23 20:18:38 UTC (rev 8152)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/PersistenceUnitMetaData.java	2009-11-23 21:00:12 UTC (rev 8153)
@@ -46,6 +46,12 @@
     /** Provider for the persistence unit. */
     String provider = null;
 
+    /** Validation Mode for Bean Validator. */
+    String validationMode = null;
+
+    /** shared cache mode */
+    String sharedCacheMode = null;
+    
     /** JTA data source for the persistence unit. */
     String jtaDataSource = null;
 
@@ -68,7 +74,7 @@
     boolean excludeUnlistedClasses = false;
 
     /** Caching policy for persistable objects. */
-    String caching = "ENABLE_SELECTIVE";
+    String caching = "UNSPECIFIED";
 
     /**
      * Constructor.
@@ -112,7 +118,7 @@
 
     /**
      * Accessor for the persistence unit caching policy.
-     * @return Caching policy
+     * @return Caching policy: ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED.
      */
     public String getCaching()
     {
@@ -121,7 +127,7 @@
 
     /**
      * Mutator for the unit caching policy
-     * @param cache The caching policy
+     * @param cache The caching policy: ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED.
      */
     public void setCaching(String cache)
     {
@@ -201,6 +207,24 @@
     }
 
     /**
+     * Mutator for the validation mode
+     * @param validationMode auto, callback or none
+     */
+    public void setValidationMode(String validationMode)
+    {
+        this.validationMode = validationMode;
+    }
+    
+    /**
+     * Accessor to the Validation Mode
+     * @return auto, callback or none
+     */
+    public String getValidationMode()
+    {
+        return validationMode;
+    }
+
+    /**
      * Method to exclude unlisted classes
      */
     public void setExcludeUnlistedClasses()

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/xml/PersistenceFileMetaDataHandler.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/xml/PersistenceFileMetaDataHandler.java	2009-11-23 20:18:38 UTC (rev 8152)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/xml/PersistenceFileMetaDataHandler.java	2009-11-23 21:00:12 UTC (rev 8153)
@@ -17,8 +17,10 @@
 **********************************************************************/
 package org.datanucleus.metadata.xml;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.EntityResolver;
@@ -71,15 +73,17 @@
         try
         {
             // Some URLs passed to us by ClassLoader.getResources have spaces in the filename so encode
-            // This was reported by Google but no test-case was forthcoming so unreproduceable
-            rootFilename = rootFilename.replace(" ", "%20");
-
-            rootURI = new URI(rootFilename);
+            // URLEncoder.encode=This was reported by Google but no test-case was forthcoming so unreproduceable
+            rootURI = new URI(URLEncoder.encode(rootFilename, "UTF-8"));
         }
         catch (URISyntaxException e)
         {
             NucleusLogger.METADATA.warn("Error deriving persistence-unit root URI from " + rootFilename, e);
         }
+        catch (UnsupportedEncodingException e)
+        {
+            NucleusLogger.METADATA.warn("Error deriving persistence-unit root URI from " + rootFilename, e);
+        }
     }
 
     /**
@@ -151,10 +155,14 @@
             {
                 // Processed elsewhere
             }
-            else if (localName.equals("caching"))
+            else if (localName.equals("shared-cache-mode"))
             {
                 // Processed elsewhere
             }
+            else if (localName.equals("validation-mode"))
+            {
+                // Processed elsewhere
+            }
             else if (localName.equals("exclude-unlisted-classes"))
             {
                 PersistenceUnitMetaData pumd = (PersistenceUnitMetaData)getStack();
@@ -229,10 +237,14 @@
                 // New jar file
                 ((PersistenceUnitMetaData)md).addJarFile(currentString);
             }
-            else if (localName.equals("caching"))
+            else if (localName.equals("shared-cache-mode"))
             {
                 ((PersistenceUnitMetaData)md).setCaching(currentString);
             }
+            else if (localName.equals("validation-mode"))
+            {
+                ((PersistenceUnitMetaData)md).setValidationMode(currentString);
+            }
         }
 
         // Pop the tag


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8364
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8364&view=rev
Author:   andy_jefferson
Date:     2009-12-17 16:19:17 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
More isolation of metadataManager from XXXMetaData classes

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-12-17 14:14:03 UTC (rev 8363)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java	2009-12-17 16:19:17 UTC (rev 8364)
@@ -3568,18 +3568,4 @@
             return fetchGroupMetaWithPostLoad.booleanValue();
         }
     }
-
-    /**
-     * Convenience accessor for the MetaData Manager in use.
-     * TODO Remove this when we strip MetaDataManager out of FileMetaData
-     * @return MetaDataManager.
-     */
-    MetaDataManager getMetaDataManager()
-    {
-        if (parent != null && parent.getParent() != null)
-        {
-            return getPackageMetaData().getFileMetaData().getMetaDataManager();
-        }
-        return null;
-    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-12-17 14:14:03 UTC (rev 8363)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2009-12-17 16:19:17 UTC (rev 8364)
@@ -2637,9 +2637,11 @@
             return;
         }
 
+        // Get MetaDataManager (from "file"). TODO Remove this and pass it in
+        MetaDataManager mmgr = getAbstractClassMetaData().getPackageMetaData().getFileMetaData().metaDataManager;
+
         // Find the metadata for the field object
         AbstractClassMetaData otherCmd = null;
-        MetaDataManager mmgr = getMetaDataManager();
         if (hasCollection())
         {
             otherCmd = mmgr.getMetaDataForClass(getCollection().getElementType(), clr);
@@ -2707,8 +2709,6 @@
                 {
                     otherCmd = mmgr.getMetaDataForClass(implNames[0], clr);
                 }
-                /*otherCmd = getMetaDataManager().getMetaDataForImplementationOfReference(getType(), null, clr);*/
-                /*otherCmd = getAbstractClassMetaData().getMetaDataManager().getMetaDataForInterface(getType(), clr);*/
             }
             else
             {
@@ -3129,15 +3129,4 @@
         }
         throw new ClassCastException(this.getClass().getName() + " != " + o.getClass().getName());
     }
-
-    /**
-     * Convenience accessor for the MetaData Manager in use.
-     * TODO Remove this
-     * @return MetaDataManager.
-     */
-    public MetaDataManager getMetaDataManager()
-    {
-        MetaData overallCmd = getOverallParentClassMetaData(this);
-        return (overallCmd != null ? ((AbstractClassMetaData)overallCmd).getMetaDataManager() : null);
-    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-12-17 14:14:03 UTC (rev 8363)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/FileMetaData.java	2009-12-17 16:19:17 UTC (rev 8364)
@@ -31,7 +31,7 @@
 public class FileMetaData extends MetaData
 {
     // TODO Remove this, and pass in to populate/initialise as required
-    /** Manager for this MetaData object. Used in populate/initialise processes. */
+    /** Manager for this MetaData object. Used in AbstractMemberMetaData.setRelation process. */
     transient protected MetaDataManager metaDataManager;
 
     /** Type of file (JDO, ORM, JDOQUERY, etc) */
@@ -69,17 +69,8 @@
     }
 
     /**
-     * Accessor for the MetaDataManager for this file.
-     * @return The MetaDataManager for this file.
-     */
-    public MetaDataManager getMetaDataManager()
-    {
-        return metaDataManager;
-    }
-
-    /**
      * Method to set the MetaDataManager in use.
-     * Must be done before populate is called.
+     * TODO Remove this
      * @param mmgr MetaDataManager to use
      */
     public void setMetaDataManager(MetaDataManager mmgr)

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java	2009-12-17 14:14:03 UTC (rev 8363)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/MetaData.java	2009-12-17 16:19:17 UTC (rev 8364)
@@ -96,17 +96,17 @@
         setInitialised();
     }
 
-    public void setInitialised()
+    void setInitialised()
     {
         metaDataState = METADATA_INITIALISED_STATE;
     }
 
-    public void setPopulated()
+    void setPopulated()
     {
         metaDataState = METADATA_POPULATED_STATE;
     }
 
-    public void setUsed()
+    void setUsed()
     {
         metaDataState = METADATA_USED_STATE;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9829
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=9829&view=rev
Author:   pdettman
Date:     2010-05-16 04:57:07 +0000 (Sun, 16 May 2010)

Log Message:
-----------
Fix spelling

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-15 08:47:37 UTC (rev 9828)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-16 04:57:07 UTC (rev 9829)
@@ -132,7 +132,7 @@
      * Method to provide the details of the class being represented by this
      * MetaData. This can be used to firstly provide defaults for attributes
      * that aren't specified in the MetaData, and secondly to report any errors
-     * with attributes that have been specifed that are inconsistent with the
+     * with attributes that have been specified that are inconsistent with the
      * class being represented.
      * <P>
      * One possible use of this method would be to take a basic ClassMetaData

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-15 08:47:37 UTC (rev 9828)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-16 04:57:07 UTC (rev 9829)
@@ -247,7 +247,7 @@
      * Method to provide the details of the class being represented by this
      * MetaData. This can be used to firstly provide defaults for attributes
      * that aren't specified in the MetaData, and secondly to report any errors
-     * with attributes that have been specifed that are inconsistent with the
+     * with attributes that have been specified that are inconsistent with the
      * class being represented.
      * <P>
      * One possible use of this method would be to take a basic ClassMetaData


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9836
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=9836&view=rev
Author:   pdettman
Date:     2010-05-16 10:01:18 +0000 (Sun, 16 May 2010)

Log Message:
-----------
When initialise called, must already be populated, not populating

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-16 09:17:50 UTC (rev 9835)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-16 10:01:18 UTC (rev 9836)
@@ -562,19 +562,16 @@
      */
     public synchronized void initialise(ClassLoaderResolver clr, MetaDataManager mmgr)
     {
-        if (populating || initialising)
+        if (initialising || isInitialised())
         {
             return;
         }
 
+        checkPopulated();
+
         try
         {
             initialising = true;
-            checkPopulated();
-            if (isInitialised())
-            {
-                return;
-            }
 
             if (pcSuperclassMetaData != null)
             {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-16 09:17:50 UTC (rev 9835)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-16 10:01:18 UTC (rev 9836)
@@ -57,19 +57,16 @@
      */
     public synchronized void initialise(ClassLoaderResolver clr, MetaDataManager mmgr)
     {
-        if (populating || initialising)
+        if (initialising || isInitialised())
         {
             return;
         }
 
+        checkPopulated();
+
         try
         {
             initialising = true;
-            checkPopulated();
-            if (isInitialised())
-            {
-                return;
-            }
 
             if (pcSuperclassMetaData != null)
             {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9925
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=9925&view=rev
Author:   andy_jefferson
Date:     2010-05-22 09:02:25 +0000 (Sat, 22 May 2010)

Log Message:
-----------
some method renames to make more sense

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
    platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2010-05-22 06:54:51 UTC (rev 9924)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractMemberMetaData.java	2010-05-22 09:02:25 UTC (rev 9925)
@@ -226,8 +226,8 @@
     /** Wrapper for the ugly JPA "lob" so that when being populated we should make this serialised in some way. */
     protected boolean storeInLob = false;
 
-    /** JDO Flags for use in enhancement process - see JDO spec 21.14. */
-    protected byte jdoFieldFlag;
+    /** Flags for use in enhancement process - see JDO spec 21.14. */
+    protected byte persistenceFlags;
 
     /**
      * Convenience constructor to copy the specification from the passed field.
@@ -945,28 +945,28 @@
 
         if (FieldPersistenceModifier.NONE.equals(persistenceModifier))
         {
-            jdoFieldFlag = 0;
+            persistenceFlags = 0;
         }
         else if (FieldPersistenceModifier.TRANSACTIONAL.equals(persistenceModifier) &&
                  Modifier.isTransient(memberRepresented.getModifiers()))
         {
-            jdoFieldFlag = (byte) (PersistenceFlags.CHECK_WRITE | serializable);
+            persistenceFlags = (byte) (PersistenceFlags.CHECK_WRITE | serializable);
         }
         else if (primaryKey.booleanValue())
         {
-            jdoFieldFlag = (byte) (PersistenceFlags.MEDIATE_WRITE | serializable);
+            persistenceFlags = (byte) (PersistenceFlags.MEDIATE_WRITE | serializable);
         }
         else if (defaultFetchGroup.booleanValue())
         {
-            jdoFieldFlag = (byte) (PersistenceFlags.CHECK_READ | PersistenceFlags.CHECK_WRITE | serializable);
+            persistenceFlags = (byte) (PersistenceFlags.CHECK_READ | PersistenceFlags.CHECK_WRITE | serializable);
         }
         else if (!defaultFetchGroup.booleanValue())
         {
-            jdoFieldFlag = (byte) (PersistenceFlags.MEDIATE_READ | PersistenceFlags.MEDIATE_WRITE | serializable);
+            persistenceFlags = (byte) (PersistenceFlags.MEDIATE_READ | PersistenceFlags.MEDIATE_WRITE | serializable);
         }
         else
         {
-            jdoFieldFlag = 0;
+            persistenceFlags = 0;
         }
 
         // Set fields that are not relations
@@ -2268,19 +2268,20 @@
     }
 
     /**
-     * Accessor for the JDO field flag
-     * @return JDO Field flag (for enhancing)
+     * Accessor for the persistence flags
+     * @return Persistence flags (for enhancing)
      */
     public byte getJdoFieldFlag()
     {
-        return jdoFieldFlag;
+        return persistenceFlags;
     }
 
     /**
-     * Accessor for whether the field is to be managed by JPOX.
-     * @return Whether it is JPOX managed
+     * Accessor for whether the field is to be persisted by the persistence process.
+     * Currently omits static and final fields, and fields explicitly marked as not persistent.
+     * @return Whether it is managed
      */
-    public boolean isJdoField()
+    public boolean isFieldToBePersisted()
     {
         if (isPopulated())
         {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-22 06:54:51 UTC (rev 9924)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java	2010-05-22 09:02:25 UTC (rev 9925)
@@ -601,7 +601,7 @@
     
                 // Initialise the FieldMetaData (and its sub-objects)
                 mmd.initialise(clr, mmgr);
-                if (mmd.isJdoField())
+                if (mmd.isFieldToBePersisted())
                 {
                     if (mmd.fieldBelongsToClass())
                     {
@@ -625,7 +625,7 @@
             while (membersIter.hasNext())
             {
                 AbstractMemberMetaData mmd = (AbstractMemberMetaData)membersIter.next();
-                if (mmd.isJdoField())
+                if (mmd.isFieldToBePersisted())
                 {
                     if (mmd.fieldBelongsToClass())
                     {

Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-22 06:54:51 UTC (rev 9924)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java	2010-05-22 09:02:25 UTC (rev 9925)
@@ -96,7 +96,7 @@
 
                 // Initialise the AbstractMemberMetaData (and its sub-objects)
                 fmd.initialise(clr, mmgr);
-                if (fmd.isJdoField())
+                if (fmd.isFieldToBePersisted())
                 {
                     if (fmd.fieldBelongsToClass())
                     {
@@ -121,7 +121,7 @@
             {
                 AbstractMemberMetaData fmd = (AbstractMemberMetaData)fields_iter.next();
 
-                if (fmd.isJdoField())
+                if (fmd.isFieldToBePersisted())
                 {
                     if (fmd.fieldBelongsToClass())
                     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.