You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2002/02/05 12:59:28 UTC
cvs commit: jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/util AntException.java
conor 02/02/05 03:59:28
Modified: proposal/mutant ant1compat.xml build.xml
proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution
ExecutionFrame.java
proposal/mutant/src/java/antlibs/system/code/org/apache/ant/antlib/system
AntBase.java
proposal/mutant/src/java/common/org/apache/ant/common/antlib
AbstractComponent.java
proposal/mutant/src/java/common/org/apache/ant/common/util
AntException.java
Log:
A little bit of checkstyle (thanks Oliver)
Build fiel changes
Revision Changes Path
1.2 +3 -2 jakarta-ant/proposal/mutant/ant1compat.xml
Index: ant1compat.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/ant1compat.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- ant1compat.xml 2 Feb 2002 15:05:56 -0000 1.1
+++ ant1compat.xml 5 Feb 2002 11:59:28 -0000 1.2
@@ -23,11 +23,9 @@
</patternset>
<patternset id="toohard">
- <exclude name="org/apache/tools/ant/taskdefs/Ant.java"/>
<exclude name="org/apache/tools/ant/taskdefs/AntStructure.java"/>
<exclude name="org/apache/tools/ant/taskdefs/Recorder.java"/>
<exclude name="org/apache/tools/ant/taskdefs/RecorderEntry.java"/>
- <exclude name="org/apache/tools/ant/taskdefs/CallTarget.java"/>
<exclude name="org/apache/tools/ant/taskdefs/optional/sound/*.java"/>
<exclude name="org/apache/tools/ant/taskdefs/optional/Native2Ascii.java"/>
<exclude name="org/apache/tools/ant/taskdefs/optional/Javah.java"/>
@@ -37,9 +35,12 @@
<exclude name="org/apache/tools/ant/taskdefs/Parallel.java"/>
<exclude name="org/apache/tools/ant/taskdefs/Sequential.java"/>
<exclude name="org/apache/tools/ant/taskdefs/optional/ejb/**/*.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/jdepend/*.java"/>
</patternset>
<patternset id="converted">
+ <exclude name="org/apache/tools/ant/taskdefs/Ant.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/CallTarget.java"/>
</patternset>
<fileset id="ant1src" dir="../../src/main">
1.10 +1 -1 jakarta-ant/proposal/mutant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- build.xml 3 Feb 2002 12:52:58 -0000 1.9
+++ build.xml 5 Feb 2002 11:59:28 -0000 1.10
@@ -162,7 +162,7 @@
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
<classpath refid="checkstyle.path"/>
</taskdef>
- <mkdir dir="${bin.dir}/checkstyle"/>
+ <mkdir dir="${bin.dir}/check"/>
<checkstyle maxlinelen="80"
memberpattern="[a-z].*"
parampattern="[a-z].*"
1.6 +0 -1 jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionFrame.java
Index: ExecutionFrame.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionFrame.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- ExecutionFrame.java 5 Feb 2002 11:49:04 -0000 1.5
+++ ExecutionFrame.java 5 Feb 2002 11:59:28 -0000 1.6
@@ -76,7 +76,6 @@
import org.apache.ant.common.util.ConfigException;
import org.apache.ant.common.util.ExecutionException;
import org.apache.ant.common.util.FileUtils;
-import org.apache.ant.common.util.Location;
import org.apache.ant.common.util.MessageLevel;
import org.apache.ant.init.InitConfig;
1.2 +33 -12 jakarta-ant/proposal/mutant/src/java/antlibs/system/code/org/apache/ant/antlib/system/AntBase.java
Index: AntBase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/system/code/org/apache/ant/antlib/system/AntBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- AntBase.java 5 Feb 2002 11:49:06 -0000 1.1
+++ AntBase.java 5 Feb 2002 11:59:28 -0000 1.2
@@ -56,9 +56,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.ant.common.antlib.AbstractComponent;
import org.apache.ant.common.antlib.AbstractTask;
import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AbstractComponent;
import org.apache.ant.common.service.DataService;
import org.apache.ant.common.util.ExecutionException;
@@ -120,12 +120,19 @@
return value;
}
+ /**
+ * Validate this data type instance
+ *
+ * @exception ExecutionException if either attribute has not been set
+ */
public void validateComponent() throws ExecutionException {
if (name == null) {
- throw new ExecutionException("\"name\" attribute of <property> must be supplied");
+ throw new ExecutionException("\"name\" attribute of "
+ + "<property> must be supplied");
}
if (value == null) {
- throw new ExecutionException("\"value\" attribute of <property> must be supplied");
+ throw new ExecutionException("\"value\" attribute of "
+ + "<property> must be supplied");
}
}
}
@@ -178,9 +185,15 @@
return toId;
}
+ /**
+ * Validate this data type instance
+ *
+ * @exception ExecutionException if the refid attribute has not been set
+ */
public void validateComponent() throws ExecutionException {
if (refId == null) {
- throw new ExecutionException("\"refid\" attribute of <reference> must be supplied");
+ throw new ExecutionException("\"refid\" attribute of "
+ + "<reference> must be supplied");
}
}
}
@@ -188,10 +201,16 @@
/** The name of the target to be evaluated in the sub-build */
private String targetName;
- /** flag which indicates if all current properties should be passed to the subbuild */
+ /**
+ * flag which indicates if all current properties should be passed to
+ * the subbuild
+ */
private boolean inheritAll = true;
- /** flag which indicates if all current references should be passed to the subbuild */
+ /**
+ * flag which indicates if all current references should be passed to
+ * the subbuild
+ */
private boolean inheritRefs = false;
/** The properties which will be passed to the sub-build */
@@ -221,7 +240,8 @@
/**
* Indicate if all references are to be passed to the subbuild
*
- * @param inheritRefs true if the sub-build should be given all the current references
+ * @param inheritRefs true if the sub-build should be given all the
+ * current references
*/
public void setInheritRefs(boolean inheritRefs) {
this.inheritRefs = inheritRefs;
@@ -251,7 +271,8 @@
* Add a reference to be passed
*
* @param reference the descriptor of the reference to be passed
- * @exception ExecutionException if the reference does not reference a valid object
+ * @exception ExecutionException if the reference does not reference a
+ * valid object
*/
public void addReference(Reference reference) throws ExecutionException {
String refId = reference.getRefId();
1.2 +4 -3 jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractComponent.java
Index: AbstractComponent.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- AbstractComponent.java 5 Feb 2002 11:49:06 -0000 1.1
+++ AbstractComponent.java 5 Feb 2002 11:59:28 -0000 1.2
@@ -80,7 +80,6 @@
* Validate the component. This is called after the element has been
* configured from its build model. The element may perform validation
* of its configuration
-
*
* @exception ExecutionException if validation fails
*/
@@ -100,9 +99,11 @@
/**
* Short cut to get a core service instance
*
- * @param serviceClass the required interface of which an instance is required
+ * @param serviceClass the required interface of which an instance is
+ * required
* @return the core's instance of the requested service
- * @exception ExecutionException if the core does not support the requested service
+ * @exception ExecutionException if the core does not support the
+ * requested service
*/
protected Object getCoreService(Class serviceClass)
throws ExecutionException {
1.4 +2 -1 jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/util/AntException.java
Index: AntException.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/util/AntException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- AntException.java 5 Feb 2002 11:49:06 -0000 1.3
+++ AntException.java 5 Feb 2002 11:59:28 -0000 1.4
@@ -146,7 +146,8 @@
* Sets the file location where the error occured.
*
* @param newLocation the new location value
- * @param override true if the location should override any currently set location
+ * @param override true if the location should override any currently
+ * set location
*/
public void setLocation(Location newLocation, boolean override) {
if (override || location == Location.UNKNOWN_LOCATION) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>