You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/07/14 01:45:02 UTC
svn commit: r421741 [5/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/...
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.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.Closeable;
/**
- * <p>Factory for {@link Broker} instances.</p>
+ * Factory for {@link Broker} instances.
*
* @author Abe White
* @since 4.0
@@ -65,8 +65,8 @@
/**
* Register a listener for lifecycle-related events on the specified
- * classes. If the classes are null, all events will be propagated to
- * the listener. The listener will be passed on to all new brokers.
+ * classes. If the classes are null, all events will be propagated to
+ * the listener. The listener will be passed on to all new brokers.
*
* @since 3.3
*/
@@ -95,7 +95,7 @@
public void lock();
/**
- * Release the internal lock.
+ * Release the internal lock.
*/
public void unlock ();
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.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,
@@ -89,9 +89,9 @@
import org.apache.openjpa.util.UserException;
/**
- * <p>Concrete {@link Broker}. The broker handles object-level behavior,
+ * Concrete {@link Broker}. The broker handles object-level behavior,
* but leaves all interaction with the data store to a {@link StoreManager}
- * that must be supplied at initialization.</p>
+ * that must be supplied at initialization.
*
* @author Abe White
*/
@@ -223,13 +223,12 @@
private LifecycleEventManager _lifeEventManager = null;
/**
- * Set the persistence manager's authentication. This is the first
+ * Set the persistence manager's authentication. This is the first
* method called after construction.
*
* @param user the username this broker represents; used when pooling
* brokers to make sure that a request to the factory for
- * a connection with an explicit user is delegated to a
- * suitable broker
+ * a connection with an explicit user is delegated to a suitable broker
* @param pass the password for the above user
*/
public void setAuthentication(String user, String pass) {
@@ -238,11 +237,10 @@
}
/**
- * Initialize the persistence manager. This method is called
+ * Initialize the persistence manager. This method is called
* automatically by the factory before use.
*
- * @param factory the factory used to create
- * this broker
+ * @param factory the factory used to create this broker
* @param sm a concrete StoreManager implementation to
* handle interaction with the data store
* @param managed the transaction mode
@@ -303,7 +301,7 @@
/**
* Create a {@link Map} to be used for the primary managed object cache.
- * Maps oids to state managers. By default, this creates a
+ * Maps oids to state managers. By default, this creates a
* {@link ReferenceMap} with soft values.
*/
protected Map newManagedObjectCache() {
@@ -989,7 +987,7 @@
Object edata, int flags) {
if ((flags & OID_NOVALIDATE) == 0)
return true;
- if (edata != null) // take advantage of existing result
+ if (edata != null) // take advantage of existing result
return true;
if (initialized && sm.getPCState() != PCState.HOLLOW)
return false;
@@ -1248,7 +1246,7 @@
}
/**
- * End the current store manager transaction. Throws an
+ * End the current store manager transaction. Throws an
* exception to signal a forced rollback after failed commit, otherwise
* returns any exception encountered during the end process.
*/
@@ -1733,7 +1731,7 @@
}
/**
- * Mark the operation over. If outermost caller of stack, returns true
+ * Mark the operation over. If outermost caller of stack, returns true
* and will detach manageed instances if necessary.
*/
public boolean endOperation() {
@@ -1860,8 +1858,8 @@
}
/**
- * Flush the transactional state to the data store. Subclasses that
- * customize commit behavior should override this method. The method
+ * Flush the transactional state to the data store. Subclasses that
+ * customize commit behavior should override this method. The method
* assumes that the persistence manager is locked, is not closed,
* and has an active transaction.
*
@@ -3568,7 +3566,7 @@
if (obj == null)
return;
- beginOperation(true); // have to sync or lock level always NONE
+ beginOperation(true); // have to sync or lock level always NONE
try {
lock(obj, _fc.getWriteLockLevel(), _fc.getLockTimeout(), call);
}
@@ -3593,7 +3591,7 @@
return;
_lm.lock(sm, level, timeout, null);
- sm.readLocked(level, level); // use same level for future write
+ sm.readLocked(level, level); // use same level for future write
}
catch (OpenJPAException ke) {
throw ke;
@@ -3610,7 +3608,7 @@
if (objs.isEmpty())
return;
- beginOperation(true); // have to sync or lock level always NONE
+ beginOperation(true); // have to sync or lock level always NONE
try {
lockAll(objs, _fc.getWriteLockLevel(), _fc.getLockTimeout(),
call);
@@ -3820,8 +3818,7 @@
* @param id the id previously used by the instance
* @param sm the state manager for the instance; if the state
* manager is transient, we'll stop managing the instance;
- * if it has updated its oid, we'll re-cache under the
- * new oid
+ * if it has updated its oid, we'll re-cache under the new oid
* @param status one of our STATUS constants describing why we're
* setting the state manager
*/
@@ -3873,8 +3870,7 @@
/**
* Notify the persistence manager that the given state manager should
- * be removed from the set of instances involved in the current
- * transaction.
+ * be removed from the set of instances involved in the current transaction.
*/
void removeFromTransaction(StateManagerImpl sm) {
lock();
@@ -3890,7 +3886,7 @@
}
/**
- * Notification that the given instance has been dirtied. This
+ * Notification that the given instance has been dirtied. This
* notification is given when an object first transitions to a dirty state,
* and every time the object is modified by the user thereafter.
*/
@@ -3961,8 +3957,7 @@
/**
* Notify the persistence manager that the given state manager should
- * be removed from the set of instances involved in the next
- * transaction.
+ * be removed from the set of instances involved in the next transaction.
*/
void removeFromPendingTransaction(StateManagerImpl sm) {
lock();
@@ -4003,7 +3998,7 @@
/**
* Remove the given previously dereferenced dependent object from the
- * cache. It is now referenced.
+ * cache. It is now referenced.
*/
void removeDereferencedDependent(StateManagerImpl sm) {
lock();
@@ -4387,10 +4382,10 @@
*/
private static class ManagedCache {
- private final Map _main; // oid -> sm
- private Map _conflicts = null; // conflict oid -> new sm
- private Map _news = null; // tmp id -> new sm
- private Collection _embeds = null; // embedded/non-persistent sms
+ private final Map _main; // oid -> sm
+ private Map _conflicts = null; // conflict oid -> new sm
+ private Map _news = null; // tmp id -> new sm
+ private Collection _embeds = null; // embedded/non-persistent sms
/**
* Constructor; supply primary cache map.
@@ -4876,7 +4871,7 @@
}
/**
- * Helper class to implement JCA interfaces. This is placed in a
+ * Helper class to implement JCA interfaces. This is placed in a
* separate class so that its methods do not interfere with the
* persistence manager APIs.
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.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.kernel;
/**
- * <p>FieldManager that responds to all fetch methods with the default value
- * for that field; used to clear the state of managed instances.</p>
+ * FieldManager that responds to all fetch methods with the default value
+ * for that field; used to clear the state of managed instances.
*
* @author Abe White
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.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>Connection retain mode constants.</p>
+ * Connection retain mode constants.
*
* @author Abe White
* @since 4.0
@@ -35,8 +35,8 @@
public static final int CONN_RETAIN_TRANS = 1;
/**
- * Constant indicating that each broker will retain a single connection
- * that it will use for its lifespan.
+ * Constant indicating that each broker will retain a single connection
+ * that it will use for its lifespan.
*/
public static final int CONN_RETAIN_ALWAYS = 2;
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.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,
@@ -38,8 +38,8 @@
///////////////////////////////////////////////////////////////
/**
- * <p>Delegating broker that can also perform exception translation
- * for use in facades.</p>
+ * Delegating broker that can also perform exception translation
+ * for use in facades.
*
* @since 4.0
* @author Abe White
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.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,8 +26,8 @@
///////////////////////////////////////////////////////////////
/**
- * <p>Delegating broker factory that can also perform exception translation
- * for use in facades.</p>
+ * Delegating broker factory that can also perform exception translation
+ * for use in facades.
*
* @since 4.0
* @author Abe White
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.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,8 +26,8 @@
///////////////////////////////////////////////////////////////
/**
- * <p>Delegating extent that also can perform exception translation for use
- * in facades.</p>
+ * Delegating extent that also can perform exception translation for use
+ * in facades.
*
* @since 4.0
* @author Abe White
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.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,8 +28,8 @@
///////////////////////////////////////////////////////////////
/**
- * <p>Delegating fetch configuration that can also perform exception
- * translation for use in facades.</p>
+ * Delegating fetch configuration that can also perform exception
+ * translation for use in facades.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.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,8 +25,8 @@
import org.apache.openjpa.util.RuntimeExceptionTranslator;
/**
- * <p>Delegating query that can also perform exception translation
- * for use in facades.</p>
+ * Delegating query that can also perform exception translation
+ * for use in facades.
*
* @since 4.0
* @author Abe White
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.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,8 +25,8 @@
import org.apache.openjpa.util.RuntimeExceptionTranslator;
/**
- * <p>Delegating result list that can also perform exception translation
- * for use in facades.</p>
+ * Delegating result list that can also perform exception translation
+ * for use in facades.
*
* @since 4.0
* @author Marc Prud'hommeaux
@@ -336,7 +336,7 @@
}
/**
- * Delegating iterator that also performs exception translation.
+ * Delegating iterator that also performs exception translation.
*/
public class DelegatingListIterator
implements ListIterator {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.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,8 +24,8 @@
///////////////////////////////////////////////////////////////
/**
- * <p>Delegating sequence that can also perform exception translation for use
- * in facades.</p>
+ * Delegating sequence that can also perform exception translation for use
+ * in facades.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.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,8 +23,8 @@
import org.apache.openjpa.meta.FieldMetaData;
/**
- * <p>Base class for store manager decorators that delegate to another
- * store manager for some operations.</p>
+ * Base class for store manager decorators that delegate to another
+ * store manager for some operations.
*
* @author Abe White
*/
@@ -35,7 +35,7 @@
private final DelegatingStoreManager _del;
/**
- * Constructor. Supply delegate.
+ * Constructor. Supply delegate.
*/
public DelegatingStoreManager(StoreManager store) {
_store = store;
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.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,
@@ -133,7 +133,7 @@
* Ready the object for detachment, including loading the fields to be
* detached and updating version information.
*
- * @param idxs the indexes of fields to detach will be set as a side
+ * @param idxs the indexes of fields to detach will be set as a side
* effect of this method
*/
private static void preDetach(Broker broker, StateManagerImpl sm,
@@ -193,7 +193,7 @@
/**
* Flush or invoke pre-store callbacks on the given broker if
- * needed. Return true if flushed/stored, false otherwise.
+ * needed. Return true if flushed/stored, false otherwise.
*/
private static boolean flushDirty(StateManagerImpl sm) {
if (!sm.isDirty())
@@ -232,8 +232,8 @@
/**
* Constructor.
*
- * @param broker owning broker
- * @param full whether the entire broker cache is being detached; if
+ * @param broker owning broker
+ * @param full whether the entire broker cache is being detached; if
* this is the case, we assume the broker has already
* flushed if needed, and that we're detaching in-place
*/
@@ -287,7 +287,7 @@
}
/**
- * Return detached versions of all the given instances. If not copying,
+ * Return detached versions of all the given instances. If not copying,
* null will be returned.
*/
public Object[] detachAll(Collection instances) {
@@ -545,12 +545,12 @@
}
/**
- * FieldManager that can copy all the fields from one
- * PersistenceCapable instance to another. One of the
- * instances must be managed by a StateManager, and the
- * other must be unmanaged.
+ * FieldManager that can copy all the fields from one
+ * PersistenceCapable instance to another. One of the
+ * instances must be managed by a StateManager, and the
+ * other must be unmanaged.
*
- * @author Marc Prud'hommeaux
+ * @author Marc Prud'hommeaux
*/
private class InstanceDetachFieldManager
extends DetachFieldManager {
@@ -559,7 +559,7 @@
private final DetachedStateManager _detSM;
/**
- * Constructor. Supply instance to to copy to.
+ * Constructor. Supply instance to to copy to.
*/
public InstanceDetachFieldManager(PersistenceCapable to,
DetachedStateManager detSM) {
@@ -780,7 +780,7 @@
}
/**
- * Make sure all the values in the given map are detached.
+ * Make sure all the values in the given map are detached.
*/
private void detachMap(Map map, Map orig, FieldMetaData fmd) {
// map can be null if not copyable (lrs, for instance)
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.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>Constants for which fields to include in the detach graph.</p>
+ * Constants for which fields to include in the detach graph.
*
* @author Abe White
* @since 4.0
@@ -34,7 +34,7 @@
public static final int DETACH_LOADED = 1;
/**
- * Mode to detach all fields.
+ * Mode to detach all fields.
*/
public static final int DETACH_ALL = 2;
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.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/kernel/DetachedStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.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,8 +34,8 @@
import org.apache.openjpa.util.UnsupportedException;
/**
- * <p>Internal state manager for detached instances. Does not fully
- * implement {@link OpenJPAStateManager} contract to allow for serialization.</p>
+ * Internal state manager for detached instances. Does not fully
+ * implement {@link OpenJPAStateManager} contract to allow for serialization.
*
* @author Steve Kim
* @nojavadoc
@@ -59,11 +59,11 @@
/**
* Constructor.
*
- * @param pc the managed instance
- * @param sm the instance's state manager
- * @param load the set of detached field indexes
- * @param access whether to allow access to unloaded fields
- * @param multithreaded whether the instance will be used concurrently
+ * @param pc the managed instance
+ * @param sm the instance's state manager
+ * @param load the set of detached field indexes
+ * @param access whether to allow access to unloaded fields
+ * @param multithreaded whether the instance will be used concurrently
* by multiple threads
*/
public DetachedStateManager(PersistenceCapable pc, OpenJPAStateManager sm,
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.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,
@@ -31,7 +31,7 @@
import serp.util.Numbers;
/**
- * <p>Implementation of {@link OpenJPAStateManager} designed to retrieve
+ * Implementation of {@link OpenJPAStateManager} designed to retrieve
* values from a detached instance, including when managed by a
* {@link DetachedStateManager}.
*
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.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 an embedded instance that is managed by a StateManager and
+ * Lifecycle state.
+ * Represents an embedded instance that is managed by a StateManager and
* may be participating in the current transaction, but has not yet been
- * modified.</p>
+ * modified.
*
* @author Abe White
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.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 copied and made embedded within the
- * current transaction.</p>
+ * Lifecycle state.
+ * Represents an instance that was copied and made embedded within the
+ * current transaction.
*
* @author Abe White
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.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 embedded instance that has been deleted in the current
- * transaction.</p>
+ * Lifecycle state.
+ * Represents an embedded 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/EDirtyState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.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 embedded instance that is participating in the current
- * transaction, and has been modified.</p>
+ * Lifecycle state.
+ * Represents an embedded 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/ENonTransState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.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 an embedded instance that is not transactional, but that
- * allows access to persistent data. This state is reachable only if the
- * retainValues flag of the broker is set.</p>
+ * Lifecycle state.
+ * Represents an embedded instance that is not transactional, but that
+ * allows access to persistent data. This state is reachable only if the
+ * retainValues flag of the broker is set.
*
* @author Abe White
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.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,
@@ -48,27 +48,25 @@
import org.apache.openjpa.util.UserException;
/**
- * <p>Implementation of an expression-based query, which can handle
+ * Implementation of an expression-based query, which can handle
* String-based query expressions such as JPQL and JDOQL.
* This implementation is suitable for in-memory operation.
- * Override the following methods to also support
- * datastore operation:
+ * Override the following methods to also support datastore operation:
* <ul>
* <li>Override {@link #supportsDataStoreExecution} to return
* <code>true</code>.</li>
* <li>Override {@link #executeQuery}, {@link #executeDelete}, and
* {@link #executeUpdate} to execute the query against the data store.
* Keep in mind that the parameters passed to this method might be in use
- * by several threads in different query instances. Thus components like
+ * by several threads in different query instances. Thus components like
* the expression factory must either be thread safe, or this method must
* synchronize on them.</li>
* <li>Override {@link #getDataStoreActions} to return a representation of
- * the actions that will be taken on the data store. For use in visual
+ * the actions that will be taken on the data store. For use in visual
* tools.</li>
* <li>Override {@link #getExpressionFactory} to return a factory for creating
- * expressions in the datastore's language. The factory must be
- * cachable.</li>
- * </ul></p>
+ * expressions in the datastore's language. The factory must be cachable.</li>
+ * </ul>
*
* @author Abe White
*/
@@ -168,22 +166,20 @@
/**
* Execute the given expression against the given candidate extent.
*
- * @param ex current executor
- * @param base the base type the query should match
- * @param types the independent candidate types
- * @param subclasses true if subclasses should be included in the
- * results
- * @param facts the expression factory used to build the query for
+ * @param ex current executor
+ * @param base the base type the query should match
+ * @param types the independent candidate types
+ * @param subclasses true if subclasses should be included in the results
+ * @param facts the expression factory used to build the query for
* each base type
- * @param parsed the parsed query values
- * @param params parameter values, or empty array
- * @param lrs whether the result will be handled as a potentially
+ * @param parsed the parsed query values
+ * @param params parameter values, or empty array
+ * @param lrs whether the result will be handled as a potentially
* large result set, or will be consumed greedily
- * @param startIdx 0-based inclusive index for first result to return
+ * @param startIdx 0-based inclusive index for first result to return
* from result object provider
- * @param endIdx 0-based exclusive index for last result to return
- * from result object provider, or
- * {@link Long#MAX_VALUE} for no max
+ * @param endIdx 0-based exclusive index for last result to return
+ * from result object provider, or {@link Long#MAX_VALUE} for no max
* @return a provider for matching objects
*/
protected ResultObjectProvider executeQuery(Executor ex,
@@ -197,15 +193,14 @@
* Execute the given expression against the given candidate extent
* and delete the instances.
*
- * @param ex current executor
- * @param base the base type the query should match
- * @param types the independent candidate types
- * @param subclasses true if subclasses should be included in the
- * results
- * @param facts the expression factory used to build the query for
+ * @param ex current executor
+ * @param base the base type the query should match
+ * @param types the independent candidate types
+ * @param subclasses true if subclasses should be included in the results
+ * @param facts the expression factory used to build the query for
* each base type
- * @param parsed the parsed query values
- * @param params parameter values, or empty array
+ * @param parsed the parsed query values
+ * @param params parameter values, or empty array
* @return a number indicating the number of instances deleted,
* or null to execute the delete in memory
*/
@@ -219,15 +214,14 @@
* Execute the given expression against the given candidate extent
* and updates the instances.
*
- * @param ex current executor
- * @param base the base type the query should match
- * @param types the independent candidate types
- * @param subclasses true if subclasses should be included in the
- * results
- * @param facts the expression factory used to build the query for
+ * @param ex current executor
+ * @param base the base type the query should match
+ * @param types the independent candidate types
+ * @param subclasses true if subclasses should be included in the results
+ * @param facts the expression factory used to build the query for
* each base type
- * @param parsed the parsed query values
- * @param params parameter values, or empty array
+ * @param parsed the parsed query values
+ * @param params parameter values, or empty array
* @return a number indicating the number of instances updated,
* or null to execute the update in memory.
*/
@@ -241,20 +235,18 @@
* Return the commands that will be sent to the datastore in order
* to execute the query, typically in the database's native language.
*
- * @param ex current executor
- * @param base the base type the query should match
- * @param types the independent candidate types
- * @param subclasses true if subclasses should be included in the
- * results
- * @param facts the expression factory used to build the query for
+ * @param ex current executor
+ * @param base the base type the query should match
+ * @param types the independent candidate types
+ * @param subclasses true if subclasses should be included in the results
+ * @param facts the expression factory used to build the query for
* each base type
- * @param parsed the parsed query values
- * @param params parameter values, or empty array
- * @param startIdx 0-based inclusive index for first result to return
+ * @param parsed the parsed query values
+ * @param params parameter values, or empty array
+ * @param startIdx 0-based inclusive index for first result to return
* from result object provider
- * @param endIdx 0-based exclusive index for last result to return
- * from result object provider, or
- * {@link Long#MAX_VALUE} for no max
+ * @param endIdx 0-based exclusive index for last result to return
+ * from result object provider, or {@link Long#MAX_VALUE} for no max
* @return a textual description of the query to execute
*/
protected String[] getDataStoreActions(Executor ex, ClassMetaData base,
@@ -275,8 +267,8 @@
/**
* Return an {@link ExpressionFactory} to use to create an expression to
- * be executed against an extent. Each factory will be used to compile
- * one filter only. The factory must be cachable.
+ * be executed against an extent. Each factory will be used to compile
+ * one filter only. The factory must be cachable.
*/
protected ExpressionFactory getExpressionFactory(ClassMetaData type) {
throw new UnsupportedException();
@@ -528,10 +520,10 @@
}
/**
- * The DataStoreExecutor executes the query against the
- * implementation's overridden {@link #executeQuery} method.
+ * The DataStoreExecutor executes the query against the
+ * implementation's overridden {@link #executeQuery} method.
*
- * @author Marc Prud'hommeaux
+ * @author Marc Prud'hommeaux
*/
private static class DataStoreExecutor
extends AbstractExpressionExecutor
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.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 java.util.List;
/**
- * <p>Representation of all members of a persistent class.</p>
+ * Representation of all members of a persistent class.
*
* @author Abe White
* @author Patrick Linskey
@@ -33,14 +33,12 @@
public FetchConfiguration getFetchConfiguration();
/**
- * Whether this extent will ignore changes made in the current
- * transaction.
+ * Whether this extent will ignore changes made in the current transaction.
*/
public boolean getIgnoreChanges();
/**
- * Whether this extent will ignore changes made in the current
- * transaction.
+ * Whether this extent will ignore changes made in the current transaction.
*/
public void setIgnoreChanges(boolean ignoreChanges);
@@ -84,7 +82,7 @@
public void lock();
/**
- * Release the internal lock.
+ * Release the internal lock.
*/
public void unlock ();
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.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.OpenJPAException;
/**
- * <p>Representation of all members of a persistent class.</p>
+ * Representation of all members of a persistent class.
*
* @author Abe White
* @author Patrick Linskey
@@ -59,9 +59,9 @@
/**
* Constructor.
*
- * @param broker the owning broker
- * @param type the candidate class
- * @param subs whether subclasses are included in the extent
+ * @param broker the owning broker
+ * @param type the candidate class
+ * @param subs whether subclasses are included in the extent
*/
ExtentImpl(Broker broker, Class type, boolean subs,
FetchConfiguration fetch) {
@@ -327,8 +327,8 @@
}
/**
- * Iterator over all new objects in this extent. This iterator is always
- * wrapped, so it doesn't need to keep track of whether it's closed.
+ * Iterator over all new objects in this extent. This iterator is always
+ * wrapped, so it doesn't need to keep track of whether it's closed.
*/
private class FilterNewIterator
extends FilterIterator
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.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,8 +23,8 @@
import org.apache.openjpa.lib.rop.ResultObjectProvider;
/**
- * <p>Allows configuration and optimization of how objects are loaded from
- * the data store.</p>
+ * Allows configuration and optimization of how objects are loaded from
+ * the data store.
*
* @since 3.0
* @author Abe White
@@ -53,8 +53,8 @@
/**
* Called automatically by the system to associate the fetch configuration
- * with a context before use. The fetch configuration properties should
- * be synchronized with the context's configuration object. Subclasses
+ * with a context before use. The fetch configuration properties should
+ * be synchronized with the context's configuration object. Subclasses
* for specific back ends cannot rely on the context's configuration
* implementing their back end's configuration sub-interface.
*/
@@ -72,14 +72,14 @@
/**
* Return the fetch batch size for large result set support.
- * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
+ * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
* that this property will be ignored under some data stores.
*/
public int getFetchBatchSize();
/**
* Set the fetch batch size for large result set support.
- * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
+ * Defaults to the <code>org.apache.openjpa.FetchBatchSize</code> setting. Note
* that this property will be ignored under some data stores.
*/
public FetchConfiguration setFetchBatchSize(int fetchBatchSize);
@@ -100,7 +100,7 @@
public FetchConfiguration setMaxFetchDepth(int max);
/**
- * Return whether or not query caching is enabled. If this returns
+ * Return whether or not query caching is enabled. If this returns
* <code>true</code> but the datacache plugin is not installed, caching
* will not be enabled. If this
* returns <code>false</code>, query caching will not be used
@@ -109,7 +109,7 @@
public boolean getQueryCache();
/**
- * Control whether or not query caching is enabled. This has no effect
+ * Control whether or not query caching is enabled. This has no effect
* if the datacache plugin is not installed, or if the query cache size
* is set to zero.
*/
@@ -127,7 +127,7 @@
/**
* Returns immutable set of names of the fetch groups that this component
- * will use when loading objects. Defaults to the
+ * will use when loading objects. Defaults to the
* <code>org.apache.openjpa.FetchGroups</code> setting.
*
* @return empty set if no group has been added.
@@ -184,7 +184,7 @@
/**
* Returns the set of fully-qualified field names that this component
- * will use when loading objects. Defaults to the empty set.
+ * will use when loading objects. Defaults to the empty set.
*/
public Set getFields();
@@ -303,12 +303,12 @@
public void setHint(String name, Object value);
/**
- * Returns the hint for the specific key, or null if the hint
- * is not specified.
+ * Returns the hint for the specific key, or null if the hint
+ * is not specified.
*
- * @param name the hint name
+ * @param name the hint name
*
- * @since 4.0
+ * @since 4.0
*/
public Object getHint (String name);
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.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,
@@ -38,8 +38,8 @@
import org.apache.openjpa.util.NoTransactionException;
/**
- * <p>Allows configuration and optimization of how objects are loaded from
- * the data store.</p>
+ * Allows configuration and optimization of how objects are loaded from
+ * the data store.
*
* @since 3.0
* @author Abe White
@@ -99,7 +99,7 @@
}
/**
- * Return a new hollow instance. Subclasses should override to return
+ * Return a new hollow instance. Subclasses should override to return
* a new instance of their type, with cached permissions set appropriately.
*/
protected FetchConfigurationImpl newInstance() {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchState.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/kernel/FetchStateImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchStateImpl.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchStateImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchStateImpl.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,
@@ -130,7 +130,7 @@
*
* @param fm
* @return maximum recursion depth across common fetch groups. -1 is treated
- * as positive infinity.
+ * as positive infinity.
*/
protected int initalizeRecusrionDepth(FieldMetaData fm) {
Set commonFGNs = new HashSet();
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.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 serp.util.Strings;
/**
- * <p>Helper methods for dealing with query filters.</p>
+ * Helper methods for dealing with query filters.
*
* @author Abe White
* @nojavadoc
@@ -505,11 +505,11 @@
/**
* Parses the given declarations into a list of type, name, type, name...
- * Returns null if no declarations. Assumes declaration is not an empty
+ * Returns null if no declarations. Assumes declaration is not an empty
* string and is already trimmed (valid assumptions given the checks made
* in our setters).
*
- * @param decType the type of declaration being parsed, for use in
+ * @param decType the type of declaration being parsed, for use in
* error messages
*/
public static List parseDeclaration(String dec, char split,
@@ -561,7 +561,7 @@
}
/**
- * Split the given expression list into distinct expressions. Assumes the
+ * Split the given expression list into distinct expressions. Assumes the
* given string is not null or of zero length and is already trimmed
* (valid assumptions given the checks in our setters and before
* this method call).
@@ -649,8 +649,7 @@
/**
* Add the given access path metadatas to the full path list, making sure
- * to maintain only base metadatas in the list. The given list may
- * be null.
+ * to maintain only base metadatas in the list. The given list may be null.
*/
public static List addAccessPathMetaDatas(List metas,
ClassMetaData[] path) {
@@ -838,7 +837,7 @@
}
/**
- * Set the value of the property named by the hint key.
+ * Set the value of the property named by the hint key.
*/
public static void hintToSetter(Object target, String hintKey,
Object value) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.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,15 +16,15 @@
package org.apache.openjpa.kernel;
/**
- * <p>Allows facades to control the particulars of the find operation
- * through callbacks.</p>
+ * Allows facades to control the particulars of the find operation
+ * through callbacks.
*
* @author Abe White
*/
public interface FindCallbacks {
/**
- * Process find argument. Throw proper {@link OpenJPAException}
+ * Process find argument. Throw proper {@link OpenJPAException}
* for illegal value.
*
* @return the id to look up, or null to ignore this argument
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.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,13 +16,12 @@
package org.apache.openjpa.kernel;
/**
- * <p>Lifecycle state.</p>
- * <p/>
- * <p>Represents a hollow instance that exists in the data store, but whose
+ * Lifecycle state.
+ * Represents a hollow instance that exists in the data store, but whose
* state has not been loaded and who is not active in the current transaction
- * (if any). This may be the state of instances returned on ID lookups or by
+ * (if any). This may be the state of instances returned on ID lookups or by
* traversing relations, and the state of persistent instances outside of
- * transactions (unless the retainValues flag is set in the Broker).</p>
+ * transactions (unless the retainValues flag is set in the Broker).
*
* @author Abe White
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.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,7 @@
package org.apache.openjpa.kernel;
/**
- * <p>A {@link SavepointManager} implementation which stores all data
- * in memory.</p>
+ * A {@link SavepointManager} implementation which stores all data in memory.
*
* @author Steve Kim
* @since 3.4
@@ -29,7 +28,7 @@
/**
* Return whether to call {@link Broker#preFlush}
- * when a savepoint is set. While this will allow for tracking of
+ * when a savepoint is set. While this will allow for tracking of
* newly embedded fields, it has the side effect of going through
* pre-flush operations.
*/
@@ -39,7 +38,7 @@
/**
* Set whether to call {@link Broker#preFlush}
- * when a savepoint is set. While this will allow for tracking of
+ * when a savepoint is set. While this will allow for tracking of
* newly embedded fields, it has the side effect of going through
* pre-flush operations.
*/
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.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,
@@ -31,10 +31,9 @@
import org.apache.openjpa.util.InvalidStateException;
/**
- * <p>Class which manages inverse relations before flushing
- * to the datastore. Ensures that inverse fields are set.</p>
- * <p/>
- * <p>Currently limited to managing PC and Collection-type relations.</p>
+ * Class which manages inverse relations before flushing
+ * to the datastore. Ensures that inverse fields are set.
+ * Currently limited to managing PC and Collection-type relations.
*
* @author Steve Kim
*/
@@ -72,7 +71,7 @@
}
/**
- * Set whether to false LRS relations. Defaults to false.
+ * Set whether to false LRS relations. Defaults to false.
*/
public void setManageLRS(boolean manage) {
_manageLRS = manage;
@@ -123,7 +122,7 @@
/**
* Correct relations from the given dirty field to inverse instances.
* Field <code>fmd</code> of the instance managed by <code>sm</code> has
- * value <code>value</code>. Ensure that all inverses relations from
+ * value <code>value</code>. Ensure that all inverses relations from
* <code>value</code> are consistent with this.
*/
public void correctRelations(OpenJPAStateManager sm, FieldMetaData fmd,
@@ -227,7 +226,7 @@
/**
* Remove all relations between the initial value of <code>fmd</code> for
- * the instance managed by <code>sm</code> and its inverses. Relations
+ * the instance managed by <code>sm</code> and its inverses. Relations
* shared with <code>newValue</code> can be left intact.
*/
protected void clearInverseRelations(OpenJPAStateManager sm,
@@ -296,8 +295,8 @@
}
/**
- * Store null value at the given field. Verify that the given compare
- * value is the value being nulled. Pass NONE for no comparison.
+ * Store null value at the given field. Verify that the given compare
+ * value is the value being nulled. Pass NONE for no comparison.
*/
protected void storeNull(OpenJPAStateManager sm, FieldMetaData fmd,
Object compare) {
@@ -305,7 +304,7 @@
}
/**
- * Store a given value at the given field. Compare the given
+ * Store a given value at the given field. Compare the given
* argument if not NONE.
*/
protected void storeField(OpenJPAStateManager sm, FieldMetaData fmd,
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.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,9 +30,9 @@
import org.apache.openjpa.util.StoreException;
/**
- * <p>Uses a local implementation of the {@link TransactionManager} interface.
+ * Uses a local implementation of the {@link TransactionManager} interface.
* This manager is valid only for a single {@link Broker}.
- * It duplicates non-managed transaction control.</p>
+ * It duplicates non-managed transaction control.
*
* @author Abe White
*/
@@ -48,7 +48,7 @@
private boolean _rollbackOnly = false;
/**
- * Constructor. Provide broker that will be requesting managed
+ * Constructor. Provide broker that will be requesting managed
* transaction info.
*/
public LocalManagedRuntime(Broker broker) {
@@ -140,7 +140,7 @@
/**
* Notifies the factory sync that the transaction has ended with
- * the given status. Clears all transaction state regardless
+ * the given status. Clears all transaction state regardless
* of any exceptions during the callback.
*/
private void notifyAfterCompletion(int status) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.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>Standard object lock levels.</p>
+ * Standard object lock levels.
*
* @author Abe White
* @since 4.0
@@ -24,17 +24,17 @@
public interface LockLevels {
/**
- * No lock. Value of 0.
+ * No lock. Value of 0.
*/
public static final int LOCK_NONE = 0;
/**
- * Generic read lock level. Value of 10.
+ * Generic read lock level. Value of 10.
*/
public static final int LOCK_READ = 10;
/**
- * Generic write lock level. Value of 20.
+ * Generic write lock level. Value of 20.
*/
public static final int LOCK_WRITE = 20;
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.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.lib.util.Closeable;
/**
- * Handles obtaining and releasing locks on objects. The lock manager
+ * Handles obtaining and releasing locks on objects. The lock manager
* generally does not have to worry about synchronization, as the context is
* responsible for synchronizing the calls it makes to the lock manager.
*
@@ -43,26 +43,26 @@
public int getLockLevel(OpenJPAStateManager sm);
/**
- * Obtain a lock on the specified object. This method may be called when
+ * Obtain a lock on the specified object. This method may be called when
* a user explicitly locks an object, and is also called automatically
- * for every object accessed during a transaction. The implementation
+ * for every object accessed during a transaction. The implementation
* must track already-locked objects, and must be optimized to return
* quickly when the given object does not need additional locking.
* The lock manager might use the state manager's lock object for
* bookkeeping information.
*
- * @param sm the object to lock
- * @param level one of the lock constants defined in {@link LockLevels},
+ * @param sm the object to lock
+ * @param level one of the lock constants defined in {@link LockLevels},
* or a custom level
- * @param timeout the timeout in milliseconds, or a negative number for
+ * @param timeout the timeout in milliseconds, or a negative number for
* no timeout
- * @param sdata the context information passed from the store manager
+ * @param sdata the context information passed from the store manager
* to the persistence context, if any; lock managers
* specific to a certain back end may be able to take
* advantage of this; others should ignore it
* @throws LockException if a lock cannot be obtained in the
* given number of milliseconds
- * @see OpenJPAStateManager#setLock
+ * @see OpenJPAStateManager#setLock
*/
public void lock(OpenJPAStateManager sm, int level, int timeout,
Object sdata);
@@ -76,33 +76,33 @@
Object sdata);
/**
- * Release the lock on the given object. This method will be called
+ * Release the lock on the given object. This method will be called
* automatically for each state manager with a lock object set on
* transaction completion, just before the call to {@link #endTransaction}.
- * The lock manager should null the state manager's lock object. Note
+ * The lock manager should null the state manager's lock object. Note
* that some state manager may be garbage collected during a transaction;
* thus lock managers cannot rely on this method being called for every
* state manager.
*
- * @see OpenJPAStateManager#setLock
+ * @see OpenJPAStateManager#setLock
*/
public void release(OpenJPAStateManager sm);
/**
- * Notification that a transaction is beginning. Locks are only obtained
+ * Notification that a transaction is beginning. Locks are only obtained
* within transactions, so an implementation might use this method to
* initialize bookkeeping datastructures, etc.
*/
public void beginTransaction();
/**
- * Notification that the current transaction has ended. Clear all
+ * Notification that the current transaction has ended. Clear all
* datastructures, release any left over locks, etc.
*/
public void endTransaction();
/**
- * Free any resources.
+ * Free any resources.
*/
public void close ();
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.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,
@@ -38,7 +38,7 @@
import org.apache.openjpa.util.UserException;
/**
- * <p>A query that is executed by a user-defined method.</p>
+ * A query that is executed by a user-defined method.
*
* @author Abe White
* @nojavadoc
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.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/kernel/ObjectIdStateManager.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.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,8 +32,7 @@
import serp.util.Numbers;
/**
- * <p>State manager used to access state of embedded object id primary key
- * fields.</p>
+ * State manager used to access state of embedded object id primary key fields.
*
* @author Abe White
* @nojavadoc
@@ -54,7 +53,7 @@
/**
* Constructor; supply embedded object id and its owner.
*
- * @param owner may be null
+ * @param owner may be null
*/
public ObjectIdStateManager(Object oid, OpenJPAStateManager owner,
ValueMetaData ownerVal) {
@@ -711,9 +710,9 @@
}
/**
- * Set the value of the given field using reflection.
- * Relies on the fact that all oid fields/properties are made public
- * during enhancement.
+ * Set the value of the given field using reflection.
+ * Relies on the fact that all oid fields/properties are made public
+ * during enhancement.
*/
private void setValue(int field, Object val, boolean forceInst) {
if (_oid == null && forceInst) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.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.kernel;
/**
- * <p>Allows facades to control the particulars of persistence operations
- * through callbacks.</p>
+ * Allows facades to control the particulars of persistence operations
+ * through callbacks.
*
* @author Abe White
*/
@@ -40,12 +40,12 @@
public static final int ACT_RUN = 2 << 1;
/**
- * Process operation argument. Throw proper {@link OpenJPAException}
+ * Process operation argument. Throw proper {@link OpenJPAException}
* for illegal value.
*
- * @param op the operation constant
- * @param arg the object passed to the operation
- * @param sm the argument's state manager, or null if none
+ * @param op the operation constant
+ * @param arg the object passed to the operation
+ * @param sm the argument's state manager, or null if none
* @return the action to take on the argument
*/
public int processArgument(int op, Object arg, OpenJPAStateManager sm);