Return-Path:
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 76798 invoked from network); 11 Mar 2005 09:55:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
by minotaur-2.apache.org with SMTP; 11 Mar 2005 09:55:29 -0000
Received: (qmail 90713 invoked by uid 500); 11 Mar 2005 09:55:28 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 90666 invoked by uid 500); 11 Mar 2005 09:55:28 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe:
List-Subscribe:
List-Help:
List-Post:
List-Id: "Ant Developers List"
Reply-To: "Ant Developers List"
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 90651 invoked by uid 500); 11 Mar 2005 09:55:28 -0000
Received: (qmail 90648 invoked by uid 99); 11 Mar 2005 09:55:28 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
(209.237.227.194)
by apache.org (qpsmtpd/0.28) with SMTP; Fri, 11 Mar 2005 01:55:27 -0800
Received: (qmail 76760 invoked by uid 1539); 11 Mar 2005 09:55:25 -0000
Date: 11 Mar 2005 09:55:25 -0000
Message-ID: <20050311095525.76759.qmail@minotaur.apache.org>
From: peterreilly@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/main/org/apache/tools/ant/types/resolver
ApacheCatalog.java ApacheCatalogResolver.java
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N
peterreilly 2005/03/11 01:55:25
Modified: src/main/org/apache/tools/ant/types/resolver
ApacheCatalog.java ApacheCatalogResolver.java
Log:
checkstyle - javadoc + change name of _catalog
Revision Changes Path
1.15 +5 -1 ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
Index: ApacheCatalog.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApacheCatalog.java 9 Mar 2005 00:38:19 -0000 1.14
+++ ApacheCatalog.java 11 Mar 2005 09:55:25 -0000 1.15
@@ -51,6 +51,7 @@
* instance of itself for each external catalog file processed.
* That is, if two external catalog files are processed, there
* will be a total of two ApacheCatalog instances, and so on.
+ * @return the catalog.
*/
protected Catalog newCatalog() {
ApacheCatalog cat = (ApacheCatalog) super.newCatalog();
@@ -58,7 +59,10 @@
return cat;
}
- /** Set the resolver object to callback. */
+ /**
+ * Set the resolver object to callback.
+ * @param resolver the apache catalog resolver.
+ */
public void setResolver(ApacheCatalogResolver resolver) {
this.resolver = resolver;
}
1.19 +11 -7 ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
Index: ApacheCatalogResolver.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ApacheCatalogResolver.java 9 Mar 2005 00:38:19 -0000 1.18
+++ ApacheCatalogResolver.java 11 Mar 2005 09:55:25 -0000 1.19
@@ -89,7 +89,10 @@
// CatalogManager.getStaticManager().setVerbosity(4);
}
- /** Set the XMLCatalog object to callback. */
+ /**
+ * Set the XMLCatalog object to callback.
+ * @param xmlCatalog the XMLCatalog to use.
+ */
public void setXMLCatalog(XMLCatalog xmlCatalog) {
this.xmlCatalog = xmlCatalog;
}
@@ -97,20 +100,21 @@
/**
* XMLCatalog calls this to add an external catalog file for each
* file within a <catalogfiles>
fileset.
+ * @param file the external catalog file.
*/
public void parseCatalog(String file) {
- Catalog _catalog = getCatalog();
- if (!(_catalog instanceof ApacheCatalog)) {
- throw new BuildException("Wrong catalog type found: " + _catalog.getClass().getName());
+ Catalog catalog = getCatalog();
+ if (!(catalog instanceof ApacheCatalog)) {
+ throw new BuildException("Wrong catalog type found: " + catalog.getClass().getName());
}
- ApacheCatalog catalog = (ApacheCatalog) _catalog;
+ ApacheCatalog apacheCatalog = (ApacheCatalog) catalog;
// Pass in reference to ourselves so we can be called back.
- catalog.setResolver(this);
+ apacheCatalog.setResolver(this);
try {
- catalog.parseCatalog(file);
+ apacheCatalog.parseCatalog(file);
} catch (MalformedURLException ex) {
throw new BuildException(ex);
} catch (IOException ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org