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: r548859 - in
 /db/jdo/trunk/api2/src/java/javax/jdo/annotations:
 Columns.java DatastoreIdentity.java Discriminator.java Element.java
Date: Tue, 19 Jun 2007 21:45:42 -0000
To: jdo-commits@db.apache.org
From: clr@apache.org
Message-Id: <20070619214542.DFF7F1A981A@eris.apache.org>

Author: clr
Date: Tue Jun 19 14:45:40 2007
New Revision: 548859

URL: http://svn.apache.org/viewvc?view=rev&rev=548859
Log:
Formatting changes

Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Columns.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/DatastoreIdentity.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java
    db/jdo/trunk/api2/src/java/javax/jdo/annotations/Element.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Columns.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Columns.java?view=diff&rev=548859&r1=548858&r2=548859
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Columns.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Columns.java Tue Jun 19 14:45:40 2007
@@ -27,7 +27,8 @@
  * @version 2.1
  * @since 2.1
  */
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) 
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Columns
 {
     /** The columns annotation information. */

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/DatastoreIdentity.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/DatastoreIdentity.java?view=diff&rev=548859&r1=548858&r2=548859
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/DatastoreIdentity.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/DatastoreIdentity.java Tue Jun 19 14:45:40 2007
@@ -28,7 +28,8 @@
  * @version 2.1
  * @since 2.1
  */
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE) 
+@Retention(RetentionPolicy.RUNTIME)
 public @interface DatastoreIdentity
 {
     /**

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java?view=diff&rev=548859&r1=548858&r2=548859
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Discriminator.java Tue Jun 19 14:45:40 2007
@@ -28,14 +28,17 @@
  * @version 2.1
  * @since 2.1
  */
-@Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE) 
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Discriminator
 {
     /**
-     * Strategy to use for discrimination checking.
-     * @return Strategy to use for discrimination checking.
+     * Strategy to use for discriminator. The discriminator determines
+     * the class associated with a row in the datastore.
+     * @return Strategy to use for discriminator.
      */
-    DiscriminatorStrategyType strategy() default DiscriminatorStrategyType.UNKNOWN;
+    DiscriminatorStrategyType strategy() 
+        default DiscriminatorStrategyType.UNKNOWN;
 
     /**
      * Whether the discriminator is indexed.
@@ -50,8 +53,10 @@
     String column() default "";
 
     /**
-     * The value for the discriminator for objects of this class (when using "value-map" strategy).
-     * @return The value for the discriminator for objects of this class (when using "value-map" strategy).
+     * The value for the discriminator for objects of this class 
+     * when using "value-map" strategy.
+     * @return The value for the discriminator for objects of this class 
+     * when using "value-map" strategy.
      */
     String value() default "";
 

Modified: db/jdo/trunk/api2/src/java/javax/jdo/annotations/Element.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/annotations/Element.java?view=diff&rev=548859&r1=548858&r2=548859
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/annotations/Element.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/annotations/Element.java Tue Jun 19 14:45:40 2007
@@ -29,26 +29,29 @@
  * @version 2.1
  * @since 2.1
  */
-@Target({ElementType.FIELD, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD}) 
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Element
 {
     /**
-     * The type of the element. This can be determined for an array, or if using JDK1.5 generics
-     * but is required otherwise.
+     * The type of the element. This can be determined for an array, 
+     * or if using JDK1.5 generics but is required otherwise.
      * @return The type of the element.
      */
     Class type() default void.class;
 
     /**
-     * Types of the elements. This is used as an alternative to "type" when the implementation supports
-     * specification of multiple element types. If "type" is specified then this is ignored.
+     * Types of the elements. This is used as an alternative to "type" when 
+     * the implementation supports specification of multiple element types. 
+     * If "type" is specified then this is ignored.
      * @return The types of elements
      */
     Class[] types() default {};
 
     /**
      * Whether the element is to be stored serialised (into a join table)
-     * @return Whether the element is to be stored serialised (into a join table)
+     * @return Whether the element is to be stored serialised 
+     * (into a join table)
      */
     String serialized() default "";
 
@@ -59,8 +62,10 @@
     String embedded() default "";
 
     /**
-     * Whether the element is dependent on the owner (and so will be deleted when it is)
-     * @return Whether the element is dependent on the owner (and so will be deleted when it is)
+     * Whether the element is dependent on the owner, and will be deleted 
+     * when the owner is deleted
+     * @return Whether the element is dependent on the owner, and will be 
+     * deleted when the owner is deleted
      */
     String dependent() default "";
 
@@ -95,14 +100,16 @@
     String indexed() default "";
 
     /**
-     * Whether the element column(s) contents should be considered unique
-     * @return Whether the element column(s) contents should be considered unique
+     * Whether the element column(s) contents are unique
+     * @return Whether the element column(s) contents are unique
      */
     String unique() default "";
 
     /**
-     * Name of a field in the target class that forms a bidirectional relation with this field
-     * @return Name of a field in the target class that forms a bidirectional relation with this field
+     * Name of the field in the target class that forms a bidirectional 
+     * relationship with this field. 
+     * @return Name of the field in the target class that forms a bidirectional 
+     * relationship with this field
      */
     String mappedBy() default "";