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 [9/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/exps/StringLength.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.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 serp.util.Numbers;
 
 /**
- * <p>Returns the number of characters in the String.</p>
+ * Returns the number of characters in the String.
  *
  * @author Marc Prud'hommeaux
  */
@@ -30,7 +30,7 @@
     private Class _cast = null;
 
     /**
-     * Constructor.  Provide value to upper-case.
+     * Constructor. Provide value to upper-case.
      */
     public StringLength(Val val) {
         _val = val;

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

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.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.exps;
 
 /**
- * <p>Query value representing a subquery.</p>
+ * Query value representing a subquery.
  *
  * @author Abe White
  * @since 3.2

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.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.kernel.StoreContext;
 
 /**
- * <p>Take the substring of a string.</p>
+ * Take the substring of a string.
  *
  * @author Abe White
  */
@@ -29,7 +29,7 @@
     private final Val _args;
 
     /**
-     * Constructor.  Provide value to take substring of and arguments to
+     * Constructor. Provide value to take substring of and arguments to
      * substring method.
      */
     public Substring(Val val, Val args) {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.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.kernel.Filters;
 
 /**
- * <p>Value produced by one value being subtracted from another.</p>
+ * Value produced by one value being subtracted from another.
  *
  * @author Abe White
  */
@@ -26,7 +26,7 @@
     extends MathVal {
 
     /**
-     * Constructor.  Provide the values to subtract.
+     * Constructor. Provide the values to subtract.
      */
     public Subtract(Val val1, Val val2) {
         super(val1, val2);

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.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 serp.util.Numbers;
 
 /**
- * <p>Sum values.</p>
+ * Sum values.
  *
  * @author Abe White
  */
@@ -30,7 +30,7 @@
     extends AggregateVal {
 
     /**
-     * Constructor.  Provide the value to sum.
+     * Constructor. Provide the value to sum.
      */
     public Sum(Val val) {
         super(val);

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.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.kernel.StoreContext;
 
 /**
- * <p>Represents the 'this' ptr in a filter.</p>
+ * Represents the 'this' ptr in a filter.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.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.kernel.StoreContext;
 
 /**
- * <p>Lower-case a string.</p>
+ * Lower-case a string.
  *
  * @author Abe White
  */
@@ -28,7 +28,7 @@
     private final Val _val;
 
     /**
-     * Constructor.  Provide value to upper-case.
+     * Constructor. Provide value to upper-case.
      */
     public ToLowerCase(Val val) {
         _val = val;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.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.kernel.StoreContext;
 
 /**
- * <p>Upper-case a string.</p>
+ * Upper-case a string.
  *
  * @author Abe White
  */
@@ -28,7 +28,7 @@
     private final Val _val;
 
     /**
-     * Constructor.  Provide value to upper-case.
+     * Constructor. Provide value to upper-case.
      */
     public ToUpperCase(Val val) {
         _val = val;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.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.kernel.StoreContext;
 
 /**
- * <p>Trims leading, trailing, or both charactes from a String.</p>
+ * Trims leading, trailing, or both charactes from a String.
  *
  * @author Marc Prud'hommeaux
  */
@@ -30,7 +30,7 @@
     private final Boolean _where;
 
     /**
-     * Constructor.  Provide value to upper-case.
+     * Constructor. Provide value to upper-case.
      */
     public Trim(Val val, Val trimChar, Boolean where) {
         _val = val;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.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.kernel.StoreContext;
 
 /**
- * <p>Value produced by a mathematical operation on one value.</p>
+ * Value produced by a mathematical operation on one value.
  *
  * @author Abe White
  */
@@ -28,7 +28,7 @@
     private final Val _val;
 
     /**
-     * Constructor.  Provide the value to operate on.
+     * Constructor. Provide the value to operate on.
      */
     public UnaryMathVal(Val val) {
         _val = val;
@@ -62,7 +62,7 @@
     protected abstract Class getType(Class c);
 
     /**
-     *	Return the result of this mathematical operation on the given value.
+     * Return the result of this mathematical operation on the given value.
      */
     protected abstract Object operate(Object o, Class c);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,9 +18,9 @@
 import org.apache.openjpa.kernel.StoreContext;
 
 /**
- * <p>Represents an unbound variable.  When the query is evaluated,
+ * Represents an unbound variable. When the query is evaluated,
  * expressions containing unbound variables will be
- * executed once for every element in the type's extent.</p>
+ * executed once for every element in the type's extent.
  *
  * @author Abe White
  */
@@ -31,7 +31,7 @@
     private Object _val = null;
 
     /**
-     * Constructor.  Provide variable name and type.
+     * Constructor. Provide variable name and type.
      */
     public UnboundVariable(Class type) {
         _type = type;
@@ -50,7 +50,7 @@
     }
 
     /**
-     * Set the variable's current value.  Expressions can be evaluated
+     * Set the variable's current value. Expressions can be evaluated
      * for every possible object in the extent of each unbound variable
      * when looking for a match.
      */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@
 import org.apache.openjpa.meta.ClassMetaData;
 
 /**
- * <p>An in-memory representation of a {@link Value}.</p>
+ * An in-memory representation of a {@link Value}.
  *
  * @author Abe White
  * @nojavadoc
@@ -83,9 +83,9 @@
 
     /**
      * Return a list of values resulting from evaluating each given
-     * candidate.   By default, this implementation invokes
+     * candidate. By default, this implementation invokes
      * {@link #eval(Object,Object,StoreContext,Map)} for
-     * each instance and packs the return value into a new list.  Aggregates
+     * each instance and packs the return value into a new list. Aggregates
      * should override.
      */
     protected Collection eval(Collection candidates, Object orig,

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.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.kernel.StoreContext;
 
 /**
- * <p>Boolean value used as an expression.</p>
+ * Boolean value used as an expression.
  *
  * @author Abe White
  */
@@ -30,7 +30,7 @@
     private final Val _val;
 
     /**
-     * Constructor.  Supply value.
+     * Constructor. Supply value.
      */
     public ValExpression(Val val) {
         _val = val;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.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,8 +18,8 @@
 import org.apache.openjpa.meta.ClassMetaData;
 
 /**
- * <p>Interface for any non-operator in a query filter, including
- * constants, variables, and object fields.</p>
+ * Interface for any non-operator in a query filter, including
+ * constants, variables, and object fields.
  *
  * @author Abe White
  */
@@ -33,7 +33,7 @@
 
     /**
      * Set the implicit type of the value, based on how it is used in the
-     * filter.  This method is only called on values who return
+     * filter. This method is only called on values who return
      * <code>Object</code> from {@link #getType}.
      */
     public void setImplicitType(Class type);
@@ -49,7 +49,7 @@
     public ClassMetaData getMetaData();
 
     /**
-     *	Associate a persistent type with this value.
+     * Associate a persistent type with this value.
      */
     public void setMetaData(ClassMetaData meta);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.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.kernel.StoreContext;
 
 /**
- * <p>Represents a path that begins with a variable or parameter.</p>
+ * Represents a path that begins with a variable or parameter.
  *
  * @author Abe White
  */
@@ -28,7 +28,7 @@
     private final Val _val;
 
     /**
-     * Constructor.  Supply context value.
+     * Constructor. Supply context value.
      */
     public ValuePath(Val val) {
         _val = val;

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.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,
@@ -13,23 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*********************************************************************
-
- **********************************************************************/
 package org.apache.openjpa.kernel.exps;
 
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.util.SimpleRegex;
 
 /**
- * <p>Tests if the target matches the wildcard expression given in the
- * argument.  The wildcard '?' is used to represent any single character,
- * while '*' is used to represent any series of 0 or more characters.</p>
- * <p/>
- * <p>Examples:<br />
- * <code>
- * "address.street.ext:wildcardMatch (\"?ain*reet\")"
- * </code></p>
+ * Tests if the target matches the wildcard expression given in the
+ * argument. The wildcard '?' is used to represent any single character,
+ * while '*' is used to represent any series of 0 or more characters.
+ *  Examples:<br />
+ * <code> "address.street.ext:wildcardMatch (\"?ain*reet\")"
+ * </code>
  *
  * @deprecated Use <code>matches()</code> instead.
  * @nojavadoc

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.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,
@@ -77,10 +77,10 @@
     /**
      * Constructor.
      *
-     * @param    factory            the expression factory to use
-     * @param    query            used to resolve variables, parameters,
+     * @param factory the expression factory to use
+     * @param query used to resolve variables, parameters,
      * and class names used in the query
-     * @param    parsedQuery        the parsed query
+     * @param parsedQuery the parsed query
      */
     public JPQLExpressionBuilder(ExpressionFactory factory,
         ExpressionStoreQuery query, Object parsedQuery) {
@@ -1454,8 +1454,7 @@
 
     /**
      * Base node that will be generated by the JPQLExpressionBuilder; base
-     * class of the {@link SimpleNode} that is used by
-     * {@link JPQL}.
+     * class of the {@link SimpleNode} that is used by {@link JPQL}.
      *
      * @author Marc Prud'hommeaux
      * @see Node

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.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/jpql/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.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,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * Signifies that a lexical error occurred when parsing the JPQL
- * statement.
+ * Signifies that a lexical error occurred when parsing the JPQL statement.
  *
  * @author <a href="mailto:mprudhom@bea.com">Marc Prud'hommeaux</a>
  */
@@ -33,7 +32,7 @@
 
     /**
      * This constructor is used by the method "generateParseException"
-     * in the generated parser.  Calling this constructor generates
+     * in the generated parser. Calling this constructor generates
      * a new object of this type with the fields "currentToken",
      * "expectedTokenSequences", and "tokenImage" set.
      * This constructor calls its super class with the empty string
@@ -49,11 +48,11 @@
 
     /**
      * The following constructors are for use by you for whatever
-     * purpose you can think of.  Constructing the exception in this
+     * purpose you can think of. Constructing the exception in this
      * manner makes the exception behave in the normal way - i.e., as
-     * documented in the class "Throwable".  The fields "errorToken",
+     * documented in the class "Throwable". The fields "errorToken",
      * "expectedTokenSequences", and "tokenImage" do not contain
-     * relevant information.  The JavaCC generated code does not use
+     * relevant information. The JavaCC generated code does not use
      * these constructors.
      */
     public ParseException() {
@@ -66,9 +65,9 @@
 
     /**
      * This method has the standard behavior when this object has been
-     * created using the standard constructors.  Otherwise, it uses
+     * created using the standard constructors. Otherwise, it uses
      * "currentToken" and "expectedTokenSequences" to generate a parse
-     * error message and returns it.  If this object has been created
+     * error message and returns it. If this object has been created
      * due to a parse error, and you do not catch it (it gets thrown
      * from the parser), then this method is called during the printing
      * of the final stack trace, and hence the correct error message
@@ -108,9 +107,8 @@
     }
 
     /**
-     *  Used to convert raw characters to their escaped version
-     *  when these raw version cannot be used as part of an ASCII
-     *  string literal.
+     * Used to convert raw characters to their escaped version
+     * when these raw version cannot be used as part of an ASCII string literal.
      */
     private static String escape(String str) {
         StringBuffer retval = new StringBuffer();

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.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/meta/AbstractCFMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.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,
@@ -49,8 +49,8 @@
 import serp.util.Strings;
 
 /**
- * <p>Base class for factory implementations built around XML metadata files
- * in the common fomat.</p>
+ * Base class for factory implementations built around XML metadata files
+ * in the common fomat.
  *
  * @author Abe White
  * @since 4.0
@@ -338,7 +338,7 @@
     /**
      * Assign default source files to the given metadatas.
      *
-     * @param    clsNames    map of class names to metadatas
+     * @param clsNames map of class names to metadatas
      * @return set of existing files used by these metadatas, or
      * null if no existing files
      */
@@ -387,7 +387,7 @@
     /**
      * Assign default source files to the given queries.
      *
-     * @param    clsNames    map of class names to metadatas
+     * @param clsNames map of class names to metadatas
      * @return set of existing files used by these metadatas, or
      * null if no existing files
      */
@@ -444,7 +444,7 @@
     }
 
     /**
-     * Whether to parse classes top down.  Defaults to false.
+     * Whether to parse classes top down. Defaults to false.
      */
     protected boolean isParseTopDown() {
         return false;
@@ -533,7 +533,7 @@
     /**
      * Create a new metadata parser.
      *
-     * @param    loading        if true, this will be the cached parser used for
+     * @param loading if true, this will be the cached parser used for
      * loading metadata
      */
     protected abstract Parser newParser(boolean loading);
@@ -546,7 +546,7 @@
     /**
      * Return the metadata that defines the given query, if any.
      *
-     * @param    clsNames    map of class names to metadatas
+     * @param clsNames map of class names to metadatas
      */
     protected ClassMetaData getDefiningMetaData(QueryMetaData query,
         Map clsNames) {
@@ -699,7 +699,7 @@
 
     /**
      * Implement this method to map metadata resources to the persistent
-     * types contained within them.  The method will be called when
+     * types contained within them. The method will be called when
      * {@link #getPersistentTypeNames} is invoked.
      */
     protected void mapPersistentTypeNames(Object rsrc, String[] names) {
@@ -723,7 +723,7 @@
         extends MetaDataParser {
 
         /**
-         * Returns the repository for this parser.  If none has been set,
+         * Returns the repository for this parser. If none has been set,
          * creates a new repository and sets it.
          */
         public MetaDataRepository getRepository();
@@ -735,13 +735,13 @@
     }
 
     /**
-     *	Internal serializer interface.
+     * Internal serializer interface.
      */
     public static interface Serializer
         extends MetaDataSerializer {
 
         /**
-         * The serialization mode according to the expected document type.  The
+         * The serialization mode according to the expected document type. The
          * mode constants act as bit flags, and therefore can be combined.
          */
         public void setMode(int mode);
@@ -767,8 +767,8 @@
         public void addQueryMetaData(QueryMetaData meta);
 
         /**
-         *	Add all components in the given repository to the set to be
-		 *	serialized.
+         * Add all components in the given repository to the set to be
+		 * serialized.
 		 */
 		public void addAll (MetaDataRepository repos);
 	}

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.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,
@@ -29,7 +29,7 @@
 import org.apache.openjpa.util.UserException;
 
 /**
- * </p>Abstract metadata defaults.</p>
+ * Abstract metadata defaults.
  *
  * @author Abe White
  */
@@ -46,7 +46,7 @@
 
     /**
      * Whether to attempt to use the information from registered classes
-     * to populate metadata defaults.  Defaults to true.
+     * to populate metadata defaults. Defaults to true.
      */
     public boolean getUsePCRegistry() {
         return _pcRegistry;
@@ -54,7 +54,7 @@
 
     /**
      * Whether to attempt to use the information from registered classes
-     * to populate metadata defaults.  Defaults to true.
+     * to populate metadata defaults. Defaults to true.
      */
     public void setUsePCRegistry(boolean pcRegistry) {
         _pcRegistry = pcRegistry;
@@ -129,7 +129,7 @@
     }
 
     /**
-     * Populate initial field data.  Does nothing by default.
+     * Populate initial field data. Does nothing by default.
      */
     protected void populate(FieldMetaData fmd) {
     }
@@ -209,7 +209,7 @@
     }
 
     /**
-     * Return the access type of the given metadata.  May be a bitwise
+     * Return the access type of the given metadata. May be a bitwise
      * combination of field and property access constants, or ACCESS_UNKNOWN.
      * Returns ACCESS_FIELD by default.
      */
@@ -218,11 +218,11 @@
     }
 
     /**
-     * Return the field name for the given member.  This will only be invoked
-     * on members of the right type (field vs. method).  Return null if the
-     * member cannot be managed.  Default behavior: For fields, returns the
-     * field name.  For getter methods, returns the minus "get" or "is" with
-     * the next letter lower-cased.  For other methods, returns null.
+     * Return the field name for the given member. This will only be invoked
+     * on members of the right type (field vs. method). Return null if the
+     * member cannot be managed. Default behavior: For fields, returns the
+     * field name. For getter methods, returns the minus "get" or "is" with
+     * the next letter lower-cased. For other methods, returns null.
      */
     protected String getFieldName(Member member) {
         if (member instanceof Field)
@@ -261,7 +261,7 @@
      * only be invoked on members of the right type (field vs. method).
      * Returns false if member is static or final by default.
      *
-     * @param    name    the field name from {@link #getFieldName}
+     * @param name the field name from {@link #getFieldName}
      */
     protected abstract boolean isDefaultPersistent(ClassMetaData meta,
         Member member, String name);
@@ -289,7 +289,7 @@
     }
 
     /**
-     * Return the method backing the given field metadata.  Looks for
+     * Return the method backing the given field metadata. Looks for
      * "get" and "is" methods with no parameters by default. This looks
      * for elements defined in <code>cls</code> and its superclasses.
      */
@@ -329,8 +329,8 @@
     }
 
     /**
-     *	Helper method; returns true if the given class appears to be
-     *	user-defined.
+     * Helper method; returns true if the given class appears to be
+     * user-defined.
      */
     protected static boolean isUserDefined(Class cls) {
         return cls != null && !cls.getName().startsWith("java.")

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.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 @@
 import serp.util.Strings;
 
 /**
- * </p>Abstract {@link MetaDataFactory} that provides default implementations
- * of many methods.</p>
+ * Abstract {@link MetaDataFactory} that provides default implementations
+ * of many methods.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.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,
@@ -57,13 +57,12 @@
 import serp.util.Strings;
 
 /**
- * <p>Contains metadata about a persistent type.
- * This metadata is available both at enhancement time and runtime.</p>
- * <p/>
- * <p>Note that this class employs aggressive caching, and therefore it is
+ * Contains metadata about a persistent type.
+ * This metadata is available both at enhancement time and runtime.
+ *  Note that this class employs aggressive caching, and therefore it is
  * important to finalize the configuration of field metadatas before invoking
  * methods that depend on that configuration, such as
- * {@link #getPrimaryKeyFields}.</p>
+ * {@link #getPrimaryKeyFields}.
  *
  * @author Abe White
  */
@@ -93,12 +92,12 @@
     public static final int ACCESS_UNKNOWN = 0;
 
     /**
-     * Persistent attributes are accessed via direct field access.  Bit flag.
+     * Persistent attributes are accessed via direct field access. Bit flag.
      */
     public static final int ACCESS_FIELD = 2 << 0;
 
     /**
-     * Persistent attributes are accessed via setters and getters.  Bit flag.
+     * Persistent attributes are accessed via setters and getters. Bit flag.
      */
     public static final int ACCESS_PROPERTY = 2 << 1;
 
@@ -171,7 +170,7 @@
     private final LifecycleMetaData _lifeMeta = new LifecycleMetaData(this);
 
     /**
-     * Constructor.  Supply described type and repository.
+     * Constructor. Supply described type and repository.
      */
     protected ClassMetaData(Class type, MetaDataRepository repos) {
         _repos = repos;
@@ -180,7 +179,7 @@
     }
 
     /**
-     * Embedded constructor.  Supply embedding value.
+     * Embedded constructor. Supply embedding value.
      */
     protected ClassMetaData(ValueMetaData owner) {
         _owner = owner;
@@ -211,7 +210,7 @@
     }
 
     /**
-     * Set the class descibed by this metadata.  The type may be reset when
+     * Set the class descibed by this metadata. The type may be reset when
      * an embedded value changes its declared type.
      */
     protected void setDescribedType(Class type) {
@@ -280,7 +279,7 @@
     }
 
     /**
-     * Whether this class is mapped to the datastore.  By default, only
+     * Whether this class is mapped to the datastore. By default, only
      * returns false if class is embedded-only, but subclasses might override
      * to allow unmapped other types.
      */
@@ -323,7 +322,7 @@
         if (_owner != null)
             return _repos.EMPTY_METAS;
 
-        Class[] subs = getPCSubclasses();    // checks for new
+        Class[] subs = getPCSubclasses(); // checks for new
         if (_subMetas == null) {
             if (subs.length == 0)
                 _subMetas = _repos.EMPTY_METAS;
@@ -345,7 +344,7 @@
         if (_owner != null)
             return _repos.EMPTY_METAS;
 
-        ClassMetaData[] subs = getPCSubclassMetaDatas();    // checks for new
+        ClassMetaData[] subs = getPCSubclassMetaDatas(); // checks for new
         if (_mapSubMetas == null) {
             if (subs.length == 0)
                 _mapSubMetas = subs;
@@ -362,15 +361,14 @@
     }
 
     /**
-     * The type of identity being used.  This will be one of:
+     * The type of identity being used. This will be one of:
      * <ul>
      * <li>{@link #ID_UNKNOWN}: unknown identity type</li>
      * <li>{@link #ID_DATASTORE}: identity managed by the data store and
      * independent	of the fields of the instance</li>
      * <li>{@link #ID_APPLICATION}: identity managed by the application and
      * defined by one or more fields of the instance</li>
-     * </ul>
-     * If unspecified, defaults to {@link #ID_DATASTORE} if there are no
+     * </ul> If unspecified, defaults to {@link #ID_DATASTORE} if there are no
      * primary key fields, and {@link #ID_APPLICATION} otherwise.
      */
     public int getIdentityType() {
@@ -396,15 +394,14 @@
     }
 
     /**
-     * The type of identity being used.  This will be one of:
+     * The type of identity being used. This will be one of:
      * <ul>
      * <li>{@link #ID_UNKNOWN}: unknown identity type</li>
      * <li>{@link #ID_DATASTORE}: identity managed by the data store and
      * independent	of the fields of the instance</li>
      * <li>{@link #ID_APPLICATION}: identity managed by the application and
      * defined by one or more fields of the instance</li>
-     * </ul>
-     * If unspecified, defaults to {@link #ID_DATASTORE} if there are no
+     * </ul> If unspecified, defaults to {@link #ID_DATASTORE} if there are no
      * primary key fields, and {@link #ID_APPLICATION} otherwise.
      */
     public void setIdentityType(int type) {
@@ -580,8 +577,7 @@
     /**
      * Returns the alias for the described type, or <code>null</code> if none
      * has been set.
-     * <p/>
-     * #see	setTypeAlias
+     *  #see	setTypeAlias
      */
     public String getTypeAlias() {
         if (_alias == null)
@@ -688,7 +684,7 @@
      * Return the impl / intermediate field data index of the given field
      * in the compacted array, or -1 if the field does not use extra data.
      *
-     * @see    #getExtraFieldDataLength
+     * @see #getExtraFieldDataLength
      */
     public int getExtraFieldDataIndex(int field) {
         return getExtraFieldDataTable()[field];
@@ -818,7 +814,7 @@
     }
 
     /**
-     * Return primary key fields, or empty array if none.  The order
+     * Return primary key fields, or empty array if none. The order
      * in which the keys are returned will be the order in which
      * the fields are declared, starting at the least-derived superclass
      * and ending with the primary key fields of the most-derived subclass.
@@ -997,8 +993,7 @@
     }
 
     /**
-     * Return the defined superclass field with the given name, or null if
-     * none.
+     * Return the defined superclass field with the given name, or null if none.
      */
     public FieldMetaData getDefinedSuperclassField(String name) {
         if (_supFieldMap == null)
@@ -1038,11 +1033,10 @@
 
     /**
      * Incorporate superclass fields redefined in this subclass into this
-     * metadata.  This method is generally called after metadata is resolved
+     * metadata. This method is generally called after metadata is resolved
      * and mapping information is loaded, but before mapping resolve.
      *
-     * @param    force    whether to force re-mapping of even mapped superclass
-     * fields
+     * @param force whether to force re-mapping of even mapped superclass fields
      */
     public void defineSuperclassFields(boolean force) {
         if (_defSupFields)
@@ -1120,7 +1114,7 @@
 
     /**
      * Returns all fields in the order they are listed in the metadata
-     * file.  Unlisted fields are placed after listed ones.
+     * file. Unlisted fields are placed after listed ones.
      */
     public FieldMetaData[] getFieldsInListingOrder() {
         if (_allListingFields == null) {
@@ -1154,7 +1148,7 @@
 
     /**
      * Returns all fields defined by this class in the order they are listed
-     * in the metadata file.  Unlisted fields are placed after listed ones.
+     * in the metadata file. Unlisted fields are placed after listed ones.
      * This array includes declared transactional and unmanaged fields.
      */
     public FieldMetaData[] getDefinedFieldsInListingOrder() {
@@ -1190,14 +1184,14 @@
     }
 
     /**
-     * Set the cache name for this class.  Set to null to disable caching.
+     * Set the cache name for this class. Set to null to disable caching.
      */
     public void setDataCacheName(String name) {
         _cacheName = name;
     }
 
     /**
-     * The cache timeout for this class.  -1 indicates no timeout.
+     * The cache timeout for this class. -1 indicates no timeout.
      */
     public int getDataCacheTimeout() {
         if (_cacheTimeout == Integer.MIN_VALUE) {
@@ -1212,7 +1206,7 @@
     }
 
     /**
-     * The cache timeout for this class.  -1 indicates no timeout.
+     * The cache timeout for this class. -1 indicates no timeout.
      */
     public void setDataCacheTimeout(int timeout) {
         _cacheTimeout = timeout;
@@ -1448,7 +1442,7 @@
     }
 
     /**
-     * Resolve and validate metadata.  Return true if already resolved.
+     * Resolve and validate metadata. Return true if already resolved.
      */
     public boolean resolve(int mode) {
         if ((_resMode & mode) == mode)
@@ -1501,7 +1495,7 @@
             meta.resolve(MODE_META);
             copy(this, meta);
             _embedded =
-                Boolean.FALSE;    // embedded instance isn't embedded-only
+                Boolean.FALSE; // embedded instance isn't embedded-only
         }
 
         // make sure superclass is resolved
@@ -1576,8 +1570,7 @@
     }
 
     /**
-     * Resolve mapping data.  Logs resolve message and resolves super
-     * by default.
+     * Resolve mapping data. Logs resolve message and resolves super by default.
      */
     protected void resolveMapping(boolean runtime) {
         Log log = _repos.getLog();
@@ -1600,7 +1593,7 @@
     }
 
     /**
-     * Initialize mapping.  Logs init message by default.
+     * Initialize mapping. Logs init message by default.
      */
     protected void initializeMapping() {
         Log log = _repos.getLog();
@@ -2030,7 +2023,7 @@
     }
 
     /**
-     * The index in which this class was listed in the metadata.  Defaults to
+     * The index in which this class was listed in the metadata. Defaults to
      * <code>-1</code> if this class was not listed in the metadata.
      */
     public int getListingIndex() {
@@ -2038,7 +2031,7 @@
     }
 
     /**
-     * The index in which this field was listed in the metadata.  Defaults to
+     * The index in which this field was listed in the metadata. Defaults to
      * <code>-1</code> if this class was not listed in the metadata.
      */
     public void setListingIndex(int index) {
@@ -2062,7 +2055,7 @@
     //////////////
 
     /**
-     * Copy the metadata from the given instance to this one.  Do not
+     * Copy the metadata from the given instance to this one. Do not
      * copy mapping information.
      */
     public void copy(ClassMetaData meta) {
@@ -2129,7 +2122,7 @@
     }
 
     /**
-     *	Comparator used to put field metadatas into listing order.
+     * Comparator used to put field metadatas into listing order.
      */
     private static class ListingOrderComparator
         implements Comparator {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.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.lib.meta.ClassArgParser;
 
 /**
- * <p>Base class for factory instances that use a delegate.</p>
+ * Base class for factory instances that use a delegate.
  *
  * @author Abe White
  * @nojavadoc

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.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,8 +30,8 @@
 import serp.util.Strings;
 
 /**
- * <p>Vendor extensions.  This class is thread safe for reads, but not for
- * mutations.</p>
+ * Vendor extensions. This class is thread safe for reads, but not for
+ * mutations.
  *
  * @author Abe White
  */
@@ -441,7 +441,7 @@
     }
 
     /**
-     *	Embedded extensions implementation.
+     * Embedded extensions implementation.
      */
     private static class EmbeddedExtensions
         extends Extensions {

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.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/meta/FieldMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.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,
@@ -55,7 +55,7 @@
 import serp.util.Strings;
 
 /**
- * <p>Metadata for a managed class field.</p>
+ * Metadata for a managed class field.
  *
  * @author Abe White
  */
@@ -186,9 +186,9 @@
     /**
      * Constructor.
      *
-     * @param    name    the field name
-     * @param    type    the field type
-     * @param    owner    the owning class metadata
+     * @param name the field name
+     * @param type the field type
+     * @param owner the owning class metadata
      */
     protected FieldMetaData(String name, Class type, ClassMetaData owner) {
         _name = name;
@@ -327,7 +327,7 @@
     }
 
     /**
-     * Return whether this field is mapped to the datastore.  By default,
+     * Return whether this field is mapped to the datastore. By default,
      * returns true for all persistent fields whose defining class is mapped.
      */
     public boolean isMapped() {
@@ -413,7 +413,7 @@
     }
 
     /**
-     * The index in which this field was listed in the metadata.  Defaults to
+     * The index in which this field was listed in the metadata. Defaults to
      * <code>-1</code> if this field was not listed in the metadata.
      */
     public int getListingIndex() {
@@ -421,7 +421,7 @@
     }
 
     /**
-     * The index in which this field was listed in the metadata.  Defaults to
+     * The index in which this field was listed in the metadata. Defaults to
      * <code>-1</code> if this field was not listed in the metadata.
      */
     public void setListingIndex(int index) {
@@ -430,7 +430,7 @@
 
     /**
      * The absolute primary key index for this field, or -1 if not a primary
-     * key.  The first primary key field has index 0, the second index 1, etc.
+     * key. The first primary key field has index 0, the second index 1, etc.
      */
     public int getPrimaryKeyIndex() {
         return _pkIndex;
@@ -438,35 +438,33 @@
 
     /**
      * The absolute primary key index for this field, or -1 if not a primary
-     * key.  The first primary key field has index 0, the second index 1, etc.
+     * key. The first primary key field has index 0, the second index 1, etc.
      */
     public void setPrimaryKeyIndex(int index) {
         _pkIndex = index;
     }
 
     /**
-     * Return the management level for the field.  Will be one of:
+     * Return the management level for the field. Will be one of:
      * <ul>
      * <li>{@link #MANAGE_PERSISTENT}: the field is persistent</li>
      * <li>{@link #MANAGE_TRANSACTIONAL}: the field is transactional but not
      * persistent</li>
      * <li>{@link #MANAGE_NONE}: the field is not managed</li>
-     * </ul>
-     * Defaults to {@link #MANAGE_PERSISTENT}.
+     * </ul> Defaults to {@link #MANAGE_PERSISTENT}.
      */
     public int getManagement() {
         return _manage;
     }
 
     /**
-     * Return the management level for the field.  Will be one of:
+     * Return the management level for the field. Will be one of:
      * <ul>
      * <li>{@link #MANAGE_PERSISTENT}: the field is persistent</li>
      * <li>{@link #MANAGE_TRANSACTIONAL}: the field is transactional but not
      * persistent</li>
      * <li>{@link #MANAGE_NONE}: the field is not managed</li>
-     * </ul>
-     * Defaults to {@link #MANAGE_PERSISTENT}.
+     * </ul> Defaults to {@link #MANAGE_PERSISTENT}.
      */
     public void setManagement(int manage) {
         _manage = manage;
@@ -545,7 +543,7 @@
     }
 
     /**
-     * Whether the default fetch group setting is explicit.  Allow setting
+     * Whether the default fetch group setting is explicit. Allow setting
      * for testing.
      */
     public void setDefaultFetchGroupExplicit(boolean explicit) {
@@ -564,8 +562,7 @@
      * at commit</li>
      * <li>{@link #NULL_DEFAULT}: use the database default if this field is
      * null at commit</li>
-     * </ul>
-     * Defaults to {@link #NULL_UNSET}.
+     * </ul> Defaults to {@link #NULL_UNSET}.
      */
     public int getNullValue() {
         return _nullValue;
@@ -580,8 +577,7 @@
      * at commit</li>
      * <li>{@link #NULL_DEFAULT}: use the database default if this field is
      * null at commit</li>
-     * </ul>
-     * Defaults to {@link #NULL_UNSET}.
+     * </ul> Defaults to {@link #NULL_UNSET}.
      */
     public void setNullValue(int nullValue) {
         _nullValue = nullValue;
@@ -835,8 +831,8 @@
      * Gets the name of the fetch groups those are associated to this receiver.
      *
      * @return the set of fetch group names.
-     *         null if this field is a primary key or a version field.
-     *         zero-length array if no fetch group has been associated.
+     * null if this field is a primary key or a version field.
+     * zero-length array if no fetch group has been associated.
      */
     public Set getFetchGroups() {
         if (isPrimaryKey() || isVersion())
@@ -889,9 +885,9 @@
 
     /**
      * Whether this field uses intermediate data when loading/storing
-     * information through a {@link OpenJPAStateManager}.  Defaults to true.
+     * information through a {@link OpenJPAStateManager}. Defaults to true.
      *
-     * @see    OpenJPAStateManager#setIntermediate(int,Object)
+     * @see OpenJPAStateManager#setIntermediate(int,Object)
      */
     public boolean usesIntermediate() {
         return _intermediate;
@@ -899,9 +895,9 @@
 
     /**
      * Whether this field uses intermediate data when loading/storing
-     * information through a {@link OpenJPAStateManager}.  Defaults to true.
+     * information through a {@link OpenJPAStateManager}. Defaults to true.
      *
-     * @see    OpenJPAStateManager#setIntermediate(int,Object)
+     * @see OpenJPAStateManager#setIntermediate(int,Object)
      */
     public void setUsesIntermediate(boolean intermediate) {
         _intermediate = intermediate;
@@ -913,11 +909,11 @@
      * field data when acting on a {@link OpenJPAStateManager}.
      * Defaults to {@link Boolean#TRUE} (non-cachable impl data).
      *
-     * @return        {@link Boolean#FALSE} if this field does not use impl data,
+     * @return {@link Boolean#FALSE} if this field does not use impl data,
      * {@link Boolean#TRUE} if this field uses non-cachable impl
      * data, or <code>null</code> if this field uses impl data that
      * should be cached across instances
-     * @see    OpenJPAStateManager#setImplData(int,Object)
+     * @see OpenJPAStateManager#setImplData(int,Object)
      */
     public Boolean usesImplData() {
         return _implData;
@@ -927,8 +923,8 @@
      * Whether this field uses impl data in conjunction with standard
      * field data when acting on a {@link OpenJPAStateManager}.
      *
-     * @see    OpenJPAStateManager#setImplData(int,Object)
-     * @see    #usesImplData
+     * @see OpenJPAStateManager#setImplData(int,Object)
+     * @see #usesImplData
      */
     public void setUsesImplData(Boolean implData) {
         _implData = implData;
@@ -975,7 +971,7 @@
 
     /**
      * String declaring the orderings for this field to be applied on load,
-     * or null.  The string is of the form:<br />
+     * or null. The string is of the form:<br />
      * <code>orderable[ asc|desc][, ...]</code><br />
      * The orderable <code>#element</code> is used to denote the value of
      * the field's elements.
@@ -996,7 +992,7 @@
 
     /**
      * String declaring the orderings for this field to be applied on load,
-     * or null.  The string is of the form:<br />
+     * or null. The string is of the form:<br />
      * <code>orderable[ asc|desc][, ...]</code><br />
      * The orderable <code>#element</code> is used to denote the value of
      * the field's elements.
@@ -1117,7 +1113,7 @@
 
     /**
      * Return the result of passing the given external value through the
-     * factory to get the field value.  If no factory is present,
+     * factory to get the field value. If no factory is present,
      * the given value is returned as-is.
      */
     public Object getFieldValue(Object val, StoreContext ctx) {
@@ -1270,7 +1266,7 @@
     }
 
     /**
-     * Return the string value converted to the given type code.  The string
+     * Return the string value converted to the given type code. The string
      * must be non-null and trimmed.
      */
     private Object transform(String val, int typeCode) {
@@ -1475,7 +1471,7 @@
     }
 
     /**
-     * Resolve and validate metadata.  Return true if already resolved.
+     * Resolve and validate metadata. Return true if already resolved.
      */
     public boolean resolve(int mode) {
         if ((_resMode & mode) == mode)
@@ -1621,7 +1617,7 @@
     }
 
     /**
-     * Copy state from the given field to this one.  Do not copy mapping
+     * Copy state from the given field to this one. Do not copy mapping
      * information.
      */
     public void copy(FieldMetaData field) {
@@ -1836,18 +1832,15 @@
 		return _val.getValueMappedByMetaData ();
 	}
 
-
 	public Class getTypeOverride ()
 	{
 		return _val.getTypeOverride ();
 	}
 
-
 	public void setTypeOverride (Class type)
 	{
 		_val.setTypeOverride (type);
 	}
-
 
 	public void copy (ValueMetaData vmd)
 	{

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.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.kernel.OpenJPAStateManager;
 
 /**
- * <p>Order by a field in the related type in memory.</p>
+ * Order by a field in the related type in memory.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.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,10 +22,10 @@
 import org.apache.openjpa.util.ApplicationIds;
 
 /**
- * <p>Order by the field value in memory.  If the field contains
+ * Order by the field value in memory. If the field contains
  * {@link PersistenceCapable} objects, order on their primary key values.
  * Relies on primary key values, including datastore oid objects, being
- * {@link Comparable}.</p>
+ * {@link Comparable}.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java Thu Jul 13 16:44:20 2006
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@
 import java.util.Comparator;
 
 /**
- * <p>Comparator that keeps classes in inheritance order.</p>
+ * Comparator that keeps classes in inheritance order.
  *
  * @author Abe White
  */
@@ -68,7 +68,7 @@
     }
 
     /**
-     *	Count the levels of inheritance between this class and our base class.
+     * Count the levels of inheritance between this class and our base class.
      */
     private int levels(Class to) {
         for (int i = 0; to != null; i++, to = to.getSuperclass())

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.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,7 +39,7 @@
 import serp.util.Strings;
 
 /**
- * <p>Type constants for managed fields.</p>
+ * Type constants for managed fields.
  *
  * @author Abe White
  */
@@ -106,7 +106,7 @@
     }
 
     /**
-     * Return the field metadata type code for the given class.  First class
+     * Return the field metadata type code for the given class. First class
      * objects are not recognized in this method.
      */
     public static int getTypeCode(Class type) {
@@ -227,9 +227,9 @@
     }
 
     /**
-     * Convert the given object to the given type if possible.  If the type is
+     * Convert the given object to the given type if possible. If the type is
      * a numeric primitive, this method only guarantees that the return value
-     * is a {@link Number}.  If no known conversion or the value is null,
+     * is a {@link Number}. If no known conversion or the value is null,
      * returns the original value.
      */
     public static Object convert(Object val, int typeCode) {
@@ -410,7 +410,7 @@
     }
 
     /**
-     *	Helper method to return the given collection as an array.
+     * Helper method to return the given collection as an array.
      */
     public static Object toArray(Collection coll, Class elem) {
         if (coll == null)

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.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,
@@ -105,7 +105,7 @@
     /**
      * Set the callbacks for the given event type.
      *
-     * @param    highPriority    the first N given callbacks are high priority;
+     * @param highPriority the first N given callbacks are high priority;
      * high priority callbacks will be returned before
      * non-high-priority superclass callbacks
      */
@@ -135,11 +135,10 @@
 
     /**
      * Set the callbacks for the given event type for non-persistent
-     * superclass.  Note these callbacks will only be used where the
-     * non-persistent superclass is the direct ancestor of the described
-     * class.
+     * superclass. Note these callbacks will only be used where the
+     * non-persistent superclass is the direct ancestor of the described class.
      *
-     * @param    highPriority    the first N given callbacks are high priority;
+     * @param highPriority the first N given callbacks are high priority;
      * high priority callbacks will be returned before
      * non-high-priority superclass callbacks
      */
@@ -169,9 +168,9 @@
     }
 
     /**
-     *	Combine our callbacks with superclass callbacks as necessary.
-     *	This method has the side effect of manipulating the _high array to
-     *	reflect the combined callbacks rather than the declared ones.
+     * Combine our callbacks with superclass callbacks as necessary.
+     * This method has the side effect of manipulating the _high array to
+     * reflect the combined callbacks rather than the declared ones.
      */
     private LifecycleCallbacks[][] combineCallbacks() {
         if (_ignoreSups == (IGNORE_HIGH | IGNORE_LOW))

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.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.meta;
 
 /**
- * <p>Allows us to access configuration through metadata in a generic way.</p>
+ * Allows us to access configuration through metadata in a generic way.
  *
  * @author Abe White
  */

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.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.event.CallbackModes;
 
 /**
- * <p>Populates new metadata with default values.</p>
+ * Populates new metadata with default values.
  *
  * @author Abe White
  */
@@ -40,25 +40,25 @@
 
     /**
      * If callbacks are fired before listeners for the given
-     * event type.  Defaults to false.
+     * event type. Defaults to false.
      */
     public boolean getCallbacksBeforeListeners(int type);
 
     /**
      * Whether to ignore members which are not persistent by default
-     * during metadata population.  Defaults to true.
+     * during metadata population. Defaults to true.
      */
     public void setIgnoreNonPersistent(boolean ignore);
 
     /**
      * Populate the given metadata with default settings.
      *
-     * @param    access access type constant from {@link ClassMetaData}
+     * @param access access type constant from {@link ClassMetaData}
      */
     public void populate(ClassMetaData meta, int access);
 
     /**
-     *	Return the backing member for the given field metadata.
+     * Return the backing member for the given field metadata.
      */
     public Member getBackingMember(FieldMetaData field);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.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.meta.ClassArgParser;
 
 /**
- * <p>The {@link MetaDataRepository} uses implementations of this interface
- * to load and store metadata.  Implementations need not be threadsafe.</p>
+ * The {@link MetaDataRepository} uses implementations of this interface
+ * to load and store metadata. Implementations need not be threadsafe.
  *
  * @author Patrick Linskey
  * @author Abe White
@@ -43,12 +43,12 @@
     public void setRepository(MetaDataRepository repos);
 
     /**
-     * Base directory for storing metadata.  May not be called.
+     * Base directory for storing metadata. May not be called.
      */
     public void setStoreDirectory(File dir);
 
     /**
-     * Storage mode.  May not be called.
+     * Storage mode. May not be called.
      */
     public void setStoreMode(int store);
 
@@ -59,13 +59,13 @@
     public void setStrict(boolean strict);
 
     /**
-     * Load metadata for the given class in the given mode(s).  If loading
-     * in {@link MetaDataModes#MODE_QUERY}, the class may be null.  Loaded
-     * metadata should be added directly to the repository.  It should have
+     * Load metadata for the given class in the given mode(s). If loading
+     * in {@link MetaDataModes#MODE_QUERY}, the class may be null. Loaded
+     * metadata should be added directly to the repository. It should have
      * its source mode set appropriately via
      * {@link ClassMetaData#setSourceMode}.
      *
-     * @param    mode    the mode to load metadata in: if mapping information is
+     * @param mode the mode to load metadata in: if mapping information is
      * stored together with metadata, then you can load mapping
      * data even if this mode only includes
      * {@link MetaDataModes#MODE_META MODE_META}, so long as
@@ -76,8 +76,8 @@
     /**
      * Store the given metadata.
      *
-     * @param    mode    hint about what aspects of the metadata have changed
-     * @param    output    if non-null, rather than storing metadata directly,
+     * @param mode hint about what aspects of the metadata have changed
+     * @param output if non-null, rather than storing metadata directly,
      * add entries mapping each output destination such
      * as a <code>File</code> to the planned output for that
      * destination in string form
@@ -102,7 +102,7 @@
      * Return all persistent class names, using the metadata locations supplied
      * in configuration, optionally scanning the classpath.
      * Return null if no types are supplied and this factory is unable to scan
-     * the classpath.  This method should not be used directly by outside
+     * the classpath. This method should not be used directly by outside
      * code; use {@link MetaDataRepository#getPersistentTypeNames} instead.
      *
      * @see MetaDataRepository#getPersistentTypeNames
@@ -132,7 +132,7 @@
     public void addClassExtensionKeys(Collection exts);
 
     /**
-     *	Add any extension keys used by this instance to the given set.
+     * Add any extension keys used by this instance to the given set.
      */
     public void addFieldExtensionKeys (Collection exts);
 }

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java?rev=421741&r1=421740&r2=421741&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.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.meta;
 
 /**
- * <p>Comparator that keeps metadatas in inheritance order.</p>
+ * Comparator that keeps metadatas in inheritance order.
  *
  * @author Abe White
  * @nojavadoc

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