You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/12/16 01:36:24 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend JDependTask.java
donaldp 01/12/15 16:36:24
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
Log:
BuildException -> TaskException
Removed uneeded imports.
Processed code through style formatter.
Revision Changes Path
1.3 +20 -19 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDependTask.java 2001/12/15 14:55:58 1.2
+++ JDependTask.java 2001/12/16 00:36:24 1.3
@@ -6,11 +6,12 @@
* the LICENSE file.
*/
package org.apache.tools.ant.taskdefs.optional.jdepend;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.tools.ant.BuildException;
+import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.PathTokenizer;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@@ -62,7 +63,9 @@
// required attributes
private Path _sourcesPath;
- public JDependTask() { }
+ public JDependTask()
+ {
+ }
/**
* Set the classpath to be used for this compilation.
@@ -113,7 +116,6 @@
_fork = value;
}
-
public void setFormat( FormatAttribute ea )
{
format = ea.getValue();
@@ -237,22 +239,21 @@
}
public void execute()
- throws BuildException
+ throws TaskException
{
CommandlineJava commandline = new CommandlineJava();
if( "text".equals( format ) )
commandline.setClassname( "jdepend.textui.JDepend" );
- else
- if( "xml".equals( format ) )
+ else if( "xml".equals( format ) )
commandline.setClassname( "jdepend.xmlui.JDepend" );
if( _jvm != null )
commandline.setVm( _jvm );
if( getSourcespath() == null )
- throw new BuildException( "Missing Sourcepath required argument" );
+ throw new TaskException( "Missing Sourcepath required argument" );
// execute the test and get the return code
int exitValue = JDependTask.ERRORS;
@@ -280,7 +281,7 @@
if( errorOccurred )
{
if( getHaltonerror() )
- throw new BuildException( "JDepend failed" );
+ throw new TaskException( "JDepend failed" );
else
log( "JDepend FAILED", Project.MSG_ERR );
}
@@ -297,11 +298,11 @@
* case the test could probably hang forever.
* @param commandline Description of Parameter
* @return Description of the Returned Value
- * @exception BuildException Description of Exception
+ * @exception TaskException Description of Exception
*/
// JL: comment extracted from JUnitTask (and slightly modified)
public int executeAsForked( CommandlineJava commandline, ExecuteWatchdog watchdog )
- throws BuildException
+ throws TaskException
{
// if not set, auto-create the ClassPath from the project
createClasspath();
@@ -330,7 +331,7 @@
// not necessary as JDepend would fail, but why loose some time?
if( !f.exists() || !f.isDirectory() )
- throw new BuildException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." );
+ throw new TaskException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." );
commandline.createArgument().setValue( f.getPath() );
}
@@ -351,7 +352,7 @@
}
catch( IOException e )
{
- throw new BuildException( "Process fork failed.", e );
+ throw new TaskException( "Process fork failed.", e );
}
}
@@ -366,10 +367,10 @@
*
* @param commandline Description of Parameter
* @return Description of the Returned Value
- * @exception BuildException Description of Exception
+ * @exception TaskException Description of Exception
*/
public int executeInVM( CommandlineJava commandline )
- throws BuildException
+ throws TaskException
{
jdepend.textui.JDepend jdepend;
@@ -389,7 +390,7 @@
{
String msg = "JDepend Failed when creating the output file: " + e.getMessage();
log( msg );
- throw new BuildException( msg );
+ throw new TaskException( msg );
}
jdepend.setWriter( new PrintWriter( fw ) );
log( "Output to be stored in " + getOutputFile().getPath() );
@@ -405,7 +406,7 @@
{
String msg = "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail.";
log( msg );
- throw new BuildException( msg );
+ throw new TaskException( msg );
}
try
{
@@ -415,7 +416,7 @@
{
String msg = "JDepend Failed when adding a source directory: " + e.getMessage();
log( msg );
- throw new BuildException( msg );
+ throw new TaskException( msg );
}
}
jdepend.analyze();
@@ -425,10 +426,10 @@
/**
* @return <tt>null</tt> if there is a timeout value, otherwise the watchdog
* instance.
- * @exception BuildException Description of Exception
+ * @exception TaskException Description of Exception
*/
protected ExecuteWatchdog createWatchdog()
- throws BuildException
+ throws TaskException
{
return null;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>