Author: wsmoak
Date: Tue Jul 11 22:13:54 2006
New Revision: 421129
URL: http://svn.apache.org/viewvc?rev=421129&view=rev
Log:
STR-2900 Fix Checkstyle errors in struts-taglib. Excluded TestTagUtils due to
incorrect line endings.
Submitted by: Frank Zammetti
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
Tue Jul 11 22:13:54 2006
@@ -68,7 +68,7 @@
* Commons logging instance.
*/
private static final Log log = LogFactory.getLog(TagUtils.class);
-
+
/**
* The message resources for this package. TODO We need to move the
* relevant messages out of this properties file.
@@ -115,9 +115,9 @@
* @param instance The instance to set.
*/
public static void setInstance(TagUtils instance){
- TagUtils.instance = instance;
+ TagUtils.instance = instance;
}
-
+
/**
* Compute a set of query parameters that will be dynamically added to a
* generated URL. The returned Map is keyed by parameter name, and the
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
Tue Jul 11 22:13:54 2006
@@ -217,7 +217,7 @@
try {
BufferedInputStream is =
new BufferedInputStream(conn.getInputStream());
- InputStreamReader in = new InputStreamReader(is); // FIXME -
encoding
+ InputStreamReader in = new InputStreamReader(is); // FIXME-
encoding
char[] buffer = new char[BUFFER_SIZE];
int n = 0;
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
Tue Jul 11 22:13:54 2006
@@ -220,7 +220,8 @@
public int doStartTag() throws JspException {
// Look up the requested bean (if necessary)
if (ignore) {
- if (TagUtils.getInstance().lookup(pageContext, name, scope) ==
null) {
+ if (TagUtils.getInstance().lookup(pageContext, name, scope)
+ == null) {
return (SKIP_BODY); // Nothing to output
}
}
@@ -275,7 +276,8 @@
*
* When a format string is retrieved from the message resources,
* <code>applyLocalizedPattern</code> is used. For more about localized
- * patterns, see
<http://www.dei.unipd.it/corsi/fi2ae-docs/source/jdk1.1.7/src/java/text/resources/>.
+ * patterns, see
+ *
<http://www.dei.unipd.it/corsi/fi2ae-docs/source/jdk1.1.7/src/java/text/resources/>.
* (To obtain the correct value for some characters, you may need to view
* the file in a hex editor and then use the Unicode escape form in the
* property resources file.)
@@ -296,7 +298,8 @@
if (value instanceof java.lang.String) {
return (String) value;
} else {
- // Try to retrieve format string from resources by the key from
formatKey.
+ // Try to retrieve format string from resources by the key from
+ // formatKey.
if ((formatString == null) && (formatKey != null)) {
formatString = retrieveFormatString(this.formatKey);
@@ -329,7 +332,8 @@
format = NumberFormat.getNumberInstance(locale);
if (formatStrFromResources) {
- ((DecimalFormat)
format).applyLocalizedPattern(formatString);
+ ((DecimalFormat) format).applyLocalizedPattern(
+ formatString);
} else {
((DecimalFormat)
format).applyPattern(formatString);
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Tue Jul 11 22:13:54 2006
@@ -363,7 +363,8 @@
ModuleConfig config =
TagUtils.getInstance().getModuleConfig(pageContext);
ValidatorResources resources =
- (ValidatorResources)
pageContext.getAttribute(ValidatorPlugIn.VALIDATOR_KEY
+ (ValidatorResources) pageContext.getAttribute(
+ ValidatorPlugIn.VALIDATOR_KEY
+ config.getPrefix(), PageContext.APPLICATION_SCOPE);
if (resources == null) {
@@ -482,8 +483,9 @@
for (Iterator x = form.getFields().iterator(); x.hasNext();) {
Field field = (Field) x.next();
- // Skip indexed fields for now until there is a good way to
handle
- // error messages (and the length of the list (could retrieve
from scope?))
+ // Skip indexed fields for now until there is a good way to
+ // handle error messages (and the length of the list (could
+ // retrieve from scope?))
if (field.isIndexed() || (field.getPage() != page)
|| !field.isDependency(va.getName())) {
continue;
@@ -514,7 +516,8 @@
Resources.getVarValue(var, application, request,
false);
String jsType = var.getJsType();
- // skip requiredif variables field, fieldIndexed,
fieldTest, fieldValue
+ // skip requiredif variables field, fieldIndexed,
fieldTest,
+ // fieldValue
if (varName.startsWith("field")) {
continue;
}
@@ -531,7 +534,8 @@
results.append("this." + varName + "='"
+ varValueEscaped + "'; ");
- // So everyone using the latest format doesn't need to
change their xml files immediately.
+ // So everyone using the latest format doesn't need to
+ // change their xml files immediately.
} else if ("mask".equalsIgnoreCase(varName)) {
results.append("this." + varName + "=/"
+ varValueEscaped + "/; ");
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
Tue Jul 11 22:13:54 2006
@@ -49,8 +49,8 @@
String url = null;
try {
- // Note that we're encoding the & character to & in XHTML mode
only,
- // otherwise the & is written as is to work in javascripts.
+ // Note that we're encoding the & character to & in XHTML mode
only,
+ // otherwise the & is written as is to work in javascripts.
url =
TagUtils.getInstance().computeURLWithCharEncoding(pageContext,
forward, href, page, action, module, params, anchor, false,
this.isXhtml(), useLocalEncoding);
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
Tue Jul 11 22:13:54 2006
@@ -231,7 +231,8 @@
if (collection == null) {
collection =
- TagUtils.getInstance().lookup(pageContext, name, property,
scope);
+ TagUtils.getInstance().lookup(pageContext, name, property,
+ scope);
}
if (collection == null) {
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java?rev=421129&r1=421128&r2=421129&view=diff
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
Tue Jul 11 22:13:54 2006
@@ -33,7 +33,7 @@
*/
public class NestedFormTag extends FormTag implements NestedNameSupport {
//TODO: name property was removed from FormTag but appears to be required
- // for the nested version to work. See if it can be removed
+ // for the nested version to work. See if it can be removed
// from here altogether.
/**
