vmassol 2003/03/04 22:38:34
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
WebMerge.java
Log:
Fixed checkstyle errors
Revision Changes Path
1.3 +9 -5
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebMerge.java
Index: WebMerge.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/WebMerge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebMerge.java 4 Mar 2003 21:56:06 -0000 1.2
+++ WebMerge.java 5 Mar 2003 06:38:33 -0000 1.3
@@ -121,8 +121,8 @@
/**
* @see EntityResolver#resolveEntity(String, String)
*/
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException
+ public InputSource resolveEntity(String thePublicId,
+ String theSystemId) throws SAXException
{
ByteArrayInputStream bais =
new ByteArrayInputStream("".getBytes());
@@ -158,7 +158,10 @@
/**
* Perform the merge.
- *
+ *
+ * @param theOriginalDoc the original web.xml document object
+ * @param theOverrideDoc the override web.xml document object
+ * @return the merged document object
* @exception Exception on failure
*/
public Document merge(Document theOriginalDoc, Document theOverrideDoc)
@@ -187,7 +190,7 @@
// If the element is unique and present in the override document
// and the original document, then remove it from the original
// document.
- if (!new Boolean(ELEMENTS[i][1]).booleanValue())
+ if (!Boolean.valueOf(ELEMENTS[i][1]).booleanValue())
{
NodeList originalNl =
theOriginalDoc.getElementsByTagName(ELEMENTS[i][0]);
@@ -216,6 +219,7 @@
* @param theCurrentNode the node before which to insert all the tags
* @param theOriginalDocument the original document
* @param theOverrideDocument the override document
+ * @return the new insert point node
*/
protected Node insertTag(String theTagName, Node theCurrentNode,
Document theOriginalDocument, Document theOverrideDocument)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
