cmlenz 2003/03/18 03:09:38
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
WebXmlMergeTask.java
integration/ant/src/java/org/apache/cactus/integration/ant/webxml
WebXml.java
Log:
Fixed checkstyle violations
Revision Changes Path
1.7 +6 -6
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java
Index: WebXmlMergeTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebXmlMergeTask.java 17 Mar 2003 13:35:29 -0000 1.6
+++ WebXmlMergeTask.java 18 Mar 2003 11:09:37 -0000 1.7
@@ -162,9 +162,9 @@
{
if (this.mergeFile != null)
{
- if (force ||
- (srcFile.lastModified() > destFile.lastModified()) ||
- (mergeFile.lastModified() > destFile.lastModified()))
+ if (force
+ || (srcFile.lastModified() > destFile.lastModified())
+ || (mergeFile.lastModified() > destFile.lastModified()))
{
WebXml srcWebXml = parseWebXml(this.srcFile);
WebXml mergeWebXml = parseWebXml(this.mergeFile);
@@ -286,8 +286,8 @@
String mergeVersion = theMergeWebXml.getVersion();
if (srcVersion != mergeVersion)
{
- if (WebXml.SERVLET_VERSION_2_2.equals(srcVersion) &&
- WebXml.SERVLET_VERSION_2_3.equals(mergeVersion))
+ if (WebXml.SERVLET_VERSION_2_2.equals(srcVersion)
+ && WebXml.SERVLET_VERSION_2_3.equals(mergeVersion))
{
log("Merging elements from a version 2.3 into a version 2.2 "
+ "descriptor, some elements may be skipped");
1.12 +14 -14
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/webxml/WebXml.java
Index: WebXml.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/webxml/WebXml.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebXml.java 18 Mar 2003 09:41:58 -0000 1.11
+++ WebXml.java 18 Mar 2003 11:09:37 -0000 1.12
@@ -212,8 +212,8 @@
}
if (hasFilter(filterName))
{
- throw new IllegalStateException("Filter '" + filterName +
- "' already defined");
+ throw new IllegalStateException("Filter '" + filterName
+ + "' already defined");
}
addElement(WebXmlTag.FILTER, theFilter);
}
@@ -247,8 +247,8 @@
{
if (!hasFilter(theFilterName))
{
- throw new IllegalStateException("Filter '" + theFilterName +
- "' not defined");
+ throw new IllegalStateException("Filter '" + theFilterName
+ + "' not defined");
}
Element filterMappingElement =
this.document.createElement(WebXmlTag.FILTER_MAPPING.getTagName());
@@ -397,8 +397,8 @@
}
if (hasServlet(servletName))
{
- throw new IllegalStateException("Servlet '" + servletName +
- "' already defined");
+ throw new IllegalStateException("Servlet '" + servletName
+ + "' already defined");
}
addElement(WebXmlTag.SERVLET, theServlet);
}
@@ -416,8 +416,8 @@
Element servletElement = getServlet(theServletName);
if (servletElement == null)
{
- throw new IllegalStateException("Servlet '" + theServletName +
- "' not defined");
+ throw new IllegalStateException("Servlet '" + theServletName
+ + "' not defined");
}
addInitParam(servletElement, theParamName, theParamValue);
}
@@ -432,8 +432,8 @@
{
if (!hasServlet(theServletName))
{
- throw new IllegalStateException("Servlet '" + theServletName +
- "' not defined");
+ throw new IllegalStateException("Servlet '" + theServletName
+ + "' not defined");
}
Element servletMappingElement =
this.document.createElement(WebXmlTag.SERVLET_MAPPING.getTagName());
@@ -766,9 +766,9 @@
{
Node result = elements.item(0);
Node previous = result.getPreviousSibling();
- while ((previous != null) &&
- ((previous.getNodeType() == Node.COMMENT_NODE) ||
- (previous.getNodeType() == Node.TEXT_NODE)))
+ while ((previous != null)
+ && ((previous.getNodeType() == Node.COMMENT_NODE)
+ || (previous.getNodeType() == Node.TEXT_NODE)))
{
result = previous;
previous = result.getPreviousSibling();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
