You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2010/11/20 23:22:24 UTC
svn commit: r1037345 - in /tomcat/taglibs/standard/trunk:
examples/src/org/apache/taglibs/standard/examples/util/
jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/
jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/
jstlel/src/...
Author: kkolinko
Date: Sat Nov 20 22:22:23 2010
New Revision: 1037345
URL: http://svn.apache.org/viewvc?rev=1037345&view=rev
Log:
Code formatting followup.
Correct javadocs: remove '<p/>' added by the formatter.
Modified:
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java Sat Nov 20 22:22:23 2010
@@ -22,8 +22,7 @@ import java.io.PrintWriter;
/**
* ServletResponseWrapper used for the the generation of
* semi-dynamic pages.
- * <p/>
- * This 'wrapped' response object is passed as the second argument
+ * <p>This 'wrapped' response object is passed as the second argument
* to the internal RequestDispatcher.include(). It channels
* all output text into the PrintWriter specified in the
* constructor (which is associated with the file where the
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java Sat Nov 20 22:22:23 2010
@@ -26,8 +26,7 @@ import java.util.Map;
* <p>Represents an operator that obtains a Map entry, an indexed
* value, a property value, or an indexed property value of an object.
* The following are the rules for evaluating this operator:
- * <p/>
- * <ul><pre>
+ * <pre>
* Evaluating a[b] (assuming a.b == a["b"])
* a is null
* return null
@@ -49,17 +48,17 @@ import java.util.Map;
* a.get(b) or Array.get(a, b) throws other exception
* error
* return a.get(b) or Array.get(a, b)
- * <p/>
+ *
* coerce b to String
* b is a readable property of a
* getter throws an exception
* error
* otherwise
* return result of getter call
- * <p/>
+ *
* otherwise
* error
- * </pre></ul>
+ * </pre>
*
* @author Nathan Abramson - Art Technology Group
* @author Shawn Bayern
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java Sat Nov 20 22:22:23 2010
@@ -23,11 +23,9 @@ import java.beans.PropertyEditorManager;
/**
* <p>This class contains the logic for coercing data types before
* operators are applied to them.
- * <p/>
* <p>The following is the list of rules applied for various type
* conversions.
- * <p/>
- * <ul><pre>
+ * <pre>
* Applying arithmetic operator
* Binary operator - A {+,-,*} B
* if A and B are null
@@ -39,7 +37,7 @@ import java.beans.PropertyEditorManager;
* coerce both A and B to Long
* apply operator
* if operator results in exception (such as divide by 0), error
- * <p/>
+ *
* Binary operator - A {/,div} B
* if A and B are null
* return 0
@@ -47,7 +45,7 @@ import java.beans.PropertyEditorManager;
* coerce both A and B to Double
* apply operator
* if operator results in exception (such as divide by 0), error
- * <p/>
+ *
* Binary operator - A {%,mod} B
* if A and B are null
* return 0
@@ -58,7 +56,7 @@ import java.beans.PropertyEditorManager;
* coerce both A and B to Long
* apply operator
* if operator results in exception (such as divide by 0), error
- * <p/>
+ *
* Unary minus operator - -A
* if A is null
* return 0
@@ -72,7 +70,7 @@ import java.beans.PropertyEditorManager;
* if operator results in exception, error
* otherwise
* error
- * <p/>
+ *
* Applying "empty" operator - empty A
* if A is null
* return true
@@ -86,7 +84,7 @@ import java.beans.PropertyEditorManager;
* return true
* otherwise
* return false
- * <p/>
+ *
* Applying logical operators
* Binary operator - A {and,or} B
* coerce both A and B to Boolean, apply operator
@@ -94,7 +92,7 @@ import java.beans.PropertyEditorManager;
* A and B and C and D - if B is false, then only A and B is evaluated
* Unary not operator - not A
* coerce A to Boolean, apply operator
- * <p/>
+ *
* Applying relational operator
* A {<,>,<=,>=,lt,gt,lte,gte} B
* if A==B
@@ -124,7 +122,7 @@ import java.beans.PropertyEditorManager;
* use result of B.compareTo(A)
* otherwise
* error
- * <p/>
+ *
* Applying equality operator
* A {==,!=} B
* if A==B
@@ -146,9 +144,9 @@ import java.beans.PropertyEditorManager;
* if an error occurs while calling A.equals(B)
* error
* apply operator to result of A.equals(B)
- * <p/>
+ *
* coercions
- * <p/>
+ *
* coerce A to String
* A is String
* return A
@@ -158,7 +156,7 @@ import java.beans.PropertyEditorManager;
* error
* otherwise
* return A.toString
- * <p/>
+ *
* coerce A to primitive Number type N
* A is null or ""
* return 0
@@ -178,7 +176,7 @@ import java.beans.PropertyEditorManager;
* return N.valueOf(A)
* otherwise
* error
- * <p/>
+ *
* coerce A to Character should be
* A is null or ""
* return (char) 0
@@ -194,7 +192,7 @@ import java.beans.PropertyEditorManager;
* return A.charAt (0)
* otherwise
* error
- * <p/>
+ *
* coerce A to Boolean
* A is null or ""
* return false
@@ -206,7 +204,7 @@ import java.beans.PropertyEditorManager;
* return Boolean.valueOf(A)
* otherwise
* error
- * <p/>
+ *
* coerce A to any other type T
* A is null
* return null
@@ -223,7 +221,7 @@ import java.beans.PropertyEditorManager;
* apply T's PropertyEditor
* otherwise
* error
- * </pre></ul>
+ * </pre>
*
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java Sat Nov 20 22:22:23 2010
@@ -41,12 +41,10 @@ import org.apache.taglibs.standard.lang.
* expressions and any intervening non-expression text, then
* converting the resulting String to the expected type using the
* PropertyEditor mechanism.
- * <p/>
* <p>In the special case where the expression String is a single
* expression, the value of the expression String is determined by
* evaluating the expression, without any intervening conversion to a
* String.
- * <p/>
* <p>The evaluator maintains a cache mapping expression Strings to
* their parsed results. For expression Strings containing no
* expression elements, it maintains a cache mapping
@@ -55,7 +53,6 @@ import org.apache.taglibs.standard.lang.
* time they are used. All instances of the evaluator share the same
* cache. The cache may be bypassed by setting a flag on the
* evaluator's constructor.
- * <p/>
* <p>The evaluator must be passed a VariableResolver in its
* constructor. The VariableResolver is used to resolve variable
* names encountered in expressions, and can also be used to implement
@@ -64,14 +61,12 @@ import org.apache.taglibs.standard.lang.
* lookups and implicit objects - these differences can be
* encapsulated in the VariableResolver passed to the evaluator's
* constructor.
- * <p/>
* <p>Most VariableResolvers will need to perform their resolution
* against some context. For example, a JSP environment needs a
* PageContext to resolve variables. The evaluate() method takes a
* generic Object context which is eventually passed to the
* VariableResolver - the VariableResolver is responsible for casting
* the context to the proper type.
- * <p/>
* <p>Once an evaluator instance has been constructed, it may be used
* multiple times, and may be used by multiple simultaneous Threads.
* In other words, an evaluator instance is well-suited for use as a
@@ -81,7 +76,6 @@ import org.apache.taglibs.standard.lang.
* @author Shawn Bayern
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
*/
-
public class ELEvaluator {
//-------------------------------------
// Properties
@@ -105,11 +99,9 @@ public class ELEvaluator {
/**
* The mapping from expression String to its parsed form (String,
* Expression, or ExpressionString)
- * <p/>
- * Using LRU Map with a maximum capacity to avoid out of bound map
+ * <p>Using LRU Map with a maximum capacity to avoid out of bound map
* growth.
- * <p/>
- * NOTE: use LinkedHashmap if a dependency on J2SE 1.4+ is ok
+ * <p>NOTE: use LinkedHashmap if a dependency on J2SE 1.4+ is ok
*/
static Map sCachedExpressionStrings = null;
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java Sat Nov 20 22:22:23 2010
@@ -27,7 +27,6 @@ import java.util.Set;
* <p>This is a Map implementation driven by a data source that only
* provides an enumeration of keys and a getValue(key) method. This
* class must be subclassed to implement those methods.
- * <p/>
* <p>Some of the methods may incur a performance penalty that
* involves enumerating the entire data source. In these cases, the
* Map will try to save the results of that enumeration, but only if
@@ -36,7 +35,6 @@ import java.util.Set;
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
*/
-
public abstract class EnumeratedMap
implements Map {
//-------------------------------------
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java Sat Nov 20 22:22:23 2010
@@ -25,7 +25,6 @@ import java.text.MessageFormat;
* and expressions during evaluation. They should use this to log any
* warning or error messages that might come up. This allows all of
* our logging policies to be concentrated in one class.
- * <p/>
* <p>Errors are conditions that are severe enough to abort operation.
* Warnings are conditions through which the operation may continue,
* but which should be reported to the developer.
@@ -33,7 +32,6 @@ import java.text.MessageFormat;
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
*/
-
public class Logger {
//-------------------------------------
// Member variables
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java Sat Nov 20 22:22:23 2010
@@ -24,7 +24,6 @@ package org.apache.taglibs.standard.lang
* notion of "implicit variables" which override any other variables.
* An instance of this class should be passed to the evaluator's
* constructor.
- * <p/>
* <p>Whenever the evaluator is invoked, it is passed a "context"
* Object from the application. For example, in a JSP environment,
* the "context" is a PageContext. That context object is eventually
@@ -34,7 +33,6 @@ package org.apache.taglibs.standard.lang
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
*/
-
public interface VariableResolver {
//-------------------------------------
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java Sat Nov 20 22:22:23 2010
@@ -6,8 +6,7 @@ package org.apache.taglibs.standard.lang
* You can explicitly create objects of this exception type by
* calling the method generateParseException in the generated
* parser.
- * <p/>
- * You can modify this class to customize your error reporting
+ * <p>You can modify this class to customize your error reporting
* mechanisms so long as you retain the public fields.
*/
public class ParseException extends Exception {
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java Sat Nov 20 22:22:23 2010
@@ -62,11 +62,12 @@ public class Token {
* can create and return subclass objects based on the value of ofKind.
* Simply add the cases to the switch for all those special cases.
* For example, if you have a subclass of Token called IDToken that
- * you want to create if ofKind is ID, simlpy add something like :
- * <p/>
+ * you want to create if ofKind is ID, simply add something like
+ * this to the following switch statement:
+ * <pre>
* case MyParserConstants.ID : return new IDToken();
- * <p/>
- * to the following switch statement. Then you can cast matchedToken
+ * </pre>
+ * <p>Then you can cast matchedToken
* variable to the appropriate type and use it in your lexical actions.
*/
public static final Token newToken(int ofKind) {
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java Sat Nov 20 22:22:23 2010
@@ -102,12 +102,12 @@ public class TokenMgrError extends Error
/**
* You can also modify the body of this method to customize your error messages.
- * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
- * of end-users concern, so you can return something like :
- * <p/>
+ * <p>For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+ * of end-users concern, so you can return something like
+ * the following from this method for such cases in the release version of your parser:<br>
+ * <code>
* "Internal Error : Please file a bug report .... "
- * <p/>
- * from this method for such cases in the release version of your parser.
+ * </code>
*/
public String getMessage() {
return super.getMessage();
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java Sat Nov 20 22:22:23 2010
@@ -25,7 +25,6 @@ import javax.servlet.jsp.tagext.Tag;
* <p>The interface for an expression-language validator and evaluator.
* Classes that implement an expression language expose their functionality
* via this interface.</p>
- * <p/>
* <p>The validate() and evaluate() methods must be thread-safe. That is,
* multiple threads may call these methods on the same ExpressionEvaluator
* object simultaneously. Implementations should synchronize access if
@@ -34,7 +33,6 @@ import javax.servlet.jsp.tagext.Tag;
* instantiated; global caching should therefore be static. No release()
* mechanism or robust lifecycle is specified, for language-interpreter
* pluggability is experimental in EA2.</p>
- * <p/>
* <p><b>WARNING</b>: This class supports experimentation for the EA2
* release of JSTL; it is not expected to be part of the final RI or
* specification.</p>
Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java Sat Nov 20 22:22:23 2010
@@ -29,7 +29,6 @@ import org.apache.taglibs.standard.lang.
/**
* <p>A conduit to the JSTL EL. Based on...</p>
- * <p/>
* <p>An implementation of the ExpressionEvaluatorManager called for by
* the JSTL rev1 draft. This class is responsible for delegating a
* request for expression evaluating to the particular, "active"
Modified: tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java (original)
+++ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java Sat Nov 20 22:22:23 2010
@@ -37,7 +37,6 @@ import org.junit.Test;
* <p>This runs a series of tests specifically for the parser. It
* parses various expressions and prints out the canonical
* representation of those parsed expressions.
- * <p/>
* <p>The expressions are stored in an input text file, with one line
* per expression. Blank lines and lines that start with # are
* ignored. The results are written to an output file (blank lines
@@ -48,7 +47,6 @@ import org.junit.Test;
* @author Nathan Abramson - Art Technology Group
* @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
*/
-
public class ParserTest extends TestCase {
private final Charset UTF8 = Charset.forName("UTF-8");
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java Sat Nov 20 22:22:23 2010
@@ -27,9 +27,7 @@ import javax.servlet.jsp.tagext.TagSuppo
* where the boolean result is exposed as a JSP scoped variable. The
* boolean result may then be used as the test condition in a <c:when>
* action.</p>
- * <p/>
* <p>This base class provides support for:</p>
- * <p/>
* <ul>
* <li> Conditional processing of the action's body based on the returned value
* of the abstract method <tt>condition()</tt>.</li>
@@ -40,7 +38,6 @@ import javax.servlet.jsp.tagext.TagSuppo
*
* @author Shawn Bayern
*/
-
public abstract class ConditionalTagSupport
extends TagSupport {
//*********************************************************************
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java Sat Nov 20 22:22:23 2010
@@ -83,7 +83,6 @@ public class Config {
/**
* Looks up a configuration variable in the given scope.
- * <p/>
* <p> The lookup of configuration variables is performed as if each scope
* had its own name space, that is, the same configuration variable name
* in one scope does not replace one stored in a different scope.
@@ -113,7 +112,6 @@ public class Config {
/**
* Looks up a configuration variable in the "request" scope.
- * <p/>
* <p> The lookup of configuration variables is performed as if each scope
* had its own name space, that is, the same configuration variable name
* in one scope does not replace one stored in a different scope.
@@ -130,7 +128,6 @@ public class Config {
/**
* Looks up a configuration variable in the "session" scope.
- * <p/>
* <p> The lookup of configuration variables is performed as if each scope
* had its own name space, that is, the same configuration variable name
* in one scope does not replace one stored in a different scope.</p>
@@ -155,7 +152,6 @@ public class Config {
/**
* Looks up a configuration variable in the "application" scope.
- * <p/>
* <p> The lookup of configuration variables is performed as if each scope
* had its own name space, that is, the same configuration variable name
* in one scope does not replace one stored in a different scope.
@@ -172,7 +168,6 @@ public class Config {
/**
* Sets the value of a configuration variable in the given scope.
- * <p/>
* <p> Setting the value of a configuration variable is performed as if
* each scope had its own namespace, that is, the same configuration
* variable name in one scope does not replace one stored in a different
@@ -205,7 +200,6 @@ public class Config {
/**
* Sets the value of a configuration variable in the "request" scope.
- * <p/>
* <p> Setting the value of a configuration variable is performed as if
* each scope had its own namespace, that is, the same configuration
* variable name in one scope does not replace one stored in a different
@@ -222,7 +216,6 @@ public class Config {
/**
* Sets the value of a configuration variable in the "session" scope.
- * <p/>
* <p> Setting the value of a configuration variable is performed as if
* each scope had its own namespace, that is, the same configuration
* variable name in one scope does not replace one stored in a different
@@ -239,7 +232,6 @@ public class Config {
/**
* Sets the value of a configuration variable in the "application" scope.
- * <p/>
* <p> Setting the value of a configuration variable is performed as if
* each scope had its own namespace, that is, the same configuration
* variable name in one scope does not replace one stored in a different
@@ -256,7 +248,6 @@ public class Config {
/**
* Removes a configuration variable from the given scope.
- * <p/>
* <p> Removing a configuration variable is performed as if each scope had
* its own namespace, that is, the same configuration variable name in one
* scope does not impact one stored in a different scope.
@@ -288,7 +279,6 @@ public class Config {
/**
* Removes a configuration variable from the "request" scope.
- * <p/>
* <p> Removing a configuration variable is performed as if each scope had
* its own namespace, that is, the same configuration variable name in one
* scope does not impact one stored in a different scope.
@@ -303,7 +293,6 @@ public class Config {
/**
* Removes a configuration variable from the "session" scope.
- * <p/>
* <p> Removing a configuration variable is performed as if each scope had
* its own namespace, that is, the same configuration variable name in one
* scope does not impact one stored in a different scope.
@@ -318,7 +307,6 @@ public class Config {
/**
* Removes a configuration variable from the "application" scope.
- * <p/>
* <p> Removing a configuration variable is performed as if each scope had
* its own namespace, that is, the same configuration variable name in one
* scope does not impact one stored in a different scope.
@@ -334,7 +322,6 @@ public class Config {
/**
* Finds the value associated with a specific configuration setting
* identified by its context initialization parameter name.
- * <p/>
* <p> For each of the JSP scopes (page, request, session, application),
* get the value of the configuration variable identified by <tt>name</tt>
* using method <tt>get()</tt>. Return as soon as a non-null value is
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java Sat Nov 20 22:22:23 2010
@@ -25,7 +25,6 @@ import javax.servlet.jsp.tagext.Tag;
* with <tt>javax.servlet.jsp.tagext.IterationTag</tt> as defined in JSP 1.2.
* LoopTag establishes a mechanism for iteration tags to be recognized
* and for type-safe implicit collaboration with custom subtags.
- * <p/>
* <p>In most cases, it will not be necessary to implement this interface
* manually, for a base support class (<tt>LoopTagSupport</tt>) is provided
* to facilitate implementation.</p>
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java Sat Nov 20 22:22:23 2010
@@ -25,7 +25,6 @@ package javax.servlet.jsp.jstl.core;
* either the first or last in the iteration. It also lets authors
* use the status object to obtain information about the iteration range,
* step, and current object.</p>
- * <p/>
* <p>Environments that require more status can extend this interface.</p>
*
* @author Shawn Bayern
@@ -59,7 +58,6 @@ public interface LoopTagStatus {
* count is a relative, 1-based sequence number identifying the
* current "round" of iteration (in context with all rounds the
* current iteration will perform).</p>
- * <p/>
* <p>As an example, an iteration with begin = 5, end = 15, and step =
* 5 produces the counts 1, 2, and 3 in that order.</p>
*
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java Sat Nov 20 22:22:23 2010
@@ -29,16 +29,13 @@ import javax.servlet.jsp.tagext.TryCatch
/**
* <p>Base support class to facilitate implementation of iteration tags.</p>
- * <p/>
* <p>Since most iteration tags will behave identically with respect to
* actual iterative behavior, JSTL provides this
* base support class to facilitate implementation. Many iteration tags
* will extend this and merely implement the <tt>hasNext()</tt> and
* <tt>next()</tt> methods
* to provide contents for the handler to iterate over.</p>
- * <p/>
* <p>In particular, this base class provides support for:</p>
- * <p/>
* <ul>
* <li> Iteration control, based on protected <tt>prepare()</tt>, <tt>next()</tt>,
* and <tt>hasNext()</tt> methods
@@ -49,7 +46,6 @@ import javax.servlet.jsp.tagext.TryCatch
* <li> status retrieval (<tt>LoopTagStatus</tt>)
* <li> exposing attributes (set by <tt>var</tt> and <tt>varStatus</tt> attributes)
* </ul>
- * <p/>
* <p>In providing support for these tasks, <tt>LoopTagSupport</tt> contains
* certain control variables that act to modify the iteration. Accessors
* are provided for these control variables when the variables represent
@@ -170,7 +166,6 @@ public abstract class LoopTagSupport
* <p>Returns the next object over which the tag should iterate. This
* method must be provided by concrete subclasses of LoopTagSupport
* to inform the base logic about what objects it should iterate over.</p>
- * <p/>
* <p>It is expected that this method will generally be backed by an
* Iterator, but this will not always be the case. In particular, if
* retrieving the next object raises the possibility of an exception
@@ -192,7 +187,6 @@ public abstract class LoopTagSupport
* over which to iterate. This method must be provided by concrete
* subclasses of LoopTagSupport to assist the iterative logic
* provided by the supporting base class.</p>
- * <p/>
* <p>See <a href="#next()">next</a> for more information about the
* purpose and expectations behind this tag.</p>
*
@@ -305,7 +299,6 @@ public abstract class LoopTagSupport
/**
* Removes any attributes that this LoopTagSupport set.
- * <p/>
* <p> These attributes are intended to support scripting variables with
* NESTED scope, so we don't want to pollute attribute space by leaving
* them lying around.
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java Sat Nov 20 22:22:23 2010
@@ -75,15 +75,13 @@ class JakartaInline {
/**
* Gets the resource bundle with the given base name, whose locale is
* determined as follows:
- * <p/>
- * Check if a match exists between the ordered set of preferred
+ * <p>Check if a match exists between the ordered set of preferred
* locales and the available locales, for the given base name.
* The set of preferred locales consists of a single locale
* (if the <tt>javax.servlet.jsp.jstl.fmt.locale</tt> configuration
* setting is present) or is equal to the client's preferred locales
* determined from the client's browser settings.
- * <p/>
- * <p> If no match was found in the previous step, check if a match
+ * <p>If no match was found in the previous step, check if a match
* exists between the fallback locale (given by the
* <tt>javax.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
* setting) and the available locales, for the given base name.
@@ -384,8 +382,7 @@ class JakartaInline {
* Parses the given locale string into its language and (optionally)
* country components, and returns the corresponding
* <tt>java.util.Locale</tt> object.
- * <p/>
- * If the given locale string is null or empty, the runtime's default
+ * <p>If the given locale string is null or empty, the runtime's default
* locale is returned.
*
* @param locale the locale string to parse
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java Sat Nov 20 22:22:23 2010
@@ -26,7 +26,6 @@ import javax.servlet.jsp.PageContext;
/**
* Class which exposes the locale-determination logic for resource bundles
* through convenience methods.
- * <p/>
* <p> This class may be useful to any tag handler implementation that needs
* to produce localized messages. For example, this might be useful for
* exception messages that are intended directly for user consumption on an
@@ -39,12 +38,10 @@ public class LocaleSupport {
/**
* Retrieves the localized message corresponding to the given key.
- * <p/>
* <p> The given key is looked up in the resource bundle of the default
* I18N localization context, which is retrieved from the
* <tt>javax.servlet.jsp.jstl.fmt.localizationContext</tt> configuration
* setting.
- * <p/>
* <p> If the configuration setting is empty, or the default I18N
* localization context does not contain any resource bundle, or the given
* key is undefined in its resource bundle, the string "???<key>???" is
@@ -62,10 +59,8 @@ public class LocaleSupport {
/**
* Retrieves the localized message corresponding to the given key.
- * <p/>
* <p> The given key is looked up in the resource bundle with the given
* base name.
- * <p/>
* <p> If no resource bundle with the given base name exists, or the given
* key is undefined in the resource bundle, the string "???<key>???" is
* returned, where "<key>" is replaced with the given key.
@@ -86,10 +81,8 @@ public class LocaleSupport {
* Retrieves the localized message corresponding to the given key, and
* performs parametric replacement using the arguments specified via
* <tt>args</tt>.
- * <p/>
* <p> See the specification of the <fmt:message> action for a description
* of how parametric replacement is implemented.
- * <p/>
* <p> The localized message is retrieved as in
* {@link #getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String) getLocalizedMessage(pageContext, key)}.
*
@@ -109,10 +102,8 @@ public class LocaleSupport {
* Retrieves the localized message corresponding to the given key, and
* performs parametric replacement using the arguments specified via
* <tt>args</tt>.
- * <p/>
* <p> See the specification of the <fmt:message> action for a description
* of how parametric replacement is implemented.
- * <p/>
* <p> The localized message is retrieved as in
* {@link #getLocalizedMessage(javax.servlet.jsp.PageContext,java.lang.String, java.lang.String) getLocalizedMessage(pageContext, key, basename)}.
*
Modified: tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java (original)
+++ tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java Sat Nov 20 22:22:23 2010
@@ -22,10 +22,8 @@ import java.util.ResourceBundle;
/**
* Class representing an I18N localization context.
- * <p/>
* <p> An I18N localization context has two components: a resource bundle and
* the locale that led to the resource bundle match.
- * <p/>
* <p> The resource bundle component is used by <fmt:message> for mapping
* message keys to localized messages, and the locale component is used by the
* <fmt:message>, <fmt:formatNumber>, <fmt:parseNumber>, <fmt:formatDate>,
@@ -53,7 +51,6 @@ public class LocalizationContext {
/**
* Constructs an I18N localization context from the given resource bundle
* and locale.
- * <p/>
* <p> The specified locale is the application- or browser-based preferred
* locale that led to the resource bundle match.
*
@@ -67,7 +64,6 @@ public class LocalizationContext {
/**
* Constructs an I18N localization context from the given resource bundle.
- * <p/>
* <p> The localization context's locale is taken from the given
* resource bundle.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org