dion 02/05/27 05:25:45
Modified: src/java/org/apache/maven/ant Ant.java ListTask.java
FileSetFromPath.java GetList.java
CreatePatternSet.java CreateClasspath.java
CallTarget.java AntUtils.java
Log:
Fix CheckStyle Issues
Revision Changes Path
1.5 +28 -17 jakarta-turbine-maven/src/java/org/apache/maven/ant/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/Ant.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Ant.java 27 May 2002 12:06:16 -0000 1.4
+++ Ant.java 27 May 2002 12:25:44 -0000 1.5
@@ -169,8 +169,10 @@
* </p>
*
* <p>This property defaults to true</p>
+ * @param value the new value of {@link #exportAll}
*/
- public void setExportAll(boolean value) {
+ public void setExportAll(boolean value)
+ {
exportAll = value;
}
@@ -183,8 +185,10 @@
* </p>
*
* <p>This property defaults to true</p>
+ * @param value the new value of {@link #exportRefs}
*/
- public void setExportRefs(boolean value) {
+ public void setExportRefs(boolean value)
+ {
exportRefs = value;
}
@@ -502,7 +506,8 @@
{
Reference ref = (Reference) e.nextElement();
String refid = ref.getRefId();
- if (refid == null) {
+ if (refid == null)
+ {
throw new BuildException("the refid attribute is required"
+ " for reference elements");
}
@@ -568,7 +573,6 @@
* @param orig is the reference to be cloned
* @param key is the key for the newly created reference
* @param aProject is the project to add the new reference to
- * @return a new cloned reference, ready for adding to a different project
*/
private void copyReference(Object orig, String key, Project aProject)
{
@@ -622,13 +626,17 @@
* Export any references defined in the child project to the parent
* Project providing that they don't already exist in the parent
* project.
+ * @throws BuildException when any error occurs
*/
- private void exportReferences() throws BuildException {
- if (exportRefs) {
- Hashtable thisReferences = (Hashtable) project.getReferences().clone();
+ private void exportReferences() throws BuildException
+ {
+ if (exportRefs)
+ {
+ Hashtable thisReferences = (Hashtable) project.getReferences().
+ clone();
Hashtable newReferences = newProject.getReferences();
- for (Enumeration e = newReferences.keys(); e.hasMoreElements(); )
+ for (Enumeration e = newReferences.keys(); e.hasMoreElements();)
{
String refid = (String) e.nextElement();
if (refid != null)
@@ -637,9 +645,8 @@
if (!thisReferences.containsKey(refid))
{
Object reference = newReferences.get(refid);
-
- log("exporting reference for id: " + refid,
Project.MSG_VERBOSE);
-
+ log("exporting reference for id: " + refid,
+ Project.MSG_VERBOSE);
copyReference(reference, refid, project);
}
}
@@ -652,13 +659,17 @@
* Export any properties defined in the child project to the parent
* Project providing that they don't already exist in the parent
* project.
+ * @throws BuildException when any error occurs
*/
- private void exportProperties() throws BuildException {
- if (exportAll) {
- Hashtable thisProperties = (Hashtable) project.getProperties().clone();
+ private void exportProperties() throws BuildException
+ {
+ if (exportAll)
+ {
+ Hashtable thisProperties = (Hashtable) project.getProperties().
+ clone();
Hashtable newProperties = newProject.getProperties();
- for (Enumeration e = newProperties.keys(); e.hasMoreElements(); )
+ for (Enumeration e = newProperties.keys(); e.hasMoreElements();)
{
String key = (String) e.nextElement();
if (key != null)
@@ -666,8 +677,8 @@
// do not overwrite any existing properties
if (!thisProperties.containsKey(key))
{
- log("exporting property for key: " + key,
Project.MSG_VERBOSE);
-
+ log("exporting property for key: " + key,
+ Project.MSG_VERBOSE);
project.setProperty(key, newProject.getProperty(key));
}
}
1.5 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/ant/ListTask.java
Index: ListTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/ListTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListTask.java 27 May 2002 12:06:16 -0000 1.4
+++ ListTask.java 27 May 2002 12:25:44 -0000 1.5
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
1.4 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/ant/FileSetFromPath.java
Index: FileSetFromPath.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/FileSetFromPath.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileSetFromPath.java 27 May 2002 12:06:16 -0000 1.3
+++ FileSetFromPath.java 27 May 2002 12:25:44 -0000 1.4
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
1.4 +2 -0 jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java
Index: GetList.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetList.java 27 May 2002 12:06:16 -0000 1.3
+++ GetList.java 27 May 2002 12:25:44 -0000 1.4
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
1.3 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/ant/CreatePatternSet.java
Index: CreatePatternSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/CreatePatternSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CreatePatternSet.java 22 Apr 2002 00:15:04 -0000 1.2
+++ CreatePatternSet.java 27 May 2002 12:25:44 -0000 1.3
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import org.apache.tools.ant.BuildException;
1.3 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/ant/CreateClasspath.java
Index: CreateClasspath.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/CreateClasspath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CreateClasspath.java 22 Apr 2002 00:15:04 -0000 1.2
+++ CreateClasspath.java 27 May 2002 12:25:44 -0000 1.3
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
1.3 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/ant/CallTarget.java
Index: CallTarget.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/CallTarget.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallTarget.java 27 May 2002 12:06:16 -0000 1.2
+++ CallTarget.java 27 May 2002 12:25:44 -0000 1.3
@@ -50,6 +50,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
//package org.apache.tools.ant.taskdefs;
1.6 +3 -1
jakarta-turbine-maven/src/java/org/apache/maven/ant/AntUtils.java
Index: AntUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/AntUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AntUtils.java 27 May 2002 12:06:16 -0000 1.5
+++ AntUtils.java 27 May 2002 12:25:44 -0000 1.6
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
@@ -67,7 +69,7 @@
* sets of values.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: AntUtils.java,v 1.5 2002/05/27 12:06:16 dion Exp $
+ * @version $Id: AntUtils.java,v 1.6 2002/05/27 12:25:44 dion Exp $
*/
public class AntUtils
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
