You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2009/01/26 11:10:38 UTC
svn commit: r737665 - in /db/jdo/trunk/api2/src/java/javax/jdo/metadata:
FetchGroupMetadata.java ForeignKeyMetadata.java IndexMetadata.java
UniqueMetadata.java
Author: andyj
Date: Mon Jan 26 10:10:36 2009
New Revision: 737665
URL: http://svn.apache.org/viewvc?rev=737665&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/FetchGroupMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/IndexMetadata.java
db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchGroupMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchGroupMetadata.java?rev=737665&r1=737664&r2=737665&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchGroupMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchGroupMetadata.java Mon Jan 26 10:10:36 2009
@@ -43,11 +43,17 @@
Boolean getPostLoad();
/**
- * Accessor for all fields defined on the fetch group.
+ * Accessor for all fields/properties defined on the fetch group.
+ * @return The members
+ */
+ MemberMetadata[] getMembers();
+
+ /**
+ * Accessor for the number of fields/properties defined for this fetch group.
*
- * @return The fields
+ * @return The number of members
*/
- FieldMetadata[] getFields();
+ int getNumberOfMembers();
/**
* Add a new field for this fetch group.
@@ -58,31 +64,10 @@
FieldMetadata newFieldMetadata(String name);
/**
- * Accessor for the number of fields defined for this fetch group.
- *
- * @return The number of fields
- */
- int getNumberOfFields();
-
- /**
- * Accessor for all properties defined on the fetch group.
- *
- * @return The properties
- */
- PropertyMetadata[] getProperties();
-
- /**
* Add a new property for this fetch group
*
* @param name Name of property
* @return The PropertyMetadata
*/
PropertyMetadata newPropertyMetadata(String name);
-
- /**
- * Accessor for the number of properties defined for this fetch group
- *
- * @return The number of properties
- */
- int getNumberOfProperties();
}
\ No newline at end of file
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ForeignKeyMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ForeignKeyMetadata.java?rev=737665&r1=737664&r2=737665&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ForeignKeyMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ForeignKeyMetadata.java Mon Jan 26 10:10:36 2009
@@ -129,11 +129,16 @@
int getNumberOfColumns();
/**
- * Accessor for all field(s) defined on the FK.
- *
- * @return The field(s)
+ * Accessor for all fields/properties defined on the FK.
+ * @return The members
+ */
+ MemberMetadata[] getMembers();
+
+ /**
+ * Accessor for the number of fields/properties defined for this FK.
+ * @return The number of members
*/
- FieldMetadata[] getFields();
+ int getNumberOfMembers();
/**
* Add a new field for this FK.
@@ -144,31 +149,10 @@
FieldMetadata newFieldMetadata(String name);
/**
- * Accessor for the number of fields defined for this FK.
- *
- * @return The number of fields
- */
- int getNumberOfFields();
-
- /**
- * Accessor for all properties defined on the FK.
- *
- * @return The properties
- */
- PropertyMetadata[] getProperties();
-
- /**
* Add a new property for this FK.
*
* @param name Name of the property
* @return The PropertyMetadata
*/
PropertyMetadata newPropertyMetadata(String name);
-
- /**
- * Accessor for the number of properties defined for this FK.
- *
- * @return The number of properties
- */
- int getNumberOfProperties();
}
\ No newline at end of file
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/IndexMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/IndexMetadata.java?rev=737665&r1=737664&r2=737665&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/IndexMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/IndexMetadata.java Mon Jan 26 10:10:36 2009
@@ -85,33 +85,26 @@
int getNumberOfColumns();
/**
- * Accessor for all field(s) defined on the index.
+ * Accessor for all member(s) defined on the index.
*
- * @return The field(s)
+ * @return The fields/properties
*/
- FieldMetadata[] getFields();
+ MemberMetadata[] getMembers();
/**
- * Add a new field for this index.
- *
- * @param name Name of the field
- * @return The FieldMetadata
- */
- FieldMetadata newFieldMetadata(String name);
-
- /**
- * Accessor for the number of fields defined for this index.
+ * Accessor for the number of fields/properties defined for this index.
*
- * @return The number of fields
+ * @return The number of members
*/
- int getNumberOfFields();
+ int getNumberOfMembers();
/**
- * Accessor for all properties defined on the index.
+ * Add a new field for this index.
*
- * @return The properties
+ * @param name Name of the field
+ * @return The FieldMetadata
*/
- PropertyMetadata[] getProperties();
+ FieldMetadata newFieldMetadata(String name);
/**
* Add a new property for this index.
@@ -120,11 +113,4 @@
* @return The PropertyMetadata
*/
PropertyMetadata newPropertyMetadata(String name);
-
- /**
- * Accessor for the number of properties defined for this index.
- *
- * @return The number of properties
- */
- int getNumberOfProperties();
}
\ No newline at end of file
Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java?rev=737665&r1=737664&r2=737665&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java Mon Jan 26 10:10:36 2009
@@ -85,11 +85,16 @@
int getNumberOfColumns();
/**
- * Accessor for all field(s) defined on the unique constraint.
- *
- * @return The field(s)
+ * Accessor for all fields/properties defined on the unique constraint.
+ * @return The members
+ */
+ MemberMetadata[] getMembers();
+
+ /**
+ * Accessor for the number of fields/properties defined for this unique constraint.
+ * @return The number of members
*/
- FieldMetadata[] getFields();
+ int getNumberOfMembers();
/**
* Add a new field for this unique constraint.
@@ -100,31 +105,10 @@
FieldMetadata newFieldMetadata(String name);
/**
- * Accessor for the number of fields defined for this unique constraint.
- *
- * @return The number of fields
- */
- int getNumberOfFields();
-
- /**
- * Accessor for all properties defined on the unique constraint.
- *
- * @return The properties
- */
- PropertyMetadata[] getProperties();
-
- /**
* Add a new property for this unique constraint.
*
* @param name Name of the property
* @return The PropertyMetadata
*/
PropertyMetadata newPropertyMetadata(String name);
-
- /**
- * Accessor for the number of properties defined for this unique constraint.
- *
- * @return The number of properties
- */
- int getNumberOfProperties();
}
\ No newline at end of file