openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r421741 [6/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/kernel/OpenJPASavepoint.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.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,8 +21,8 @@
 import java.util.Map;
 
 /**
- * <p>Represents a savepoint where operations afterwards can be rolled
- * back and restored to this point<p>
+ * Represents a savepoint where operations afterwards can be rolled
+ * back and restored to this point
  *
  * @author Steve Kim
  * @since 3.4
@@ -37,7 +37,7 @@
     private Map _saved;
 
     /**
-     * Constructor.  Indicate whether to copy field data into memory.
+     * Constructor. Indicate whether to copy field data into memory.
      */
     public OpenJPASavepoint(Broker broker, String name, boolean copy) {
         _broker = broker;
@@ -90,10 +90,10 @@
     }
 
     /**
-     * Release this savepoint and any associated resources.  Releases
+     * Release this savepoint and any associated resources. Releases
      * will happen in reverse order of creation.
      *
-     * @param    user    if true, user initiated, otherwise a side effect of
+     * @param user if true, user initiated, otherwise a side effect of
      * another savepoint's release/rollback
      */
     public void release(boolean user) {
@@ -101,10 +101,10 @@
     }
 
     /**
-     *	Handle the rolled back state, returning saved data.
-     *	Subclasses should return the collection returned from this method.
+     * Handle the rolled back state, returning saved data.
+     * Subclasses should return the collection returned from this method.
      *
-     *	@param    previous    previous savepoints set in the transaction
+     * @param previous previous savepoints set in the transaction
      */
     public Collection rollback(Collection previous) {
         Map saved;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.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,
@@ -26,18 +26,16 @@
 import org.apache.openjpa.util.Proxy;
 
 /**
- * <p>Interface implemented by OpenJPA state managers.  Each state manager
- * manages the state of a single persistence capable instance.  The
+ * Interface implemented by OpenJPA state managers. Each state manager
+ * manages the state of a single persistence capable instance. The
  * state manager is also responsible for all communications about the
- * instance to the {@link StoreManager}.</p>
- * <p/>
- * <p>The <code>fetchXXXField</code> and <code>storeXXXField</code>
+ * instance to the {@link StoreManager}.
+ *  The <code>fetchXXXField</code> and <code>storeXXXField</code>
  * methods can be used to get and set fields of the managed persistent object.
  * Most back-end code, however, should use the similar
  * <code>fetchXXX</code> and <code>storeXXX</code> methods in place of
- * the field methods.  These methods function just like the field methods, but
- * also pass the value through the externalizer and factory the field may
- * have.</p>
+ * the field methods. These methods function just like the field methods, but
+ * also pass the value through the externalizer and factory the field may have.
  *
  * @author Abe White
  */
@@ -85,7 +83,7 @@
 
     /**
      * Return the {@link PersistenceCapable} instance that provides access to
-     * the instance managed by this state manager.  May be a proxy around
+     * the instance managed by this state manager. May be a proxy around
      * the actual managed instance.
      */
     public PersistenceCapable getPersistenceCapable();
@@ -140,29 +138,29 @@
 
     /**
      * Return a mutable mask of the unloaded fields that need loading based
-     * on the given fetch configuration.  Pass in null to retrieve all
+     * on the given fetch configuration. Pass in null to retrieve all
      * unloaded fields.
      */
     public BitSet getUnloaded(FetchState fetchState);
 
     /**
-     * Create a new hollow proxy instance for the given field.  In cases where
+     * Create a new hollow proxy instance for the given field. In cases where
      * the field externalizes to an SCO but is declared something else, the
-     * returned object may not implement {@link Proxy}.  In all other cases,
+     * returned object may not implement {@link Proxy}. In all other cases,
      * this method delegates to the system {@link org.apache.openjpa.util.ProxyManager}
-     * with the correct field information.  The returned proxy's owner is
+     * with the correct field information. The returned proxy's owner is
      * unset so that modifications to the proxy will not be tracked while its
-     * state is initialized.  Calling {@link #storeField} or {@link #store}
+     * state is initialized. Calling {@link #storeField} or {@link #store}
      * will set the proxy's owner automatically.
      */
     public Object newProxy(int field);
 
     /**
-     * Create a new hollow proxy instance for the given field.  This method
+     * Create a new hollow proxy instance for the given field. This method
      * differs from {@link #newProxy} in that it returns a proxy for the
      * field's declared type, not its externalized type.
      *
-     * @see    #newProxy
+     * @see #newProxy
      */
     public Object newFieldProxy(int field);
 
@@ -182,7 +180,7 @@
     public PCState getPCState();
 
     /**
-     * Return the identifier for this state manager.  This may return a
+     * Return the identifier for this state manager. This may return a
      * temporary identifier for new unflushed instances that have not been
      * assigned an object id, or for non-persistent or embedded instances.
      * For all other instances this method is the same as {@link #getObjectId}.
@@ -190,15 +188,15 @@
     public Object getId();
 
     /**
-     * Return the instance's object id.  This method will return null if no
-     * oid has been assigned.  Oids are assigned to newly-persisted instances
+     * Return the instance's object id. This method will return null if no
+     * oid has been assigned. Oids are assigned to newly-persisted instances
      * when the user first asks for it, or on flush.
      */
     public Object getObjectId();
 
     /**
-     * Set the object id for the managed instance.  Some back ends may not be
-     * able to assign a permanent oid until flush.  Do not call this method on
+     * Set the object id for the managed instance. Some back ends may not be
+     * able to assign a permanent oid until flush. Do not call this method on
      * application identity instances; changing the primary key fields of
      * application identity objects through the <code>storeXXXField</code>
      * methods will automatically change the oid.
@@ -208,20 +206,20 @@
     /**
      * Ask the store manager to assign a permanent oid to this new instance.
      *
-     * @param    flush    if true, flush if necessary to get a permanent oid; if
+     * @param flush if true, flush if necessary to get a permanent oid; if
      * false, the oid may be left unassigned
      * @return true if an oid assigned, false otherwise
      */
     public boolean assignObjectId(boolean flush);
 
     /**
-     * The lock object set for this instance.  This object is generally
+     * The lock object set for this instance. This object is generally
      * managed by the system lock manager.
      */
     public Object getLock();
 
     /**
-     * The lock object set for this instance.  This object is generally
+     * The lock object set for this instance. This object is generally
      * managed by the system lock manager.
      */
     public void setLock(Object lock);
@@ -233,9 +231,9 @@
 
     /**
      * Set the version indicator for this instance, as loaded from the
-     * data store.  This method is used by the {@link StoreManager} when
-     * loading instance data.  On rollback, the version will be rolled back
-     * to this value.  Version objects should be serializable and should not
+     * data store. This method is used by the {@link StoreManager} when
+     * loading instance data. On rollback, the version will be rolled back
+     * to this value. Version objects should be serializable and should not
      * require vendor-specific classes, because they are transferred to
      * detached objects.
      */
@@ -243,7 +241,7 @@
 
     /**
      * Set the next version indicator in the datastore pending a successful
-     * flush.  The {@link StoreManager} uses this method during flush.
+     * flush. The {@link StoreManager} uses this method during flush.
      */
     public void setNextVersion(Object version);
 
@@ -254,8 +252,7 @@
     public boolean isVersionUpdateRequired();
 
     /**
-     * Returns true if this state needs to issue a version check at
-     * flush time.
+     * Returns true if this state needs to issue a version check at flush time.
      */
     public boolean isVersionCheckRequired();
 
@@ -271,7 +268,7 @@
      * This object is not used or modified in any way by the generic
      * persistence layer.
      *
-     * @param    cacheable    whether the impl data can be shared among instances
+     * @param cacheable whether the impl data can be shared among instances
      * in different contexts if L2 caching is enabled
      * @return the previous impl data value, if any
      */
@@ -284,14 +281,14 @@
     public boolean isImplDataCacheable();
 
     /**
-     * Field-level impl data.  Field-level data only applies to loaded fields,
+     * Field-level impl data. Field-level data only applies to loaded fields,
      * and is cleared when the field is cleared.
      */
     public Object getImplData(int field);
 
     /**
-     * Field-level impl data.  Field-level data only applies to loaded fields,
-     * and is cleared when the field is cleared.  Whether the data is cached
+     * Field-level impl data. Field-level data only applies to loaded fields,
+     * and is cleared when the field is cleared. Whether the data is cached
      * across instances depends on the corresponding field metadata's response
      * to {@link FieldMetaData#usesImplData}.
      *
@@ -307,7 +304,7 @@
 
     /**
      * Use intermediate field data to store intermediate information that
-     * might be available before the field is fully loaded.  The system
+     * might be available before the field is fully loaded. The system
      * will automatically clear this data when the field gets loaded.
      * This data should be cacheable; the datastore cache will attempt to
      * cache it if the field value is not available.
@@ -316,7 +313,7 @@
 
     /**
      * Use intermediate field data to store intermediate information that
-     * might be available before the field is fully loaded.  The system
+     * might be available before the field is fully loaded. The system
      * will automatically clear this data when the field gets loaded.
      * This data should be cacheable; the datastore cache will attempt to
      * cache it if the field value is not available.
@@ -375,7 +372,7 @@
 
     /**
      * Return the externalized value of the field with the given index as an
-     * object.  If there is no externalizer, this is equivalent to
+     * object. If there is no externalizer, this is equivalent to
      * {@link #fetchField}.
      */
     public Object fetch(int field);
@@ -448,7 +445,7 @@
 
     /**
      * Set the value of the field with the given index as from the external
-     * object value.  If there is no externalizer, this is equivalent to
+     * object value. If there is no externalizer, this is equivalent to
      * {@link #storeField}.
      */
     public void store(int field, Object value);
@@ -471,23 +468,23 @@
     /**
      * Prepare the instance for refresh
      *
-     * @param    refreshAll    true if this instance is one of a collection of
+     * @param refreshAll true if this instance is one of a collection of
      * objects being refreshed
      * @return true if the object needs a refresh, false otherwise
-     * @see    Broker#refresh
+     * @see Broker#refresh
      */
     public boolean beforeRefresh(boolean refreshAll);
 
     /**
-     *	Set the given field to the given value.  Make the field dirty as
-     *	if user code set it.  Do not delete dependent objects in the field's
-     *	current value.  This method is invoked by the remote package to
-     *	synch a server-side state manager with remote changes.  We do not
-     *	need to delete dependent instances because they will have been
-	 *	deleted when the field changed on the client side, and those 
-	 *	client-side deletes will be transmitted independently.
+     * Set the given field to the given value. Make the field dirty as
+     * if user code set it. Do not delete dependent objects in the field's
+     * current value. This method is invoked by the remote package to
+     * synch a server-side state manager with remote changes. We do not
+     * need to delete dependent instances because they will have been
+	 * deleted when the field changed on the client side, and those
+	 * client-side deletes will be transmitted independently.
 	 *
-	 *	@since	3.1
+	 * @since	3.1
 	 */
 	public void setRemote (int field, Object value);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.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,8 +21,8 @@
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
 
 /**
- * <p>Merged result object provider specialization that extracts ordering
- * values from results for comparison.</p>
+ * Merged result object provider specialization that extracts ordering
+ * values from results for comparison.
  *
  * @author Abe White
  * @nojavadoc

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.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,
@@ -19,7 +19,7 @@
 import java.util.BitSet;
 
 /**
- * Holds data about a single persistence capable instance.  This interface is
+ * Holds data about a single persistence capable instance. This interface is
  * used in the caching framework, and may also be used by simple store manager
  * back-ends to hold persistent state.
  *
@@ -49,14 +49,12 @@
     public void setImplData(Object val);
 
     /**
-     * Returns the current version object that this data was loaded
-     * from.
+     * Returns the current version object that this data was loaded from.
      */
     public Object getVersion();
 
     /**
-     * Sets the current version object that this data was loaded
-     * from.
+     * Sets the current version object that this data was loaded from.
      */
     public void setVersion(Object version);
 
@@ -64,10 +62,10 @@
      * Loads all fields that are currently stored in the cache
      * into the given state manager.
      *
-     * @param    sm        the state manager to load
-     * @param    fetchState    the fetch configuration to use for loading related
+     * @param sm the state manager to load
+     * @param fetchState the fetch configuration to use for loading related
      * objects
-     * @param    context    current context information
+     * @param context current context information
      */
     public void load(OpenJPAStateManager sm, FetchState fetchState,
         Object context);
@@ -76,12 +74,12 @@
      * Loads some or all of the marked fields from the cache into the
      * given state manager.
      *
-     * @param    sm            the state manager to load
-     * @param    fields        the fields to load; clear the bits for the fields
+     * @param sm the state manager to load
+     * @param fields the fields to load; clear the bits for the fields
      * that are successfully loaded
-     * @param    fetchState        the fetch configuration to use for loading related
+     * @param fetchState the fetch configuration to use for loading related
      * objects
-     * @param    context        current context information
+     * @param context current context information
      */
     public void load(OpenJPAStateManager sm, BitSet fields,
         FetchState fetchState, Object context);
@@ -102,7 +100,7 @@
     public Object getData(int i);
 
     /**
-     *	Whether the given field index has stored data.
+     * Whether the given field index has stored data.
      */
     public boolean isLoaded (int i);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.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.meta.FieldMetaData;
 
 /**
- * <p>Default {@link PCData} implementation.</p>
+ * Default {@link PCData} implementation.
  *
  * @author Patrick Linskey
  * @author Abe White
@@ -299,8 +299,8 @@
     }
 
     /**
-     *	Return a new {@link PCData} implementation of the right type for
-     *	embedded instances.  Returns a {@link PCDataImpl} by default.
+     * Return a new {@link PCData} implementation of the right type for
+     * embedded instances. Returns a {@link PCDataImpl} by default.
      */
     public AbstractPCData newEmbeddedPCData(OpenJPAStateManager sm) {
         return new PCDataImpl(sm.getId (), sm.getMetaData ());

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.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,14 +18,12 @@
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
 
 /**
- * <p>Variant of {@link ResultObjectProvider} that populates a
- * {@link OpenJPAStateManager} object in an application-defined manner.</p>
- * <p/>
- * <p>Implementations of this interface can be used to customize data
- * loading.</p>
+ * Variant of {@link ResultObjectProvider} that populates a
+ * {@link OpenJPAStateManager} object in an application-defined manner.
+ *  Implementations of this interface can be used to customize data loading.
  *
  * @author Patrick Linskey
- * @see    AbstractPCResultObjectProvider
+ * @see AbstractPCResultObjectProvider
  */
 public interface PCResultObjectProvider
     extends ResultObjectProvider {
@@ -33,7 +31,7 @@
     /**
      * Initializes the state manager.
      *
-     * @see    StoreManager#initialize
+     * @see StoreManager#initialize
      */
     public void initialize(OpenJPAStateManager sm, PCState state,
         FetchState fetchState)

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.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,15 +23,14 @@
 import org.apache.openjpa.util.InvalidStateException;
 
 /**
- * <p>Base class for all lifecycle states.  Each instance is managed by
+ * Base class for all lifecycle states. Each instance is managed by
  * a {@link OpenJPAStateManager}, which in turn keeps a reference to its current
- * state.</p>
- * <p/>
- * <p>The state governs the behavior of the instance during all lifecycle
- * events.  The class itself is stateless, and is provided its context
- * on each method call.  This base class provides no-op implementations
+ * state.
+ *  The state governs the behavior of the instance during all lifecycle
+ * events. The class itself is stateless, and is provided its context
+ * on each method call. This base class provides no-op implementations
  * of all methods and maintains static singelton shared references to each
- * possible state.</p>
+ * possible state.
  *
  * @author Abe White
  */
@@ -154,8 +153,7 @@
     private static Localizer _loc = Localizer.forPackage(PCState.class);
 
     /**
-     * Called when this state is first assigned to the given
-     * state manager.
+     * Called when this state is first assigned to the given state manager.
      */
     void initialize(StateManagerImpl context) {
     }
@@ -169,8 +167,7 @@
 
     /**
      * Perform any actions necessary and return the proper lifecycle
-     * state on fush.
-     * Returns the <code>this</code> pointer by default.
+     * state on fush. Returns the <code>this</code> pointer by default.
      */
     PCState flush(StateManagerImpl context) {
         return this;
@@ -178,8 +175,7 @@
 
     /**
      * Perform any actions necesssary and return the proper lifecycle state
-     * on transaction commit.
-     * Returns the <code>this</code> pointer by default.
+     * on transaction commit. Returns the <code>this</code> pointer by default.
      */
     PCState commit(StateManagerImpl context) {
         return this;
@@ -215,7 +211,7 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * on a call to {@link Broker#persist} with the given instance.
-     * Returns the <code>this</code> pointer by default.  Note: this method
+     * Returns the <code>this</code> pointer by default. Note: this method
      * is <b>not</b> called for embedded states, and is only called when an
      * existing managed instance is the target of a persist call.
      */
@@ -269,7 +265,7 @@
     }
 
     /**
-     * Return the state to transition to after refresh.  The context is
+     * Return the state to transition to after refresh. The context is
      * not given because no actions should be taken.
      */
     PCState afterRefresh() {
@@ -277,7 +273,7 @@
     }
 
     /**
-     * Return the state to transition to after refresh.  The context is
+     * Return the state to transition to after refresh. The context is
      * not given because no actions should be taken.
      */
     PCState afterOptimisticRefresh() {
@@ -285,7 +281,7 @@
     }
 
     /**
-     * Return the state to transition to after refresh.  The context is
+     * Return the state to transition to after refresh. The context is
      * not given because no actions should be taken.
      */
     PCState afterNontransactionalRefresh() {
@@ -295,9 +291,8 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being read within
-     * an active transaction.  The given field number can be -1 if it is
-     * a general object read.
-     * Returns the <code>this</code> pointer by default.
+     * an active transaction. The given field number can be -1 if it is
+     * a general object read. Returns the <code>this</code> pointer by default.
      */
     PCState beforeRead(StateManagerImpl context, int field) {
         return this;
@@ -306,9 +301,8 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being read outside of
-     * an active transaction.  The given field number can be -1 if it is
-     * a general object read.
-     * Returns the <code>this</code> pointer by default.
+     * an active transaction. The given field number can be -1 if it is
+     * a general object read. Returns the <code>this</code> pointer by default.
      */
     PCState beforeNontransactionalRead(StateManagerImpl context, int field) {
         return this;
@@ -317,9 +311,8 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being read in an optimistic
-     * transaction.  The given field number can be -1 if it is
-     * a general object read.
-     * Returns the <code>this</code> pointer by default.
+     * transaction. The given field number can be -1 if it is
+     * a general object read. Returns the <code>this</code> pointer by default.
      */
     PCState beforeOptimisticRead(StateManagerImpl context, int field) {
         return this;
@@ -328,7 +321,7 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being written within
-     * an active transaction.  The mutate parameter tells if it is a
+     * an active transaction. The mutate parameter tells if it is a
      * direct mutation on an SCO field.
      * Returns the <code>this</code> pointer by default.
      */
@@ -339,7 +332,7 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being written within
-     * an optimistic transaction.  The mutate parameter tells if it is a
+     * an optimistic transaction. The mutate parameter tells if it is a
      * direct mutation on an SCO field.
      * Returns the <code>this</code> pointer by default.
      */
@@ -351,7 +344,7 @@
     /**
      * Perform any actions necesssary and return the proper lifecycle state
      * prior to the state of the given instance being written outside of
-     * an active transaction.  The mutate parameter tells if it is a
+     * an active transaction. The mutate parameter tells if it is a
      * direct mutation on an SCO field.
      * Returns the <code>this</code> pointer by default.
      */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that is participating in the current
- * transaction, but has not yet been modified.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that is participating in the current
+ * transaction, but has not yet been modified.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that has been deleted in the current
- * transaction, and that has been flushed to the database.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that has been deleted in the current
+ * transaction, and that has been flushed to the database.
  *
  * @author Patrick Linskey
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that has been deleted in the current
- * transaction.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that has been deleted in the current
+ * transaction.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that is participating in the current
- * transaction, and has been modified.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that is participating in the current
+ * transaction, and has been modified.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was made persistent, then deleted within the
- * current	transaction.</p>
+ * Lifecycle state.
+ *  Represents an instance that was made persistent, then deleted within the
+ * current	transaction.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was made persistent within the
- * current	transaction, flushed, deleted, and flushed.</p>
+ * Lifecycle state.
+ *  Represents an instance that was made persistent within the
+ * current	transaction, flushed, deleted, and flushed.
  *
  * @author Patrick Linskey
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was made persistent within the
- * current	transaction, flushed, and subsequently deleted.</p>
+ * Lifecycle state.
+ *  Represents an instance that was made persistent within the
+ * current	transaction, flushed, and subsequently deleted.
  *
  * @author Patrick Linskey
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.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,9 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was made persistent within the
- * current	transaction.</p>
+ * Lifecycle state.
+ *  Represents an instance that was made persistent within the
+ * current	transaction.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.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,9 +16,8 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was deleted outside a transaction.</p>
+ * Lifecycle state.
+ *  Represents an instance that was deleted outside a transaction.
  *
  * @author Steve Kim
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.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,11 +16,10 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that has been dirtied outside of
- * transaction.  This state is only reachable only if the
- * RetainNontransactional property is set.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that has been dirtied outside of
+ * transaction. This state is only reachable only if the
+ * RetainNontransactional property is set.
  *
  * @author Steve Kim
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.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,9 +16,8 @@
 package org.apache.openjpa.kernel;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents an instance that was persisted outside a transaction.</p>
+ * Lifecycle state.
+ *  Represents an instance that was persisted outside a transaction.
  *
  * @author Steve Kim
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.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,11 +20,10 @@
 import org.apache.openjpa.lib.util.Localizer;
 
 /**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a persistent instance that is not transactional, but that
- * allows access to persistent data.  This state is reachable only if the
- * RetainState property is set.</p>
+ * Lifecycle state.
+ *  Represents a persistent instance that is not transactional, but that
+ * allows access to persistent data. This state is reachable only if the
+ * RetainState property is set.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.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 org.apache.openjpa.kernel.exps.FilterListener;
 
 /**
- * <p>OpenJPA query interface.</p>
+ * OpenJPA query interface.
  *
  * @since 3.0
  * @author Patrick Linskey
@@ -127,16 +127,14 @@
     public long deleteAll(Map parameterMap);
 
     /**
-     * Performs an update of the instances that are satisfied by
-     * the query.
+     * Performs an update of the instances that are satisfied by the query.
      *
      * @return the number of instances that were update
      */
     public long updateAll();
 
     /**
-     * Performs an update of the instances that are satisfied by
-     * the query.
+     * Performs an update of the instances that are satisfied by the query.
      *
      * @param parameters the positional parameter array
      * @return the number of instances that were update
@@ -144,8 +142,7 @@
     public long updateAll(Object[] parameters);
 
     /**
-     * Performs an update of the instances that are satisfied by
-     * the query.
+     * Performs an update of the instances that are satisfied by the query.
      *
      * @param parameterMap the named parameter map
      * @return the number of instances that were update
@@ -158,7 +155,7 @@
     public void closeAll();
 
     /**
-     * Close query results that are consuming resources.  Allow results that
+     * Close query results that are consuming resources. Allow results that
      * are not consuming resources to remain open so that they continue to
      * function normally.
      */
@@ -167,8 +164,7 @@
     /**
      * Returns a description of the commands that will be sent to
      * the datastore in order to execute this query. This will
-     * typically be in the native query language of the database
-     * (e.g., SQL).
+     * typically be in the native query language of the database (e.g., SQL).
      *
      * @param params the named parameter map for the query invocation
      * @since 3.2
@@ -186,8 +182,8 @@
     public void assertNotReadOnly();
 
     /**
-     *	Check that the query has not been serialized, which causes it to lose
-     *	its association with its Broker.
+     * Check that the query has not been serialized, which causes it to lose
+     * its association with its Broker.
 	 */
 	public void assertNotSerialized ();
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.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,
@@ -26,7 +26,7 @@
 import org.apache.openjpa.meta.FieldMetaData;
 
 /**
- * <p>A query execution context.</p>
+ * A query execution context.
  *
  * @author Abe White
  * @since 4.0
@@ -34,7 +34,7 @@
 public interface QueryContext {
 
     /**
-     * Return the query for this context.  Note that the query will be
+     * Return the query for this context. Note that the query will be
      * unavailable in remote contexts, and this method may throw an exception
      * to that effect.
      */
@@ -51,8 +51,7 @@
     public FetchConfiguration getFetchConfiguration();
 
     /**
-     * Returns the operation that this query will be expected
-     * to perform.
+     * Returns the operation that this query will be expected to perform.
      *
      * @see QueryOperations
      * @since 4.0
@@ -77,8 +76,7 @@
 
     /**
      * Return the class of the objects that this query will return,
-     * or <code>null</code> if this information is not available /
-     * not relevant.
+     * or <code>null</code> if this information is not available / not relevant.
      */
     public Class getCandidateType();
 
@@ -109,7 +107,7 @@
 
     /**
      * Specify that the query will return only 1
-     * result, rather than a collection.  The execute method will return null
+     * result, rather than a collection. The execute method will return null
      * if the query result size is 0.
      *
      * @since 3.0
@@ -159,8 +157,8 @@
     /**
      * Set the range of results to return.
      *
-     * @param    start    0-based inclusive start index
-     * @param    end        0-based exclusive end index, or
+     * @param start 0-based inclusive start index
+     * @param end 0-based exclusive end index, or
      * {@link Long#MAX_VALUE} for no limit
      * @since 3.2
      */
@@ -177,7 +175,7 @@
     public void declareParameters(String params);
 
     /**
-     * Return a map of parameter name to type for this query.  The returned
+     * Return a map of parameter name to type for this query. The returned
      * map will iterate in the order that the parameters were declared or,
      * if they're implicit, used.
      */
@@ -270,19 +268,17 @@
     /**
      * Helper method to instantiate the class with the given name, taking
      * into account the query's candidate package, automatic imports, and
-     * the given imports (if any).  Returns null if the type cannot be
-     * found.
+     * the given imports (if any). Returns null if the type cannot be found.
      */
     public Class classForName(String name, String[] imports);
 
     /**
-     *	Synchronize on the query's internal lock.
+     * Synchronize on the query's internal lock.
      */
     public void lock (); 
 
-
     /**
-     *	Unlock the query's internal lock.
+     * Unlock the query's internal lock.
      */
     public void unlock();
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.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.conf.OpenJPAConfiguration;
 
 /**
- * <p>Constants for determining when to flush before queries.</p>
+ * Constants for determining when to flush before queries.
  *
  * @author Abe White
  * @since 4.0
@@ -43,11 +43,11 @@
     public static final int FLUSH_FALSE = 1;
 
     /**
-     *	Constant denoting that queries should flush data to the
-     *	database automatically when OpenJPA determines that relevant
-     *	modifications have been made and the current
-     *	context already has a dedicated connection. See
-     *	{@link OpenJPAConfiguration#getFlushBeforeQueries} for more info.
+     * Constant denoting that queries should flush data to the
+     * database automatically when OpenJPA determines that relevant
+     * modifications have been made and the current
+     * context already has a dedicated connection. See
+     * {@link OpenJPAConfiguration#getFlushBeforeQueries} for more info.
      */
     public static final int FLUSH_WITH_CONNECTION = 2;
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.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,
@@ -53,7 +53,7 @@
 import serp.util.Strings;
 
 /**
- * <p>Implementation of the {@link Query} interface.</p>
+ * Implementation of the {@link Query} interface.
  *
  * @author Abe White
  * @nojavadoc
@@ -915,7 +915,7 @@
         for (Iterator itr = params.iterator(); itr.hasNext();) {
             obj = itr.next();
             if (!(obj instanceof Number))
-                return 0;    // use 0 base when params are mixed types
+                return 0; // use 0 base when params are mixed types
 
             val = ((Number) obj).intValue();
             if (val == 0)
@@ -965,7 +965,7 @@
 
     /**
      * Execute the query using the given compilation, executor, and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #execute(StoreQuery.Executor,Map)} after validation and locking.
      */
     private Object execute(StoreQuery.Executor ex, Object[] params)
@@ -994,7 +994,7 @@
 
     /**
      * Execute the query using the given compilation, executor, and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #execute(StoreQuery.Executor,Object[])} after validation and
      * locking.
      */
@@ -1024,7 +1024,7 @@
 
     /**
      * Delete the query using the given executor, and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #delete(StoreQuery.Executor,Object[])} after validation and
      * locking. The return value will be a Number indicating the number of
      * instances deleted.
@@ -1037,7 +1037,7 @@
 
     /**
      * Delete the query using the given executor, and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #delete(StoreQuery.Executor,Map)} after validation and locking.
      * The return value will be a Number indicating the number of
      * instances deleted.
@@ -1070,7 +1070,7 @@
 
     /**
      * Update the query using the given executor and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #update(StoreQuery.Executor,Object[])} after validation and
      * locking. The return value will be a Number indicating the number of
      * instances updated.
@@ -1083,7 +1083,7 @@
 
     /**
      * Update the query using the given compilation, executor, and parameter
-     * values.  All other execute methods delegate to this one or to
+     * values. All other execute methods delegate to this one or to
      * {@link #update(StoreQuery.Executor,Map)} after validation and locking.
      * The return value will be a Number indicating the number of
      * instances updated.
@@ -1318,7 +1318,7 @@
     }
 
     /**
-     * Extract an expected single result from the given provider.  Used when
+     * Extract an expected single result from the given provider. Used when
      * the result is an ungrouped aggregate or the unique flag is set to true.
      */
     private Object singleResult(ResultObjectProvider rop)
@@ -1710,8 +1710,7 @@
 
     /**
      * Check that we are in a state to be able to perform a bulk operation;
-     * also flush the current modfications if any elements are currently
-     * dirty.
+     * also flush the current modfications if any elements are currently dirty.
      */
     private void assertBulkModify() {
         _broker.assertActiveTransaction();
@@ -1800,15 +1799,15 @@
     /**
      * A merged executor executes multiple Queries and returns
      * a merged result list with the appropriate ordering (if more than
-     * one query needs to be executed).  This executor has the following
+     * one query needs to be executed). This executor has the following
      * limitations:
      * <ul>
-     * <li>It cannot combine aggregates.</p>
+     * <li>It cannot combine aggregates.
      * <li>It cannot collate the result lists if ordering is specified and
      * a result string is given, but does not include the ordering
      * criteria.</li>
      * <li>It cannot filter duplicate results from different result lists if
-     * the result is marked distinct.  This would require tracking all
+     * the result is marked distinct. This would require tracking all
      * previous results, which would interfere with large result set
      * handling.</li>
      * </ul>
@@ -2081,8 +2080,8 @@
     }
 
     /**
-     *	Result list that removes itself from the query's open result list
-     *	when it is closed.  Public for testing.
+     * Result list that removes itself from the query's open result list
+     * when it is closed. Public for testing.
      */
     public class RemoveOnCloseResultList
         implements ResultList {
@@ -2239,7 +2238,6 @@
 			return _res.toString ();
 		}
 
-	
 		public Object writeReplace ()
 		{
 			return _res;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.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 org.apache.openjpa.util.InternalException;
 
 /**
- * <p>Constants and utilities for query languages.</p>
+ * Constants and utilities for query languages.
  *
  * @author Abe White
  * @since 4.0

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.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,
@@ -39,10 +39,10 @@
     public static final int OP_DELETE = 2;
 
     /**
-     *  Symbolic constant that indicates that this query will be
-     *  performing a update operation.
+     * Symbolic constant that indicates that this query will be
+     * performing a update operation.
      *
-     *  @see QueryContext#getOperation
+     * @see QueryContext#getOperation
      */
     public static final int OP_UPDATE = 3;
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.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,8 +21,8 @@
 import org.apache.openjpa.util.StoreException;
 
 /**
- * <p>Wraps the native store manager to handle calls using custom
- * {@link PCResultObjectProvider}s.</p>
+ * Wraps the native store manager to handle calls using custom
+ * {@link PCResultObjectProvider}s.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.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.kernel;
 
 /**
- * <p>State restore constants.</p>
+ * State restore constants.
  *
  * @author Abe White
  * @since 4.0
@@ -34,7 +34,7 @@
     public static final int RESTORE_IMMUTABLE = 1;
 
     /**
-     *	Restore all state on rollback.
+     * Restore all state on rollback.
      */
     public static final int RESTORE_ALL = 2;
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.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,
@@ -35,7 +35,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>Helper class to pack results into the result class set on the query.</p>
+ * Helper class to pack results into the result class set on the query.
  *
  * @author Abe White
  * @author Patrick Linskey
@@ -87,9 +87,9 @@
     /**
      * Constructor for standard projection.
      *
-     * @param    types        the projection value types
-     * @param    aliases        the alias for each projection value
-     * @param    resultClass    the class to pack into
+     * @param types the projection value types
+     * @param aliases the alias for each projection value
+     * @param resultClass the class to pack into
      */
     public ResultPacker(Class[] types, String[] aliases, Class resultClass) {
         this(null, types, aliases, resultClass);
@@ -334,7 +334,7 @@
     }
 
     /**
-     *	Return the put method if one exists.
+     * Return the put method if one exists.
      */
     private static Method findPut(Method[] methods) {
         Class[] params;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.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,
@@ -26,7 +26,7 @@
 import org.apache.openjpa.util.ProxyManager;
 
 /**
- * <p>FieldManager type used to store information for rollback.</p>
+ * FieldManager type used to store information for rollback.
  *
  * @author Abe White
  */
@@ -72,15 +72,14 @@
     }
 
     /**
-     * Return the currently-loaded fields that will be unloaded after
-     * rollback.
+     * Return the currently-loaded fields that will be unloaded after rollback.
      */
     public BitSet getUnloaded() {
         return _unloaded;
     }
 
     /**
-     * Save the given field.  If this method returns true, then you need
+     * Save the given field. If this method returns true, then you need
      * to use this field manager to replace the given field in the instance
      * returned by {@link #getState}.
      */
@@ -142,7 +141,7 @@
     }
 
     /**
-     * Restore the given field.  If this method returns true, then you need
+     * Restore the given field. If this method returns true, then you need
      * to use this field manager to replace the given field in the state
      * manager's instance.
      */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.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,
@@ -28,7 +28,7 @@
 import org.apache.openjpa.util.ProxyManager;
 
 /**
- * <p>FieldManager type used to store information for savepoint rollback.</p>
+ * FieldManager type used to store information for savepoint rollback.
  *
  * @author Steve Kim
  * @since 3.4
@@ -52,8 +52,8 @@
     private BitSet _mutable;
 
     /**
-     * Constructor.  Provide instance to save and indicate whether
-     * to copy persistent fields.  Transactional fields will be
+     * Constructor. Provide instance to save and indicate whether
+     * to copy persistent fields. Transactional fields will be
      * copied regardless of copy setting.
      */
     public SavepointFieldManager(StateManagerImpl sm, boolean copy) {
@@ -91,8 +91,7 @@
     }
 
     /**
-     * Return the persistence capable copy holding the savepoint
-     * field values.
+     * Return the persistence capable copy holding the savepoint field values.
      */
     public PersistenceCapable getCopy() {
         return _copy;
@@ -154,7 +153,7 @@
     }
 
     /**
-     * Restore the given field.  If this method returns true, then you need
+     * Restore the given field. If this method returns true, then you need
      * to use this field manager to replace the given field in the state
      * manager's instance.
      */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.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.kernel;
 
 /**
- * <p>A manager for handling savepoints.</p>
+ * A manager for handling savepoints.
  *
  * @author Steve Kim
  * @since 3.4

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.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,
@@ -19,7 +19,7 @@
 import org.apache.openjpa.meta.ClassMetaData;
 
 /**
- * <p>Internal OpenJPA sequence interface.</p>
+ * Internal OpenJPA sequence interface.
  *
  * @author Abe White
  */
@@ -39,8 +39,8 @@
     /**
      * Return the next value in the sequence.
      *
-     * @param    ctx        the current context
-     * @param    cls        if this is a datastore identity sequence, the
+     * @param ctx the current context
+     * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
     public Object next(StoreContext ctx, ClassMetaData cls);
@@ -48,8 +48,8 @@
     /**
      * Return the current value of the sequence, or null if not available.
      *
-     * @param    ctx        the current context
-     * @param    cls        if this is a datastore identity sequence, the
+     * @param ctx the current context
+     * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
     public Object current(StoreContext ctx, ClassMetaData cls);
@@ -57,14 +57,14 @@
     /**
      * Allocate additional values efficiently.
      *
-     * @param    ctx        the current context
-     * @param    cls        if this is a datastore identity sequence, the
+     * @param ctx the current context
+     * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
     public void allocate(int additional, StoreContext ctx, ClassMetaData cls);
 
     /**
-     *	Free resources used by this sequence.
+     * Free resources used by this sequence.
      */
     public void close ();
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.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,
@@ -40,9 +40,9 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * <p>FieldManager type used to hold onto a single field value and then
- * dispense it via the fetch methods.  The manager can also perform actions
- * on the held field.</p>
+ * FieldManager type used to hold onto a single field value and then
+ * dispense it via the fetch methods. The manager can also perform actions
+ * on the held field.
  *
  * @author Abe White
  */
@@ -61,7 +61,7 @@
     }
 
     /**
-     * Proxy the held field if needed.  Return true if the field needs to
+     * Proxy the held field if needed. Return true if the field needs to
      * be replaced with the now-proxied instance.
      */
     public boolean proxy(boolean reset, boolean replaceNull) {
@@ -239,7 +239,7 @@
 
     /**
      * Persist the stored field safely, preventing infinite recursion using
-     * the given set of already-persisted objects.  This method is only called
+     * the given set of already-persisted objects. This method is only called
      * for fields that we know have cascade-immediate settings.
      */
     public void persist(OpCallbacks call) {
@@ -410,7 +410,7 @@
 
     /**
      * Recursively invoke the broker to gather cascade-refresh objects in
-     * the current field into the given set.  This method is only called
+     * the current field into the given set. This method is only called
      * for fields that we know have cascade-refresh settings.
      */
     public void gatherCascadeRefresh(OpCallbacks call) {
@@ -457,9 +457,9 @@
     }
 
     /**
-     * Perform pre-flush tasks on the current field.  This includes checking
+     * Perform pre-flush tasks on the current field. This includes checking
      * for nulls, persisting pcs, embedding embedded fields, and ref'ing
-     * pc fields.  Return true if the field needs to be replaced with the
+     * pc fields. Return true if the field needs to be replaced with the
      * new value.
      */
     public boolean preFlush(OpCallbacks call) {
@@ -829,7 +829,7 @@
     }
 
     /**
-     *	Return the proxy manager.
+     * Return the proxy manager.
      */
     private ProxyManager getProxyManager ()
 	{



Mime
View raw message