Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: jdo-dev@db.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r737762 - in
 /db/jdo/trunk/api2/src/java/javax/jdo/metadata:
 ClassMetadata.java ComponentMetadata.java
Date: Mon, 26 Jan 2009 17:35:23 -0000
To: jdo-commits@db.apache.org
From: andyj@apache.org
Message-Id: <20090126173523.EAE2C23888E6@eris.apache.org>

Author: andyj
Date: Mon Jan 26 17:35:22 2009
New Revision: 737762

URL: http://svn.apache.org/viewvc?rev=737762&view=rev
Log:
JDO-615 Change to use "members" instead of "fields" and "properties" for consistency with annotations and to simplify the interfaces

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java?rev=737762&r1=737761&r2=737762&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java Mon Jan 26 17:35:22 2009
@@ -34,21 +34,9 @@
     ClassPersistenceModifier getPersistenceModifier();
 
     /**
-     * Accessor for all fields defined on the class.
-     * @return The fields
-     */
-    FieldMetadata[] getFields();
-
-    /**
      * Add a new field to this class.
      * @param name Name of the field
      * @return The FieldMetadata
      */
     FieldMetadata newFieldMetadata(String name);
-
-    /**
-     * Accessor for the number of fields defined for this class.
-     * @return The number of fields
-     */
-    int getNumberOfFields();
 }
\ No newline at end of file

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java?rev=737762&r1=737761&r2=737762&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java Mon Jan 26 17:35:22 2009
@@ -297,26 +297,26 @@
     int getNumberOfUniques();
 
     /**
-     * Accessor for all properties defined on the component.
+     * Accessor for all fields/properties defined on the component.
      * 
-     * @return The properties
+     * @return The members
      */
-    PropertyMetadata[] getProperties();
+    MemberMetadata[] getMembers();
 
     /**
-     * Add a new property for this component.
+     * Accessor for the number of fields/properties defined for this component.
      * 
-     * @param name Name of the property
-     * @return The PropertyMetadata
+     * @return The number of members
      */
-    PropertyMetadata newPropertyMetadata(String name);
+    int getNumberOfMembers();
 
     /**
-     * Accessor for the number of properties defined for this component.
+     * Add a new property for this component.
      * 
-     * @return The number of properties
+     * @param name Name of the property
+     * @return The PropertyMetadata
      */
-    int getNumberOfProperties();
+    PropertyMetadata newPropertyMetadata(String name);
 
     /**
      * Accessor for all named queries defined on the component.