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 2008/12/13 21:51:28 UTC

svn commit: r726267 - /db/jdo/trunk/api2/src/java/javax/jdo/metadata/

Author: andyj
Date: Sat Dec 13 12:51:27 2008
New Revision: 726267

URL: http://svn.apache.org/viewvc?rev=726267&view=rev
Log:
JDO-615 Apply patch of Michael, and change all setters to return the object that is having a field set

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ArrayMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ClassMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/CollectionMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ColumnMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ComponentMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ElementMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/EmbeddedMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchGroupMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchPlanMetadata.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/InheritanceMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/JDOMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/JoinMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/KeyMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/MapMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/MemberMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/OrderMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/PackageMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/PropertyMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/QueryMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/SequenceMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/UniqueMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/ValueMetadata.java
    db/jdo/trunk/api2/src/java/javax/jdo/metadata/VersionMetadata.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ArrayMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ArrayMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ArrayMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ArrayMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param type Name of the element type
      */
-    void setElementType(String type);
+    ArrayMetadata setElementType(String type);
 
     /**
      * Accessor for the element type
@@ -40,7 +40,7 @@
      * 
      * @param val Whether it is embedded
      */
-    void setEmbeddedElement(boolean val);
+    ArrayMetadata setEmbeddedElement(boolean val);
 
     /**
      * Accessor for whether the element is embedded
@@ -54,7 +54,7 @@
      * 
      * @param val Whether it is serialised
      */
-    void setSerializedElement(boolean val);
+    ArrayMetadata setSerializedElement(boolean val);
 
     /**
      * Accessor for whether the element is serialised
@@ -68,7 +68,7 @@
      * 
      * @param val Whether it is dependent
      */
-    void setDependentElement(boolean val);
+    ArrayMetadata setDependentElement(boolean val);
 
     /**
      * Accessor for whether the element is dependent

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -25,7 +25,7 @@
      * Method to define the persistence modifier.
      * @param mod persistence modifier
      */
-    void setPersistenceModifier(ClassPersistenceModifier mod);
+    ClassMetadata setPersistenceModifier(ClassPersistenceModifier mod);
 
     /**
      * Accessor for the persistence modifier.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/CollectionMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/CollectionMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/CollectionMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/CollectionMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param type Name of the element type
      */
-    void setElementType(String type);
+    CollectionMetadata setElementType(String type);
 
     /**
      * Accessor for the element type
@@ -40,7 +40,7 @@
      * 
      * @param val Whether it is embedded
      */
-    void setEmbeddedElement(boolean val);
+    CollectionMetadata setEmbeddedElement(boolean val);
 
     /**
      * Accessor for whether the element is embedded
@@ -54,7 +54,7 @@
      * 
      * @param val Whether it is serialised
      */
-    void setSerializedElement(boolean val);
+    CollectionMetadata setSerializedElement(boolean val);
 
     /**
      * Accessor for whether the element is serialised
@@ -68,7 +68,7 @@
      * 
      * @param val Whether it is dependent
      */
-    void setDependentElement(boolean val);
+    CollectionMetadata setDependentElement(boolean val);
 
     /**
      * Accessor for whether the element is dependent

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ColumnMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ColumnMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ColumnMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ColumnMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param name Column name
      */
-    void setName(String name);
+    ColumnMetadata setName(String name);
 
     /**
      * Accessor for the name of the column.
@@ -40,7 +40,7 @@
      * 
      * @param target Target column
      */
-    void setTarget(String target);
+    ColumnMetadata setTarget(String target);
 
     /**
      * Accessor for the name of the target column.
@@ -54,7 +54,7 @@
      * 
      * @param target Target field
      */
-    void setTargetField(String target);
+    ColumnMetadata setTargetField(String target);
 
     /**
      * Accessor for the name of the target field.
@@ -68,7 +68,7 @@
      * 
      * @param type JDBC Type
      */
-    void setJDBCType(String type);
+    ColumnMetadata setJDBCType(String type);
 
     /**
      * Accessor for the JDBC Type
@@ -82,7 +82,7 @@
      * 
      * @param type SQL Type
      */
-    void setSQLType(String type);
+    ColumnMetadata setSQLType(String type);
 
     /**
      * Accessor for the SQL Type
@@ -96,7 +96,7 @@
      * 
      * @param len Length
      */
-    void setLength(int len);
+    ColumnMetadata setLength(int len);
 
     /**
      * Accessor for the length
@@ -110,7 +110,7 @@
      * 
      * @param scale scale
      */
-    void setScale(int scale);
+    ColumnMetadata setScale(int scale);
 
     /**
      * Accessor for the scale
@@ -124,7 +124,7 @@
      * 
      * @param nulls Allows null?
      */
-    void setAllowsNull(boolean nulls);
+    ColumnMetadata setAllowsNull(boolean nulls);
 
     /**
      * Accessor for whether the column allows null.
@@ -138,7 +138,7 @@
      * 
      * @param val Default value
      */
-    void setDefaultValue(String val);
+    ColumnMetadata setDefaultValue(String val);
 
     /**
      * Accessor for the default value
@@ -152,7 +152,7 @@
      * 
      * @param val Insert value
      */
-    void setInsertValue(String val);
+    ColumnMetadata setInsertValue(String val);
 
     /**
      * Accessor for the insert value (for columns with no field/property)

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -35,7 +35,7 @@
      * 
      * @param id identity type
      */
-    void setIdentityType(IdentityType id);
+    ComponentMetadata setIdentityType(IdentityType id);
 
     /**
      * Accessor for the identity type to use.
@@ -49,7 +49,7 @@
      * 
      * @param idclass Object-id class
      */
-    void setObjectIdClass(String idclass);
+    ComponentMetadata setObjectIdClass(String idclass);
 
     /**
      * Accessor for the object-id class (if defined).
@@ -63,7 +63,7 @@
      * 
      * @param extent Requires extent?
      */
-    void setRequiresExtent(boolean extent);
+    ComponentMetadata setRequiresExtent(boolean extent);
 
     /**
      * Accessor for whether the component requires an extent.
@@ -77,7 +77,7 @@
      * 
      * @param detachable Detachable?
      */
-    void setDetachable(boolean detachable);
+    ComponentMetadata setDetachable(boolean detachable);
 
     /**
      * Accessor for whether this is detachable.
@@ -91,7 +91,7 @@
      * 
      * @param cacheable Cacheable?
      */
-    void setCacheable(boolean cacheable);
+    ComponentMetadata setCacheable(boolean cacheable);
 
     /**
      * Accessor for whether this is cacheable.
@@ -105,7 +105,7 @@
      * 
      * @param embedded Whether it is only stored embedded
      */
-    void setEmbeddedOnly(boolean extent);
+    ComponentMetadata setEmbeddedOnly(boolean extent);
 
     /**
      * Accessor for whether this is embedded only.
@@ -119,7 +119,7 @@
      * 
      * @param catalog Catalog name
      */
-    void setCatalog(String catalog);
+    ComponentMetadata setCatalog(String catalog);
 
     /**
      * Accessor for the catalog (ORM) for this component
@@ -133,7 +133,7 @@
      * 
      * @param schema Schema name
      */
-    void setSchema(String schema);
+    ComponentMetadata setSchema(String schema);
 
     /**
      * Accessor for the schema (ORM) for this component
@@ -147,7 +147,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    ComponentMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/DatastoreIdentityMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param column Name of the datastore identity column
      */
-    void setColumn(String column);
+    DatastoreIdentityMetadata setColumn(String column);
 
     /**
      * Accessor for the datastore identity column name
@@ -42,7 +42,7 @@
      * 
      * @param strategy The strategy
      */
-    void setStrategy(VersionStrategy strategy);
+    DatastoreIdentityMetadata setStrategy(VersionStrategy strategy);
 
     /**
      * Accessor for the identity generation strategy.
@@ -56,7 +56,7 @@
      * 
      * @param strategy The strategy
      */
-    void setCustomStrategy(String strategy);
+    DatastoreIdentityMetadata setCustomStrategy(String strategy);
 
     /**
      * Accessor for the custom strategy (overriding "strategy").
@@ -70,7 +70,7 @@
      * 
      * @param seq Sequence key
      */
-    void setSequence(String seq);
+    DatastoreIdentityMetadata setSequence(String seq);
 
     /**
      * Accessor for the sequence key (when using "sequence" strategy)

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/DiscriminatorMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/DiscriminatorMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/DiscriminatorMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/DiscriminatorMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param column Name of the discriminator clumn
      */
-    void setColumn(String column);
+    DiscriminatorMetadata setColumn(String column);
 
     /**
      * Accessor for the discriminator column name
@@ -42,7 +42,7 @@
      * 
      * @param val Value for the discriminator for this class
      */
-    void setValue(String val);
+    DiscriminatorMetadata setValue(String val);
 
     /**
      * Accessor for the discriminator value (when using "value-map" strategy).
@@ -56,7 +56,7 @@
      * 
      * @param strategy The strategy
      */
-    void setStrategy(DiscriminatorStrategy strategy);
+    DiscriminatorMetadata setStrategy(DiscriminatorStrategy strategy);
 
     /**
      * Accessor for the discriminator strategy.
@@ -70,7 +70,7 @@
      * 
      * @param indexed Whether indexed (true | false | unique)
      */
-    void setIndexed(Indexed indexed);
+    DiscriminatorMetadata setIndexed(Indexed indexed);
 
     /**
      * Accessor for whether indexed (true|false|unique)

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ElementMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ElementMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ElementMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ElementMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param column Column name
      */
-    void setColumn(String column);
+    ElementMetadata setColumn(String column);
 
     /**
      * Accessor for the name of the column.
@@ -42,7 +42,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    ElementMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -56,7 +56,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    ElementMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -70,7 +70,7 @@
      * 
      * @param action Update action of the FK
      */
-    void setUpdateAction(ForeignKeyAction action);
+    ElementMetadata setUpdateAction(ForeignKeyAction action);
 
     /**
      * Accessor for the update action of the FK

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/EmbeddedMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/EmbeddedMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/EmbeddedMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/EmbeddedMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param fld Name of the owner field
      */
-    void setOwnerField(String fld);
+    EmbeddedMetadata setOwnerField(String fld);
 
     /**
      * Accessor for the owner field name.
@@ -40,7 +40,7 @@
      * 
      * @param col Null indicator column
      */
-    void setNullIndicatorColumn(String col);
+    EmbeddedMetadata setNullIndicatorColumn(String col);
 
     /**
      * Accessor for any column indicating a null embedded object
@@ -54,7 +54,7 @@
      * 
      * @param val Null indicator value
      */
-    void setNullIndicatorValue(String val);
+    EmbeddedMetadata setNullIndicatorValue(String val);
 
     /**
      * Accessor for a null indicator value

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -33,14 +33,14 @@
      * 
      * @param load Call post load
      */
-    void setPostLoad(boolean load);
+    FetchGroupMetadata setPostLoad(boolean load);
 
     /**
      * Accessor for whether to call post load for this fetch group
      * 
      * @return Whether to call post-load
      */
-    boolean getPostLoad();
+    Boolean getPostLoad();
 
     /**
      * Accessor for all fields defined on the fetch group.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchPlanMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchPlanMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchPlanMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/FetchPlanMetadata.java Sat Dec 13 12:51:27 2008
@@ -33,7 +33,7 @@
      * 
      * @param depth The max fetch depth
      */
-    void setMaxFetchDepth(int depth);
+    FetchPlanMetadata setMaxFetchDepth(int depth);
 
     /**
      * Accessor for the max fetch depth.
@@ -47,7 +47,7 @@
      * 
      * @param size The fetch size
      */
-    void setFetchSize(int size);
+    FetchPlanMetadata setFetchSize(int size);
 
     /**
      * Accessor for the max fetch depth.

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param name Name of the constraint
      */
-    void setName(String name);
+    ForeignKeyMetadata setName(String name);
 
     /**
      * Accessor for the constraint name.
@@ -42,7 +42,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    ForeignKeyMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -56,7 +56,7 @@
      * 
      * @param unique Unique?
      */
-    void setUnique(boolean unique);
+    ForeignKeyMetadata setUnique(boolean unique);
 
     /**
      * Accessor for whether unique.
@@ -70,7 +70,7 @@
      * 
      * @param def Deferred?
      */
-    void setDeferred(boolean def);
+    ForeignKeyMetadata setDeferred(boolean def);
 
     /**
      * Accessor for whether the constraint can be deferred.
@@ -84,7 +84,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    ForeignKeyMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -98,7 +98,7 @@
      * 
      * @param action Update action of the FK
      */
-    void setUpdateAction(ForeignKeyAction action);
+    ForeignKeyMetadata setUpdateAction(ForeignKeyAction action);
 
     /**
      * Accessor for the update action of the FK

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param name Name of the index
      */
-    void setName(String name);
+    IndexMetadata setName(String name);
 
     /**
      * Accessor for the index name.
@@ -40,7 +40,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    IndexMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -54,14 +54,14 @@
      * 
      * @param unique Unique?
      */
-    void setUnique(boolean unique);
+    IndexMetadata setUnique(boolean unique);
 
     /**
      * Accessor for whether unique.
      * 
      * @return Unique?
      */
-    Boolean getUnique();
+    boolean getUnique();
 
     /**
      * Accessor for all column(s) defined on the index.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/InheritanceMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param strategy The strategy
      */
-    void setStrategy(InheritanceStrategy strategy);
+    InheritanceMetadata setStrategy(InheritanceStrategy strategy);
 
     /**
      * Accessor for the inheritance strategy.
@@ -42,7 +42,7 @@
      * 
      * @param strategy The strategy
      */
-    void setCustomStrategy(String strategy);
+    InheritanceMetadata setCustomStrategy(String strategy);
 
     /**
      * Accessor for the custom inheritance (overriding "strategy").

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/JDOMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/JDOMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/JDOMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/JDOMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param catalog Catalog name
      */
-    void setCatalog(String catalog);
+    JDOMetadata setCatalog(String catalog);
 
     /**
      * Accessor for the catalog (ORM) that all classes in this JDO Metadata
@@ -42,7 +42,7 @@
      * 
      * @param schema Schema name
      */
-    void setSchema(String schema);
+    JDOMetadata setSchema(String schema);
 
     /**
      * Accessor for the schema (ORM) that all classes in this JDO Metadata

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/JoinMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/JoinMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/JoinMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/JoinMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param column Name of the join column
      */
-    void setColumn(String column);
+    JoinMetadata setColumn(String column);
 
     /**
      * Accessor for the join column name
@@ -42,7 +42,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    JoinMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -56,7 +56,7 @@
      * 
      * @param outer Outer join?
      */
-    void setOuter(boolean outer);
+    JoinMetadata setOuter(boolean outer);
 
     /**
      * Accessor for whether to use an outer join.
@@ -70,7 +70,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    JoinMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -84,7 +84,7 @@
      * 
      * @param indexed Whether indexed (true | false | unique)
      */
-    void setIndexed(Indexed indexed);
+    JoinMetadata setIndexed(Indexed indexed);
 
     /**
      * Accessor for whether indexed (true|false|unique)
@@ -98,7 +98,7 @@
      * 
      * @param unique Unique?
      */
-    void setUnique(boolean unique);
+    JoinMetadata setUnique(boolean unique);
 
     /**
      * Accessor for whether unique.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/KeyMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/KeyMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/KeyMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/KeyMetadata.java Sat Dec 13 12:51:27 2008
@@ -27,7 +27,7 @@
      * 
      * @param column Column name
      */
-    void setColumn(String column);
+    KeyMetadata setColumn(String column);
 
     /**
      * Accessor for the name of the column.
@@ -41,7 +41,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    KeyMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -55,7 +55,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    KeyMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -69,7 +69,7 @@
      * 
      * @param action Update action of the FK
      */
-    void setUpdateAction(ForeignKeyAction action);
+    KeyMetadata setUpdateAction(ForeignKeyAction action);
 
     /**
      * Accessor for the update action of the FK

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/MapMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/MapMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/MapMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/MapMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param type Name of the key type
      */
-    void setKeyType(String type);
+    MapMetadata setKeyType(String type);
 
     /**
      * Accessor for the key type
@@ -40,7 +40,7 @@
      * 
      * @param val Whether it is embedded
      */
-    void setEmbeddedKey(boolean val);
+    MapMetadata setEmbeddedKey(boolean val);
 
     /**
      * Accessor for whether the key is embedded
@@ -54,7 +54,7 @@
      * 
      * @param val Whether it is serialised
      */
-    void setSerializedKey(boolean val);
+    MapMetadata setSerializedKey(boolean val);
 
     /**
      * Accessor for whether the key is serialised
@@ -68,7 +68,7 @@
      * 
      * @param val Whether it is dependent
      */
-    void setDependentKey(boolean val);
+    MapMetadata setDependentKey(boolean val);
 
     /**
      * Accessor for whether the key is dependent
@@ -82,7 +82,7 @@
      * 
      * @param type Name of the value type
      */
-    void setValueType(String type);
+    MapMetadata setValueType(String type);
 
     /**
      * Accessor for the value type
@@ -96,7 +96,7 @@
      * 
      * @param val Whether it is embedded
      */
-    void setEmbeddedValue(boolean val);
+    MapMetadata setEmbeddedValue(boolean val);
 
     /**
      * Accessor for whether the value is embedded
@@ -110,7 +110,7 @@
      * 
      * @param val Whether it is serialised
      */
-    void setSerializedValue(boolean val);
+    MapMetadata setSerializedValue(boolean val);
 
     /**
      * Accessor for whether the value is serialised
@@ -124,7 +124,7 @@
      * 
      * @param val Whether it is dependent
      */
-    void setDependentValue(boolean val);
+    MapMetadata setDependentValue(boolean val);
 
     /**
      * Accessor for whether the value is dependent

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/MemberMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/MemberMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/MemberMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/MemberMetadata.java Sat Dec 13 12:51:27 2008
@@ -30,7 +30,7 @@
      * 
      * @param name name
      */
-    void setName(String name);
+    MemberMetadata setName(String name);
 
     /**
      * Accessor for the name of the field/property.
@@ -44,7 +44,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    MemberMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -58,7 +58,7 @@
      * 
      * @param col Column name
      */
-    void setColumn(String col);
+    MemberMetadata setColumn(String col);
 
     /**
      * Accessor for the name of the column.
@@ -73,7 +73,7 @@
      * 
      * @param type Type of field
      */
-    void setFieldType(String type);
+    MemberMetadata setFieldType(String type);
 
     /**
      * Accessor for the type storable in the field
@@ -87,7 +87,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    MemberMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -101,7 +101,7 @@
      * 
      * @param mod persistence modifier
      */
-    void setPersistenceModifier(PersistenceModifier mod);
+    MemberMetadata setPersistenceModifier(PersistenceModifier mod);
 
     /**
      * Accessor for the persistence modifier of the field/property.
@@ -115,7 +115,7 @@
      * 
      * @param val Null value behaviour
      */
-    void setNullValue(NullValue val);
+    MemberMetadata setNullValue(NullValue val);
 
     /**
      * Accessor for the behaviour of a null value
@@ -129,7 +129,7 @@
      * 
      * @param dfg DFG?
      */
-    void setDefaultFetchGroup(boolean dfg);
+    MemberMetadata setDefaultFetchGroup(boolean dfg);
 
     /**
      * Accessor for whether part of the DFG.
@@ -143,7 +143,7 @@
      * 
      * @param unique Unique?
      */
-    void setDependent(boolean unique);
+    MemberMetadata setDependent(boolean unique);
 
     /**
      * Accessor for whether unique.
@@ -157,7 +157,7 @@
      * 
      * @param emb Embedded?
      */
-    void setEmbedded(boolean emb);
+    MemberMetadata setEmbedded(boolean emb);
 
     /**
      * Accessor for whether it is embedded.
@@ -171,7 +171,7 @@
      * 
      * @param ser serialized?
      */
-    void setSerialized(boolean ser);
+    MemberMetadata setSerialized(boolean ser);
 
     /**
      * Accessor for whether it is serialized.
@@ -185,7 +185,7 @@
      * 
      * @param pk PK?
      */
-    void setPrimaryKey(boolean unique);
+    MemberMetadata setPrimaryKey(boolean unique);
 
     /**
      * Accessor for whether it is part of the pk.
@@ -199,7 +199,7 @@
      * 
      * @param index Indexed?
      */
-    void setIndexed(boolean index);
+    MemberMetadata setIndexed(boolean index);
 
     /**
      * Accessor for whether it is indexed.
@@ -213,7 +213,7 @@
      * 
      * @param unique Unique?
      */
-    void setUnique(boolean unique);
+    MemberMetadata setUnique(boolean unique);
 
     /**
      * Accessor for whether unique.
@@ -227,7 +227,7 @@
      * 
      * @param cacheable Cacheable?
      */
-    void setCacheable(boolean cacheable);
+    MemberMetadata setCacheable(boolean cacheable);
 
     /**
      * Accessor for whether this is cacheable.
@@ -241,7 +241,7 @@
      * 
      * @param depth Recursion depth
      */
-    void setRecursionDepth(int depth);
+    MemberMetadata setRecursionDepth(int depth);
 
     /**
      * Accessor for the recursion depth (when part of a fetch group).
@@ -255,7 +255,7 @@
      * 
      * @param grp Load fetch group
      */
-    void setLoadFetchGroup(String type);
+    MemberMetadata setLoadFetchGroup(String type);
 
     /**
      * Accessor for the name of the load fetch group
@@ -269,7 +269,7 @@
      * 
      * @param str Value strategy
      */
-    void setValueStrategy(String str);
+    MemberMetadata setValueStrategy(String str);
 
     /**
      * Accessor for the value strategy
@@ -283,7 +283,7 @@
      * 
      * @param strategy The strategy
      */
-    void setCustomStrategy(String strategy);
+    MemberMetadata setCustomStrategy(String strategy);
 
     /**
      * Accessor for the custom strategy (overriding "strategy").
@@ -297,7 +297,7 @@
      * 
      * @param seq Sequence key
      */
-    void setSequence(String seq);
+    MemberMetadata setSequence(String seq);
 
     /**
      * Accessor for the sequence (when using value-strategy of "sequence")
@@ -312,7 +312,7 @@
      * 
      * @param map  mapped-by field/property
      */
-    void setMappedBy(String map);
+    MemberMetadata setMappedBy(String map);
 
     /**
      * Accessor for the mapped-by field/property

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/OrderMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/OrderMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/OrderMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/OrderMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param column Name of the version clumn
      */
-    void setColumn(String column);
+    OrderMetadata setColumn(String column);
 
     /**
      * Accessor for the version column name
@@ -40,7 +40,7 @@
      * 
      * @param mappedBy Field/property name in which to store the ordering in the element
      */
-    void setMappedBy(String mappedBy);
+    OrderMetadata setMappedBy(String mappedBy);
 
     /**
      * Accessor for the mapped-by field/property name in the element class.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/PackageMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/PackageMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/PackageMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/PackageMetadata.java Sat Dec 13 12:51:27 2008
@@ -35,7 +35,7 @@
      * 
      * @param catalog Catalog name
      */
-    void setCatalog(String catalog);
+    PackageMetadata setCatalog(String catalog);
 
     /**
      * Accessor for the catalog (ORM) that all classes in this package default
@@ -50,7 +50,7 @@
      * 
      * @param schema Schema name
      */
-    void setSchema(String schema);
+    PackageMetadata setSchema(String schema);
 
     /**
      * Accessor for the schema (ORM) that all classes in this package default to.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/PrimaryKeyMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param name Name of the PK constraint
      */
-    void setName(String strategy);
+    PrimaryKeyMetadata setName(String strategy);
 
     /**
      * Accessor for the name of the PK constraint.
@@ -40,7 +40,7 @@
      * 
      * @param column Name of the PK column
      */
-    void setColumn(String column);
+    PrimaryKeyMetadata setColumn(String column);
 
     /**
      * Accessor for the PK column name

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/PropertyMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/PropertyMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/PropertyMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/PropertyMetadata.java Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param name field name
      */
-    void setFieldName(String str);
+    PropertyMetadata setFieldName(String str);
 
     /**
      * Accessor for the field name

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/QueryMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/QueryMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/QueryMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/QueryMetadata.java Sat Dec 13 12:51:27 2008
@@ -33,7 +33,7 @@
      * 
      * @param lang Query language
      */
-    void setLanguage(String lang);
+    QueryMetadata setLanguage(String lang);
 
     /**
      * Accessor for the query language.
@@ -47,7 +47,7 @@
      * 
      * @param query The query
      */
-    void setQuery(String query);
+    QueryMetadata setQuery(String query);
 
     /**
      * Accessor for the single-string query.
@@ -61,7 +61,7 @@
      * 
      * @param clsName Result class name
      */
-    void setResultClass(String clsName);
+    QueryMetadata setResultClass(String clsName);
 
     /**
      * Accessor for the result class name for the query.
@@ -75,7 +75,7 @@
      * 
      * @param unique Whether they are unique
      */
-    void setUnique(boolean unique);
+    QueryMetadata setUnique(boolean unique);
 
     /**
      * Accessor for whether results from the query are unique
@@ -87,7 +87,7 @@
     /**
      * Method to set the query as not being modifiable from now.
      */
-    void setUnmodifiable();
+    QueryMetadata setUnmodifiable();
 
     /**
      * Accessor for whether the query is unmodifiable.
@@ -101,7 +101,7 @@
      * 
      * @param fetchPlanName name of the FetchPlan
      */
-    void setFetchPlan(String fetchPlanName);
+    QueryMetadata setFetchPlan(String fetchPlanName);
 
     /**
      * Accessor for the name of a fetch plan to use (if any).

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/SequenceMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/SequenceMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/SequenceMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/SequenceMetadata.java Sat Dec 13 12:51:27 2008
@@ -42,7 +42,7 @@
      * 
      * @param seq Datastore sequence name
      */
-    void setDatastoreSequence(String seq);
+    SequenceMetadata setDatastoreSequence(String seq);
 
     /**
      * Accessor for the name of the datastore sequence that this maps to
@@ -56,7 +56,7 @@
      * 
      * @param clsName Result class name
      */
-    void setFactoryClass(String clsName);
+    SequenceMetadata setFactoryClass(String clsName);
 
     /**
      * Accessor for the factory class for this sequence.

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=726267&r1=726266&r2=726267&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 Sat Dec 13 12:51:27 2008
@@ -26,7 +26,7 @@
      * 
      * @param name Name of the constraint
      */
-    void setName(String name);
+    UniqueMetadata setName(String name);
 
     /**
      * Accessor for the constraint name.
@@ -40,7 +40,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    UniqueMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -54,7 +54,7 @@
      * 
      * @param def Deferred?
      */
-    void setDeferred(boolean def);
+    UniqueMetadata setDeferred(boolean def);
 
     /**
      * Accessor for whether deferred.

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/ValueMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/ValueMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/ValueMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/ValueMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param column Column name
      */
-    void setColumn(String column);
+    ValueMetadata setColumn(String column);
 
     /**
      * Accessor for the name of the column.
@@ -42,7 +42,7 @@
      * 
      * @param table Table name
      */
-    void setTable(String table);
+    ValueMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.
@@ -56,7 +56,7 @@
      * 
      * @param action Delete action of the FK
      */
-    void setDeleteAction(ForeignKeyAction action);
+    ValueMetadata setDeleteAction(ForeignKeyAction action);
 
     /**
      * Accessor for the delete action of the FK
@@ -70,7 +70,7 @@
      * 
      * @param action Update action of the FK
      */
-    void setUpdateAction(ForeignKeyAction action);
+    ValueMetadata setUpdateAction(ForeignKeyAction action);
 
     /**
      * Accessor for the update action of the FK

Modified: db/jdo/trunk/api2/src/java/javax/jdo/metadata/VersionMetadata.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/metadata/VersionMetadata.java?rev=726267&r1=726266&r2=726267&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/metadata/VersionMetadata.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/metadata/VersionMetadata.java Sat Dec 13 12:51:27 2008
@@ -28,7 +28,7 @@
      * 
      * @param strategy The strategy
      */
-    void setStrategy(VersionStrategy strategy);
+    VersionMetadata setStrategy(VersionStrategy strategy);
 
     /**
      * Accessor for the version strategy.
@@ -42,7 +42,7 @@
      * 
      * @param column Name of the version clumn
      */
-    void setColumn(String column);
+    VersionMetadata setColumn(String column);
 
     /**
      * Accessor for the version column name
@@ -56,7 +56,7 @@
      * 
      * @param indexed Whether indexed (true | false | unique)
      */
-    void setIndexed(Indexed indexed);
+    VersionMetadata setIndexed(Indexed indexed);
 
     /**
      * Accessor for whether indexed (true|false|unique)