openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r421741 [10/15] - in /incubator/openjpa/trunk: openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/ openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/ openjpa-kernel/src/main/java/org/apache/openjpa/ant/ openjpa-kernel/src...
Date Thu, 13 Jul 2006 23:45:02 GMT
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,7 +43,7 @@
 import serp.util.Strings;
 
 /**
- * <p>Repository of and factory for persistent metadata.</p>
+ * Repository of and factory for persistent metadata.
  *
  * @since 3.0
  * @author Abe White
@@ -73,7 +73,7 @@
     public static final int VALIDATE_UNENHANCED = 4;
 
     /**
-     * Bit flag for runtime validation.  Requires that all classes are
+     * Bit flag for runtime validation. Requires that all classes are
      * enhanced, and performs extra field resolution steps.
      */
     public static final int VALIDATE_RUNTIME = 8;
@@ -130,14 +130,14 @@
         new LifecycleEventManager.ListenerList(3);
 
     /**
-     * Constructor.  Supply configuration.
+     * Constructor. Supply configuration.
      */
     public MetaDataRepository(OpenJPAConfiguration conf) {
         this(conf, conf.newMetaDataFactoryInstance());
     }
 
     /**
-     * Constructor.  Supply configuration and metadata generator.
+     * Constructor. Supply configuration and metadata generator.
      */
     public MetaDataRepository(OpenJPAConfiguration conf,
         MetaDataFactory factory) {
@@ -180,7 +180,7 @@
     }
 
     /**
-     * The metadata validation level.  Defaults to
+     * The metadata validation level. Defaults to
      * <code>VALIDATE_META | VALIDATE_UNENHANCED</code>.
      */
     public int getValidate() {
@@ -188,7 +188,7 @@
     }
 
     /**
-     * The metadata validation level.  Defaults to
+     * The metadata validation level. Defaults to
      * <code>VALIDATE_META | VALIDATE_UNENHANCED</code>.
      */
     public void setValidate(int validate) {
@@ -196,7 +196,7 @@
     }
 
     /**
-     * The metadata validation level.  Defaults to
+     * The metadata validation level. Defaults to
      * <code>VALIDATE_META | VALIDATE_MAPPING | VALIDATE_UNENHANCED</code>.
      */
     public void setValidate(int validate, boolean on) {
@@ -209,7 +209,7 @@
     }
 
     /**
-     * The metadata resolution mode.  Defaults to
+     * The metadata resolution mode. Defaults to
      * <code>MODE_META | MODE_MAPPING</code>.
      */
     public int getResolve() {
@@ -217,7 +217,7 @@
     }
 
     /**
-     * The metadata resolution mode.  Defaults to
+     * The metadata resolution mode. Defaults to
      * <code>MODE_META | MODE_MAPPING</code>.
      */
     public void setResolve(int mode) {
@@ -225,7 +225,7 @@
     }
 
     /**
-     * The metadata resolution mode.  Defaults to
+     * The metadata resolution mode. Defaults to
      * <code>MODE_META | MODE_MAPPING</code>.
      */
     public void setResolve(int mode, boolean on) {
@@ -238,7 +238,7 @@
     }
 
     /**
-     * The source mode determining what metadata to load.  Defaults to
+     * The source mode determining what metadata to load. Defaults to
      * <code>MODE_META | MODE_MAPPING | MODE_QUERY</code>.
      */
     public int getSourceMode() {
@@ -246,7 +246,7 @@
     }
 
     /**
-     * The source mode determining what metadata to load.  Defaults to
+     * The source mode determining what metadata to load. Defaults to
      * <code>MODE_META | MODE_MAPPING | MODE_QUERY</code>.
      */
     public void setSourceMode(int mode) {
@@ -254,7 +254,7 @@
     }
 
     /**
-     * The source mode determining what metadata to load.  Defaults to
+     * The source mode determining what metadata to load. Defaults to
      * <code>MODE_META | MODE_MAPPING | MODE_QUERY</code>.
      */
     public void setSourceMode(int mode, boolean on) {
@@ -269,9 +269,9 @@
     /**
      * Return the metadata for the given class.
      *
-     * @param    cls            the class to retrieve metadata for
-     * @param    envLoader    the environmental class loader, if any
-     * @param    mustExist    if true, throws a {@link MetaDataException}
+     * @param cls the class to retrieve metadata for
+     * @param envLoader the environmental class loader, if any
+     * @param mustExist if true, throws a {@link MetaDataException}
      * if no metadata is found
      */
     public synchronized ClassMetaData getMetaData(Class cls,
@@ -296,9 +296,9 @@
     /**
      * Return the metadata for the given alias name.
      *
-     * @param    alias        the alias to class to retrieve metadata for
-     * @param    envLoader    the environmental class loader, if any
-     * @param    mustExist    if true, throws a {@link MetaDataException}
+     * @param alias the alias to class to retrieve metadata for
+     * @param envLoader the environmental class loader, if any
+     * @param mustExist if true, throws a {@link MetaDataException}
      * if no metadata is found
      * @see ClassMetaData#getTypeAlias
      */
@@ -460,10 +460,10 @@
     }
 
     /**
-     * Prepare metadata for mapping resolution.  This method might map parts
+     * Prepare metadata for mapping resolution. This method might map parts
      * of the metadata that don't rely on other classes being mapped, but that
      * other classes might rely on during their own mapping (for example,
-     * primary key fields).  By default, this method only calls
+     * primary key fields). By default, this method only calls
      * {@link ClassMetaData#defineSuperclassFields}.
      */
     protected void prepareMapping(ClassMetaData meta) {
@@ -471,7 +471,7 @@
     }
 
     /**
-     * Resolve the given metadata if needed.  There are three goals:
+     * Resolve the given metadata if needed. There are three goals:
      * <ol>
      * <li>Make sure no unresolved metadata gets back to the client.</li>
      * <li>Avoid infinite reentrant calls for mutually-dependent metadatas by
@@ -479,8 +479,7 @@
      * <li>Always make sure the superclass metadata is resolved before the
      * subclass metadata so that the subclass can access the super's list
      * of fields.</li>
-     * </ol>
-     * Note that the code calling this method is synchronized, so this
+     * </ol> Note that the code calling this method is synchronized, so this
      * method doesn't have to be.
      */
     private void resolve(ClassMetaData meta) {
@@ -704,7 +703,7 @@
 
     /**
      * Create a new metadata, populate it with default information, add it to
-     * the repository, and return it.  Use the default access type.
+     * the repository, and return it. Use the default access type.
      */
     public ClassMetaData addMetaData(Class cls) {
         return addMetaData(cls, ClassMetaData.ACCESS_UNKNOWN);
@@ -776,7 +775,7 @@
     }
 
     /**
-     * Create an {@link Order} for the given field and declaration.  This
+     * Create an {@link Order} for the given field and declaration. This
      * method delegates to {@link #newRelatedFieldOrder} and
      * {@link #newValueFieldOrder} by default.
      */
@@ -855,9 +854,9 @@
      * Return the least-derived class metadata for the given application
      * identity object.
      *
-     * @param    oid            the oid to get the metadata for
-     * @param    envLoader    the environmental class loader, if any
-     * @param    mustExist    if true, throws a {@link MetaDataException}
+     * @param oid the oid to get the metadata for
+     * @param envLoader the environmental class loader, if any
+     * @param mustExist if true, throws a {@link MetaDataException}
      * if no metadata is found
      */
     public ClassMetaData getMetaData(Object oid, ClassLoader envLoader,
@@ -952,9 +951,9 @@
      * Return all least-derived metadatas with some mapped assignable type that
      * implement the given class.
      *
-     * @param    cls            the class or interface to retrieve implementors for
-     * @param    envLoader    the environmental class loader, if any
-     * @param    mustExist    if true, throws a {@link MetaDataException}
+     * @param cls the class or interface to retrieve implementors for
+     * @param envLoader the environmental class loader, if any
+     * @param mustExist if true, throws a {@link MetaDataException}
      * if no metadata is found
      */
     public ClassMetaData[] getImplementorMetaDatas(Class cls,
@@ -992,7 +991,7 @@
     }
 
     /**
-     * Clear the cache of parsed metadata.  This method also clears the
+     * Clear the cache of parsed metadata. This method also clears the
      * internal {@link MetaDataFactory MetaDataFactory}'s cache.
      */
     public synchronized void clear() {
@@ -1014,10 +1013,9 @@
      * Return the set of configured persistent classes, or null if the user
      * did not configure any.
      *
-     * @param    devpath        if true, search for metadata files in directories
-     * in the classpath if no classes are configured
-     * explicitly
-     * @param    envLoader    the class loader to use, or null for default
+     * @param devpath if true, search for metadata files in directories
+     * in the classpath if no classes are configured explicitly
+     * @param envLoader the class loader to use, or null for default
      */
     public synchronized Set getPersistentTypeNames(boolean devpath,
         ClassLoader envLoader) {
@@ -1031,10 +1029,9 @@
      * application loading the classes before performing operations that
      * might involve them.
      *
-     * @param    devpath        if true, search for metadata files in directories
-     * in the classpath if the no classes are configured
-     * explicitly
-     * @param    envLoader    the class loader to use, or null for default
+     * @param devpath if true, search for metadata files in directories
+     * in the classpath if the no classes are configured explicitly
+     * @param envLoader the class loader to use, or null for default
      * @return the loaded classes, or empty collection if none
      */
     public synchronized Collection loadPersistentTypes(boolean devpath,
@@ -1076,7 +1073,7 @@
     }
 
     /**
-     * Return all known subclasses for the given class mapping.  Note
+     * Return all known subclasses for the given class mapping. Note
      * that this method only works during runtime when the repository is
      * registered as a {@link RegisterClassListener}.
      */
@@ -1394,7 +1391,7 @@
     }
 
     /**
-     * Return a unique key for a given class / name.  The class
+     * Return a unique key for a given class / name. The class
      * argument can be null.
      */
     protected static Object getQueryKey(Class cls, String name) {
@@ -1571,8 +1568,7 @@
     }
 
     /**
-     * Free the resources used by this repository.  Closes all user
-     * sequences.
+     * Free the resources used by this repository. Closes all user sequences.
      */
     public synchronized void close() {
         SequenceMetaData[] smds = getSequenceMetaDatas();
@@ -1582,7 +1578,7 @@
     }
 
     /**
-     *	Query key struct.
+     * Query key struct.
      */
     private static class QueryKey {
 

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,7 +36,7 @@
 import org.apache.openjpa.util.MetaDataException;
 
 /**
- * <p>Tool for generating default metadata.</p>
+ * Tool for generating default metadata.
  *
  * @since 3.0
  * @author Abe White
@@ -64,7 +64,7 @@
     private boolean _flush = false;
 
     /**
-     * Constructor.  Supply configuration and action.
+     * Constructor. Supply configuration and action.
      */
     public MetaDataTool(OpenJPAConfiguration conf, String action) {
         _conf = conf;
@@ -140,7 +140,7 @@
     }
 
     /**
-     * Reset state.  This is called automatically after every {@link #record}.
+     * Reset state. This is called automatically after every {@link #record}.
      */
     public void clear() {
         _repos = null;
@@ -221,15 +221,14 @@
     }
 
     /**
-     * <p>Usage: java org.apache.openjpa.meta.MetaDataTool [option]*
+     * Usage: java org.apache.openjpa.meta.MetaDataTool [option]*
      * [-action/-a &lt;add | drop&gt;]
-     * &lt;class name | .java file | .class file&gt;+</p>
-     * <p/>
-     * <p>Where the following options are recognized.
+     * &lt;class name | .java file | .class file&gt;+
+     *  Where the following options are recognized.
      * <ul>
      * <li><i>-properties/-p &lt;properties file or resource&gt;</i>: The path
      * or resource name of a OpenJPA properties file containing information
-     * as outlined in {@link OpenJPAConfiguration}.  Optional.</li>
+     * as outlined in {@link OpenJPAConfiguration}. Optional.</li>
      * <li><i>-&lt;property name&gt; &lt;property value&gt;</i>: All bean
      * properties of the OpenJPA {@link OpenJPAConfiguration} can be set by
      * using their names and supplying a value.</li>
@@ -237,14 +236,13 @@
      * or resource name of a file the metadata should be generated to.
      * If the given file already contains metadata, the generated
      * metadata will be merged into the existing document.</li>
-     * </ul></p>
-     * <p/>
-     * <p>The available actions are:
+     * </ul>
+     *  The available actions are:
      * <ul>
-     * <li><i>add</i>: Generate default metadata for the given classes.  This
+     * <li><i>add</i>: Generate default metadata for the given classes. This
      * is the default action.</li>
      * <li><i>drop</i>: Remove existing metadata for the given classes.</li>
-     * </ul></p>
+     * </ul>
      */
     public static void main(String[] args)
         throws IOException {
@@ -261,7 +259,7 @@
     }
 
     /**
-     * Run the tool.  Returns false if any invalid options were given.
+     * Run the tool. Returns false if any invalid options were given.
      */
     public static boolean run(OpenJPAConfiguration conf, String[] args,
         Options opts)
@@ -291,7 +289,7 @@
     }
 
     /**
-     * Run the tool.  Return false if invalid options were given.  The given
+     * Run the tool. Return false if invalid options were given. The given
      * repository may be null.
      */
     public static boolean run(OpenJPAConfiguration conf, String[] args,
@@ -338,7 +336,7 @@
     }
 
     /**
-     *	Run flags.
+     * Run flags.
      */
     public static class Flags {
 

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import org.apache.openjpa.lib.meta.ClassArgParser;
 
 /**
- * </p>No-op metadata I/O to prevent attempts to load other classes.</p>
+ * No-op metadata I/O to prevent attempts to load other classes.
  *
  * @author Abe White
  * @nojavadoc

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@
 import java.util.Comparator;
 
 /**
- * <p>Order a field.</p>
+ * Order a field.
  *
  * @author Abe White
  */
@@ -40,8 +40,8 @@
     public boolean isAscending();
 
     /**
-     *	Return a comparator for ordering by this element, or null if
-     *	the ordering is done in the datastore.
+     * Return a comparator for ordering by this element, or null if
+     * the ordering is done in the datastore.
      */
     public Comparator getComparator ();
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,9 +25,9 @@
 import org.apache.openjpa.util.InternalException;
 
 /**
- * <p>Mostly-unimplemented state manager type whose sole purpose is to
+ * Mostly-unimplemented state manager type whose sole purpose is to
  * check the initial value of all SCO container fields for their initialized
- * types and comparators.</p>
+ * types and comparators.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,10 +24,9 @@
 import org.apache.openjpa.lib.xml.Commentable;
 
 /**
- * <p>Holds metadata about named queries.</p>
- * <p/>
- * <p>Information stored in this instance gets transfered to
- * new {@link Query} instances.</p>
+ * Holds metadata about named queries.
+ *  Information stored in this instance gets transfered to
+ * new {@link Query} instances.
  *
  * @author Steve Kim
  */
@@ -179,7 +178,7 @@
 
     /**
      * Set query template information into the given concrete
-     * query instance.  However, the language, query string, and
+     * query instance. However, the language, query string, and
      * candidate class are assumed to be declared in the query
      * instantiation, and hints are not transferred.
      */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,7 +30,7 @@
 import org.apache.openjpa.util.OpenJPAException;
 
 /**
- * <p>Metadata about a named sequence.</p>
+ * Metadata about a named sequence.
  *
  * @author Abe White
  * @since 4.0
@@ -277,7 +277,7 @@
     }
 
     /**
-     * Create a new plugin value for sequences.  Returns a standard
+     * Create a new plugin value for sequences. Returns a standard
      * {@link SeqValue} by default.
      */
     protected PluginValue newPluginValue(String property) {
@@ -295,7 +295,7 @@
     }
 
     /**
-     * Add a string property to the buffer.  Nothing will be added if value
+     * Add a string property to the buffer. Nothing will be added if value
      * is null or empty string.
      */
     protected void appendProperty(StringBuffer props, String name, String val) {
@@ -307,8 +307,7 @@
     }
 
     /**
-     * Add an int property to the buffer.  Nothing will be added if value
-     * is -1.
+     * Add an int property to the buffer. Nothing will be added if value is -1.
      */
     protected void appendProperty(StringBuffer props, String name, int val) {
         if (val == -1)
@@ -346,13 +345,13 @@
     }
 
     /**
-     *	Allow facades to supply adapters from a spec sequence type to the
-     *	OpenJPA sequence type.
+     * Allow facades to supply adapters from a spec sequence type to the
+     * OpenJPA sequence type.
      */
     public static interface SequenceFactory {
 
         /**
-         *	Transform the given class named in metadata into a sequence.
+         * Transform the given class named in metadata into a sequence.
          */
 		public Seq toSequence (Class cls, String props)
 			throws Exception;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/UpdateStrategies.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/UpdateStrategies.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/UpdateStrategies.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/UpdateStrategies.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@
 import org.apache.openjpa.lib.util.StringDistance;
 
 /**
- * <p>Strategies for persistent value updates.</p>
+ * Strategies for persistent value updates.
  *
  * @author Abe White
  * @since 4.0
@@ -64,7 +64,7 @@
     }
 
     /**
-     *	Convert the given strategy name to its constant.
+     * Convert the given strategy name to its constant.
      */
     public static int getCode(String val, Object context) {
         if ("none".equals(val))

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,8 @@
 package org.apache.openjpa.meta;
 
 /**
- * <p>Holds metadata on a value; this could be a field value, key value, or
- * element value.</p>
+ * Holds metadata on a value; this could be a field value, key value, or
+ * element value.
  *
  * @since 4.0
  * @author Abe White
@@ -36,7 +36,7 @@
     public int CASCADE_IMMEDIATE = 1;
 
     /**
-     * Use automatic cascade behavior.  Persistence-by-reachability,
+     * Use automatic cascade behavior. Persistence-by-reachability,
      * delete-dependent, attach-if-detached, etc.
      */
     public int CASCADE_AUTO = 2;
@@ -83,7 +83,7 @@
     public ClassMetaData getTypeMetaData();
 
     /**
-     * Return the declared class of the value.  This can differ
+     * Return the declared class of the value. This can differ
      * from the return value of {@link #getType} if the user indicates
      * a different type or the value has an externalizer.
      */
@@ -95,14 +95,14 @@
     public void setDeclaredType(Class type);
 
     /**
-     * Return the declared type code of the value.  This can differ
+     * Return the declared type code of the value. This can differ
      * from the return value of {@link #getTypeCode} if the user indicates
      * a different type or the value has an externalizer.
      */
     public int getDeclaredTypeCode();
 
     /**
-     * Set the type code for the value.  The type code is usually
+     * Set the type code for the value. The type code is usually
      * computed automatically, but it can be useful to set it explicitly
      * when creating metadatas from scratch.
      */
@@ -121,7 +121,7 @@
     /**
      * This attribute is a hint to the implementation to store this value
      * in the same structure as the class, rather than as a separate datastore
-     * structure.  Defaults to true if the field is not a collection or map
+     * structure. Defaults to true if the field is not a collection or map
      * or persistence-capable object; defaults to false otherwise.
      * Implementations are permitted to ignore this attribute.
      */
@@ -130,7 +130,7 @@
     /**
      * This attribute is a hint to the implementation to store this value
      * in the same structure as the class, rather than as a separate datastore
-     * structure.  Defaults to true if the field is not a collection or map
+     * structure. Defaults to true if the field is not a collection or map
      * or persistence-capable objects; defaults to false otherwise.
      * Implementations are permitted to ignore this attribute.
      */
@@ -152,8 +152,8 @@
     public ClassMetaData addEmbeddedMetaData();
 
     /**
-     * Cascade behavior for delete operation.  Only applies to
-     * persistence-capable values.  Options are:<br />
+     * Cascade behavior for delete operation. Only applies to
+     * persistence-capable values. Options are:<br />
      * <ul>
      * <li><code>CASCADE_NONE</code>: No cascades.</li>
      * <li><code>CASCADE_IMMEDIATE</code>: Value is deleted immediately when
@@ -169,15 +169,15 @@
     /**
      * Cascade behavior for deletion.
      *
-     * @see    #getCascadeDelete
+     * @see #getCascadeDelete
      */
     public void setCascadeDelete(int cascade);
 
     /**
-     * Cascade behavior for persist operation.  Only applies to
-     * persistence-capable values.  Options are:<br />
+     * Cascade behavior for persist operation. Only applies to
+     * persistence-capable values. Options are:<br />
      * <ul>
-     * <li><code>CASCADE_NONE</code>: No cascades.  If a transient relation
+     * <li><code>CASCADE_NONE</code>: No cascades. If a transient relation
      * is held at flush, an error is thrown.</li>
      * <li><code>CASCADE_IMMEDIATE</code>: Value is persisted immediately when
      * the owning object is persisted.</li>
@@ -189,15 +189,15 @@
     /**
      * Cascade behavior for persist operation.
      *
-     * @see    #getCascadePersist
+     * @see #getCascadePersist
      */
     public void setCascadePersist(int cascade);
 
     /**
-     * Cascade behavior for attach operation.  Only applies to
-     * persistence-capable values.  Options are:<br />
+     * Cascade behavior for attach operation. Only applies to
+     * persistence-capable values. Options are:<br />
      * <ul>
-     * <li><code>CASCADE_NONE</code>: No cascades of attach.  Relation
+     * <li><code>CASCADE_NONE</code>: No cascades of attach. Relation
      * remains detached.</li>
      * <li><code>CASCADE_IMMEDIATE</code>: Value is attached immediately.</li>
      * </ul>
@@ -207,13 +207,13 @@
     /**
      * Cascade behavior for attach operation.
      *
-     * @see    #getCascadeAttach
+     * @see #getCascadeAttach
      */
     public void setCascadeAttach(int cascade);
 
     /**
-     * Cascade behavior for refresh operation.  Only applies to
-     * persistence-capable values.  Options are:<br />
+     * Cascade behavior for refresh operation. Only applies to
+     * persistence-capable values. Options are:<br />
      * <ul>
      * <li><code>CASCADE_NONE</code>: No cascades of refresh.</li>
      * <li><code>CASCADE_IMMEDIATE</code>: Persistent value object is also
@@ -227,7 +227,7 @@
     /**
      * Cascade behavior for refresh operation.
      *
-     * @see    #getCascadeRefresh
+     * @see #getCascadeRefresh
      */
     public void setCascadeRefresh(int cascade);
 
@@ -242,21 +242,21 @@
     public void setSerialized(boolean serialized);
 
     /**
-     * The field that this value shares a mapping with.  Currently the only
+     * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
     public String getValueMappedBy();
 
     /**
-     * The field that this value shares a mapping with.  Currently the only
+     * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
     public void setValueMappedBy(String mapped);
 
     /**
-     * The field that this value shares a mapping with.  Currently the only
+     * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
@@ -288,13 +288,13 @@
     public void setResolve(int mode, boolean on);
 
     /**
-     * Resolve and validate metadata.  Return true if already resolved.
+     * Resolve and validate metadata. Return true if already resolved.
      */
     public boolean resolve(int mode);
 
     /**
-     *	Copy state from the given value to this one.  Do not copy mapping
-      *	information.
+     * Copy state from the given value to this one. Do not copy mapping
+      * information.
      */
     public void copy (ValueMetaData vmd);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Default {@link ValueMetaData} implementation.</p>
+ * Default {@link ValueMetaData} implementation.
  *
  * @author Abe White
  * @nojavadoc
@@ -235,7 +235,7 @@
 
     public int getCascadeAttach() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT
-            || !isDeclaredTypePC())    // attach acts on declared type
+            || !isDeclaredTypePC()) // attach acts on declared type
             return CASCADE_NONE;
         return _attach;
     }
@@ -248,7 +248,7 @@
 
     public int getCascadeRefresh() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT
-            || !isDeclaredTypePC())    // refresh acts on declared type
+            || !isDeclaredTypePC()) // refresh acts on declared type
             return CASCADE_NONE;
         return _refresh;
     }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueStrategies.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,7 +23,7 @@
 import serp.util.Numbers;
 
 /**
- * <p>Strategies for persistent value generation.</p>
+ * Strategies for persistent value generation.
  *
  * @author Abe White
  * @since 4.0
@@ -115,7 +115,7 @@
     }
 
     /**
-     *	Assert that the given strategy is supported by the current runtime.
+     * Assert that the given strategy is supported by the current runtime.
      */
     public static void assertSupported(int strategy, MetaDataContext context,
         String attributeName) {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import org.apache.commons.collections.set.MapBackedSet;
 
 /**
- * <p>Base class that provides utilities to change trackers.</p>
+ * Base class that provides utilities to change trackers.
  *
  * @author Abe White
  * @nojavadoc
@@ -33,17 +33,17 @@
     implements ChangeTracker {
 
     /**
-     * Collection of added items.  May be null.
+     * Collection of added items. May be null.
      */
     protected Collection add = null;
 
     /**
-     * Collection of removed items.  May be null.
+     * Collection of removed items. May be null.
      */
     protected Collection rem = null;
 
     /**
-     * Collection of changed items.  May be null.
+     * Collection of changed items. May be null.
      */
     protected Collection change = null;
 
@@ -60,7 +60,7 @@
 
     /**
      * Whether to automatically stop tracking when the number of changes
-     * exceeds the container size.  Defaults to true.
+     * exceeds the container size. Defaults to true.
      */
     public boolean getAutoOff() {
         return _autoOff;
@@ -68,7 +68,7 @@
 
     /**
      * Whether to automatically stop tracking when the number of changes
-     * exceeds the container size.  Defaults to true.
+     * exceeds the container size. Defaults to true.
      */
     public void setAutoOff(boolean autoOff) {
         _autoOff = autoOff;
@@ -86,8 +86,8 @@
     }
 
     /**
-     * Return the initial sequence value for this proxy.  Typically this is
-     * the container size.  Assumes an unordered collection by default,
+     * Return the initial sequence value for this proxy. Typically this is
+     * the container size. Assumes an unordered collection by default,
      * returning 0.
      */
     protected int initialSequence() {
@@ -179,7 +179,7 @@
     }
 
     /**
-     * Create a new set for storing adds/removes/changes.  Takes into account
+     * Create a new set for storing adds/removes/changes. Takes into account
      * whether we need to use an identity set or standard set.
      */
     protected Set newSet() {
@@ -190,7 +190,7 @@
 
     /**
      * Set whether to use identity-based datastructures, and switch our current
-     * datastructures appropriately if needed.  We use identity structures for
+     * datastructures appropriately if needed. We use identity structures for
      * PC types in case the user has coded them such that two objects with
      * different identities can compare equals().
      */
@@ -209,7 +209,7 @@
     }
 
     /**
-     *	Switch from an identity structure to a standard one, or vice versa.
+     * Switch from an identity structure to a standard one, or vice versa.
      */
     private static Collection switchStructure(Collection cur,
         boolean identity) {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,14 +32,14 @@
 import org.apache.openjpa.lib.util.Localizer;
 
 /**
- * <p>A collection proxy designed for collections backed by extremely large
+ * A collection proxy designed for collections backed by extremely large
  * result sets in which each call to {@link #iterator} may perform a database
- * query.  Changes to the collection are tracked through a
- * {@link ChangeTracker}.  This collection has the following limitations:
+ * query. Changes to the collection are tracked through a
+ * {@link ChangeTracker}. This collection has the following limitations:
  * <ul>
  * <li>The <code>size</code> method may return {@link Integer#MAX_VALUE}.</li>
  * <li>The collection cannot contain duplicate elements.</li>
- * </ul></p>
+ * </ul>
  *
  * @author Abe White
  */
@@ -61,9 +61,9 @@
     /**
      * Constructor.
      *
-     * @param    elementType        the allowed type of elements, or null for no
+     * @param elementType the allowed type of elements, or null for no
      * restrictions
-     * @param    ordered            true if this collection is ordered
+     * @param ordered true if this collection is ordered
      */
     public AbstractLRSProxyCollection(Class elementType, boolean ordered,
         OpenJPAConfiguration conf) {
@@ -279,7 +279,7 @@
 
     /**
      * Implement this method to return an iterator over the contents of the
-     * collection.  This method may be invoked multiple times.  The returned
+     * collection. This method may be invoked multiple times. The returned
      * iterator does not have to support the {@link Iterator#remove} method,
      * and may implement {@link org.apache.openjpa.lib.util.Closeable}.
      */
@@ -356,7 +356,7 @@
     }
 
     /**
-     *	Wrapper around our filtering iterator chain.
+     * Wrapper around our filtering iterator chain.
      */
     private class Itr
         implements Iterator, Closeable {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,14 +36,14 @@
 import org.apache.openjpa.lib.util.Localizer;
 
 /**
- * <p>A map proxy designed for maps backed by extremely large result sets in
+ * A map proxy designed for maps backed by extremely large result sets in
  * which each call to {@link #get} or {@link #containsKey} may perform a
- * database query.  Changes to the map are tracked through a
- * {@link ChangeTracker}.  This map has the following limitations:
+ * database query. Changes to the map are tracked through a
+ * {@link ChangeTracker}. This map has the following limitations:
  * <ul>
  * <li>The <code>size</code> method may return {@link Integer#MAX_VALUE}.</li>
  * <li>Null keys and values are not supported.</li>
- * </ul></p>
+ * </ul>
  *
  * @author Abe White
  */
@@ -329,9 +329,9 @@
 
     /**
      * Implement this method to return an iterator over the entries
-     * in the map.  Each returned object must implement the
-     * <code>Map.Entry</code> interface.  This method may be invoked multiple
-     * times.  The iterator does not have to support the
+     * in the map. Each returned object must implement the
+     * <code>Map.Entry</code> interface. This method may be invoked multiple
+     * times. The iterator does not have to support the
      * {@link Iterator#remove} method, and may implement
      * {@link org.apache.openjpa.lib.util.Closeable}.
      */
@@ -432,7 +432,7 @@
     }
 
     /**
-     *	Wrapper around our filtering iterator chain.
+     * Wrapper around our filtering iterator chain.
      */
     private class Itr
         implements Iterator, Closeable {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,7 +34,7 @@
 import serp.util.Numbers;
 
 /**
- * <p>Utility class for manipulating application object ids.</p>
+ * Utility class for manipulating application object ids.
  *
  * @author Abe White
  * @nojavadoc
@@ -42,7 +42,7 @@
 public class ApplicationIds {
 
     /**
-     * Return the primary key values for the given object id.  The values
+     * Return the primary key values for the given object id. The values
      * will be returned in the same order as the metadata primary key fields.
      */
     public static Object[] toPKValues(Object oid, ClassMetaData meta) {
@@ -397,7 +397,7 @@
     }
 
     /**
-     *	Helper class used to transfer pk values to/from application oids.
+     * Helper class used to transfer pk values to/from application oids.
      */
     private static class PrimaryKeyFieldManager
         implements FieldManager {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,10 +20,10 @@
 import org.apache.commons.lang.ObjectUtils;
 
 /**
- * <p>Utilities for dealing with a simple state image consisting of an
+ * Utilities for dealing with a simple state image consisting of an
  * <code>Object[]</code> of field values with one extra index containing a
- * {@link BitSet} of loaded fields.  This simplistic state image might be used
- * for optimistic versioning.</p>
+ * {@link BitSet} of loaded fields. This simplistic state image might be used
+ * for optimistic versioning.
  *
  * @author Abe White
  * @nojavadoc
@@ -76,8 +76,8 @@
     }
 
     /**
-     *	Return whether the given images are equivalent from an optimistic
-     *	locking perspective.
+     * Return whether the given images are equivalent from an optimistic
+     * locking perspective.
      */
     public static boolean sameVersion(Object[] state1, Object[] state2) {
         if (state1 == state2)

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -152,7 +152,7 @@
     }
 
     /**
-     * Put the given entry into the given map.  Allows subclasses to
+     * Put the given entry into the given map. Allows subclasses to
      * take additional actions.
      */
     protected Object put(Map map, Object key, Object value) {
@@ -160,7 +160,7 @@
     }
 
     /**
-     * Remove the given key from the given map.  Allows subclasses to
+     * Remove the given key from the given map. Allows subclasses to
      * take additional actions.
      */
     protected Object remove(Map map, Object key) {
@@ -260,9 +260,9 @@
     }
 
     /**
-     * Locks the given key and its value into the map.  Objects pinned into
+     * Locks the given key and its value into the map. Objects pinned into
      * the map are not counted towards the maximum cache size, and are never
-     * evicted implicitly.  You may pin keys for which no value is in the map.
+     * evicted implicitly. You may pin keys for which no value is in the map.
      *
      * @return true if the givne key's value was pinned; false if no value
      * for the given key is cached
@@ -320,10 +320,10 @@
      * requirements or through garbage collection of soft references.
      * It is invoked with <code>expired</code> set to <code>false</code>
      * when an object is explicitly removed via the {@link #remove} or
-     * {@link #clear} methods.  This may be invoked more than once for a
+     * {@link #clear} methods. This may be invoked more than once for a
      * given entry.
      *
-     * @param    value    may be null if the value was a soft reference that has
+     * @param value may be null if the value was a soft reference that has
      * been GCd
      * @since 2.5.0
      */
@@ -331,7 +331,7 @@
     }
 
     /**
-     * Invoked when an entry is added to the cache.  This may be invoked
+     * Invoked when an entry is added to the cache. This may be invoked
      * more than once for an entry.
      */
     protected void entryAdded(Object key, Object value) {
@@ -586,7 +586,7 @@
     }
 
     /**
-     *	Iterator over all entries.
+     * Iterator over all entries.
      */
     private class EntryIterator
         implements Iterator, Predicate {
@@ -646,5 +646,4 @@
 		}
 	}
 }
-
 

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Exception type thrown when an error occurs in a callback.</p>
+ * Exception type thrown when an error occurs in a callback.
  *
  * @since 4.0
  * @author Marc Prud'hommeaux

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,9 +18,9 @@
 import java.util.Collection;
 
 /**
- * <p>Interface for components that track changes to containers at a
- * fine-grained level.  Proxies that use change trackers might have better
- * update performance than non-tracking proxies.</p>
+ * Interface for components that track changes to containers at a
+ * fine-grained level. Proxies that use change trackers might have better
+ * update performance than non-tracking proxies.
  *
  * @author Abe White
  */
@@ -56,8 +56,8 @@
     public Collection getRemoved();
 
     /**
-     * Return the set of elements that have changed.  In maps, this marks a
-     * possible change in value for a key.  In collections, this marks an
+     * Return the set of elements that have changed. In maps, this marks a
+     * possible change in value for a key. In collections, this marks an
      * element that has been removed and re-added.
      */
     public Collection getChanged();
@@ -67,20 +67,20 @@
      * If the data store keeps this proxy's data in sequence order but allows
      * holes for removed objects, the implementation can set the next
      * sequence at load time, then retrieve it and start from there for
-     * added objects at flush time.  This value is set back to 0 if the
-     * proxy stops tracking changes.  For ordered proxies, it is set to the
+     * added objects at flush time. This value is set back to 0 if the
+     * proxy stops tracking changes. For ordered proxies, it is set to the
      * proxy's size when the proxy starts tracking changes again.
      */
     public int getNextSequence();
 
     /**
-     *	The maximum element sequence value for this proxy at load time.
-     *	If the data store keeps this proxy's data in sequence order but allows
-     *	holes for removed objects, the implementation can set the next
-     *	sequence at load time, then retrieve it and start from there for
-     *	added objects at flush time.  This value is set back to 0 if the
-     *	proxy stops tracking changes.  For ordered proxies, it is set to the
-     *	proxy's size when the proxy starts tracking changes again.
+     * The maximum element sequence value for this proxy at load time.
+     * If the data store keeps this proxy's data in sequence order but allows
+     * holes for removed objects, the implementation can set the next
+     * sequence at load time, then retrieve it and start from there for
+     * added objects at flush time. This value is set back to 0 if the
+     * proxy stops tracking changes. For ordered proxies, it is set to the
+     * proxy's size when the proxy starts tracking changes again.
      */
     public void setNextSequence (int seq);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@
 import org.apache.openjpa.lib.util.MultiClassLoader;
 
 /**
- * <p>Interface to customize the loading of classes under OpenJPA.</p>
+ * Interface to customize the loading of classes under OpenJPA.
  *
  * @since 3.0
  * @author Marc Prud'hommeaux
@@ -31,9 +31,8 @@
      * This can be a standard class loader, or a customized loader such
      * as a {@link MultiClassLoader}.
      *
-     * @param    contextClass    the context class; may be null if no context
-     * class
-     * @param    envLoader        the thread's context class loader when the
+     * @param contextClass the context class; may be null if no context class
+     * @param envLoader the thread's context class loader when the
      * persistence environment (i.e. broker)
      * was obtained; may be null if operating outside
      * the context of persistence environment

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@
 import org.apache.openjpa.lib.util.MultiClassLoader;
 
 /**
- * <p>Default class resolver implementation.</p>
+ * Default class resolver implementation.
  *
  * @since 3.0
  * @author Abe White

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,10 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Change tracker that can be used for collections.  If the user calls
+ * Change tracker that can be used for collections. If the user calls
  * any mutating methods on the collection that do not have an equivalent in
  * this change tracker, then you must call {@link #stopTracking} after
- * applying the operation to the collection.</p>
+ * applying the operation to the collection.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 
 /**
- * <p>Default {@link CollectionChangeTracker}.</p>
+ * Default {@link CollectionChangeTracker}.
  *
  * @author Abe White
  * @nojavadoc
@@ -37,10 +37,9 @@
     /**
      * Constructor.
      *
-     * @param    coll    the collection to delegate to
-     * @param    dups    true if the collection allows duplicates, false
-     * otherwise
-     * @param    order    true if the collection is ordered, false otherwise
+     * @param coll the collection to delegate to
+     * @param dups true if the collection allows duplicates, false otherwise
+     * @param order true if the collection is ordered, false otherwise
      */
     public CollectionChangeTrackerImpl(Collection coll, boolean dups,
         boolean order, OpenJPAConfiguration conf) {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,8 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Interface supplying additional exception information.  All OpenJPA
- * exceptions implement this interface.</p>
+ * Interface supplying additional exception information. All OpenJPA
+ * exceptions implement this interface.
  *
  * @author Abe White
  * @since 4.0
@@ -33,7 +33,7 @@
     /**
      * Exception message.
      *
-     * @see    Throwable#getMessage
+     * @see Throwable#getMessage
      */
     public String getMessage();
 
@@ -48,7 +48,7 @@
     /**
      * Stack.
      *
-     * @see    Throwable#printStackTrace
+     * @see Throwable#printStackTrace
      */
     public void printStackTrace();
 
@@ -73,7 +73,7 @@
     public Throwable[] getNestedThrowables();
 
     /**
-     *	The failed object.
+     * The failed object.
      */
     public Object getFailedObject ();
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -235,8 +235,8 @@
     }
 
     /**
-     *	Return the object id for <code>ob</code> if it has one, or
-     *	<code>null</code> otherwise.
+     * Return the object id for <code>ob</code> if it has one, or
+     * <code>null</code> otherwise.
      */
     private static Object getObjectId(Object ob) {
         if (ob instanceof PersistenceCapable

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>General exception type.</p>
+ * General exception type.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,8 +20,8 @@
 import serp.util.Numbers;
 
 /**
- * <p>Datastore identity type.  Implementations may choose to use this type,
- * or choose to use their own datastore identity values.</p>
+ * Datastore identity type. Implementations may choose to use this type,
+ * or choose to use their own datastore identity values.
  *
  * @author Abe White
  */
@@ -100,7 +100,7 @@
         else {
             // allow either stringified long or result of Id.toString
             int dash = key.indexOf('-');
-            if (dash > 0)    // don't check for -1; might be negative number
+            if (dash > 0) // don't check for -1; might be negative number
                 key = key.substring(dash + 1);
             _id = Long.parseLong(key);
         }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -42,7 +42,7 @@
 import serp.util.Strings;
 
 /**
- * <p>Helper for OpenJPA back-ends.</p>
+ * Helper for OpenJPA back-ends.
  *
  * @since 3.0
  * @author Abe White
@@ -89,10 +89,10 @@
     }
 
     /**
-     * Helper for store manager implementations.  This method simply delegates
+     * Helper for store manager implementations. This method simply delegates
      * to the proper singular method for each state manager.
      *
-     * @see    StoreManager#loadAll
+     * @see StoreManager#loadAll
      * @since 4.0
      */
     public static Collection loadAll(Collection sms, StoreManager store,
@@ -130,7 +130,7 @@
     }
 
     /**
-     * Generate a value for the given metadata, or return null.  Generates
+     * Generate a value for the given metadata, or return null. Generates
      * values for hte following strategies: {@link ValueStrategies#SEQUENCE},
      * {@link ValueStrategies#UUID_STRING}, {@link ValueStrategies#UUID_HEX}
      */
@@ -140,7 +140,7 @@
     }
 
     /**
-     * Generate a value for the given metadata, or return null.  Generates
+     * Generate a value for the given metadata, or return null. Generates
      * values for hte following strategies: {@link ValueStrategies#SEQUENCE},
      * {@link ValueStrategies#UUID_STRING}, {@link ValueStrategies#UUID_HEX}
      */
@@ -174,18 +174,18 @@
 
     /**
      * Return the store-specific facade class for the given broker
-     * component class.  This method is used by facade implementations to
+     * component class. This method is used by facade implementations to
      * wrap store-specific components without knowing about all possible
      * back-ends.
      *
-     * @param    conf        configuration for runtime
-     * @param    openjpaCls        class of OpenJPA component (e.g.
+     * @param conf configuration for runtime
+     * @param openjpaCls class of OpenJPA component (e.g.
      * JDBCFetchConfiguration.class)
-     * @param    openjpaSuff    suffix of OpenJPA component (e.g. "FetchConfiguration")
-     * @param    facadePkg    the unqualified facade package name (e.g. "jdo")
-     * @param    facadeCls    the generic facade interface's class (e.g.
+     * @param openjpaSuff suffix of OpenJPA component (e.g. "FetchConfiguration")
+     * @param facadePkg the unqualified facade package name (e.g. "jdo")
+     * @param facadeCls the generic facade interface's class (e.g.
      * FetchPlan.class)
-     * @param    facadeSuff    the suffix to append to the store prefix to get
+     * @param facadeSuff the suffix to append to the store prefix to get
      * the implementation class name (e.g. "FetchPlanImpl")
      * or null to use the unqualified name of
      * <code>facadeCls</code>
@@ -228,7 +228,7 @@
     }
 
     /**
-     * Close the given resource.  The resource can be an extent iterator,
+     * Close the given resource. The resource can be an extent iterator,
      * query result, large result set relation, or any closeable OpenJPA
      * component.
      */
@@ -251,17 +251,17 @@
      *
      * @param type the class to test
      * @return true if the class is manageable.
-     * @param    conf the configuration that defines the current context
+     * @param conf the configuration that defines the current context
      */
     public static boolean isManagedType(Class type) {
         return PersistenceCapable.class.isAssignableFrom(type);
     }
 
     /**
-     *  Returns true if the specified instance is manageable.
+     * Returns true if the specified instance is manageable.
      *
-     *  @param  instance  the object to check
-     *  @return true if the instance is a persistent type, false otherwise
+     * @param instance the object to check
+     * @return true if the instance is a persistent type, false otherwise
      */
     public static boolean isManageable(Object instance) {
         return instance instanceof PersistenceCapable;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Exception type for internal errors.</p>
+ * Exception type for internal errors.
  *
  * @author Abe White
  * @since 3.2

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,8 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Exception type thrown when attempting to execute an operation that
- * is not allowed by the current state.</p>
+ * Exception type thrown when attempting to execute an operation that
+ * is not allowed by the current state.
  *
  * @since 4.0
  * @author Abe White

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LRSProxy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LRSProxy.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LRSProxy.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LRSProxy.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Marker interface for large result set proxies.</p>
+ * Marker interface for large result set proxies.
  *
  * @author Abe White
  * @since 3.0.3

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,8 +22,7 @@
 import org.apache.openjpa.lib.util.Localizer;
 
 /**
- * Exception indicating that locks on one or more objects could
- * not be acquired.
+ * Exception indicating that locks on one or more objects could not be acquired.
  *
  * @author Marc Prud'hommeaux
  * @since 3.1

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,12 +16,12 @@
 package org.apache.openjpa.util;
 
 /**
- * <p>Change tracker that can be used for maps.  If the user calls
+ * Change tracker that can be used for maps. If the user calls
  * any mutating methods on the map that do not have an equivalent in
- * this change tracker, then you must call {@link ChangeTracker#stopTracking} 
- * after applying the operation to the map.  The collections returned from
+ * this change tracker, then you must call {@link ChangeTracker#stopTracking}
+ * after applying the operation to the map. The collections returned from
  * {@link ChangeTracker#getAdded} and {@link ChangeTracker#getRemoved} will
- * be collections of keys to add/remove.</p>
+ * be collections of keys to add/remove.
  *
  * @author Abe White
  */
@@ -29,14 +29,14 @@
     extends ChangeTracker {
 
     /**
-     * Whether to track keys or values.  Defaults to keys.
+     * Whether to track keys or values. Defaults to keys.
      * If you set to values, it is assumed there is a 1-1 correlation
      * between keys and values in this map.
      */
     public boolean getTrackKeys();
 
     /**
-     * Whether to track keys or values.  Defaults to keys.
+     * Whether to track keys or values. Defaults to keys.
      * If you set to values, it is assumed there is a 1-1 correlation
      * between keys and values in this map.
      */
@@ -53,7 +53,7 @@
     public void removed(Object key, Object val);
 
     /**
-     *	Record that the given entry was altered.
+     * Record that the given entry was altered.
      */
     public void changed(Object key, Object oldVal, Object newVal);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,7 @@
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 
 /**
- * <p>Default {@link MapChangeTracker}.</p>
+ * Default {@link MapChangeTracker}.
  *
  * @author Abe White
  * @nojavadoc



Mime
View raw message