conor 2003/07/17 07:55:44
Modified: src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
Cab.java EchoProperties.java IContract.java
Javah.java Native2Ascii.java PropertyFile.java
RenameExtensions.java ReplaceRegExp.java Rpm.java
Script.java StyleBook.java Test.java
TraXLiaison.java XalanLiaison.java XslpLiaison.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
InnerClassFilenameFilter.java
src/main/org/apache/tools/ant/taskdefs/optional/javacc
JavaCC.java
src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
src/main/org/apache/tools/ant/taskdefs/optional/jlink
JlinkTask.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
JasperC.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
AggregateTransformer.java BaseTest.java
BatchTest.java DOMUtil.java Enumerations.java
JUnitTask.java JUnitTest.java JUnitTestRunner.java
XMLResultAggregator.java XalanExecutor.java
src/main/org/apache/tools/ant/taskdefs/optional/metamata
MAudit.java MAuditParser.java
MAuditStreamHandler.java MMetricsStreamHandler.java
MParse.java
src/main/org/apache/tools/ant/taskdefs/optional/sound
AntSoundPlayer.java SoundTask.java
src/main/org/apache/tools/ant/taskdefs/optional/splash
SplashScreen.java SplashTask.java
src/main/org/apache/tools/ant/taskdefs/optional/unix
Symlink.java
src/main/org/apache/tools/ant/types/optional
ScriptFilter.java
Log:
style
Revision Changes Path
1.31 +5 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -u -r1.30 -r1.31
--- ANTLR.java 9 Jul 2003 13:12:24 -0000 1.30
+++ ANTLR.java 17 Jul 2003 14:55:41 -0000 1.31
@@ -157,9 +157,7 @@
String sg = null;
if (Os.isFamily("dos")) {
sg = superGrammar.replace('\\','/');
- }
- else
- {
+ } else {
sg = superGrammar;
}
setGlib(fileUtils.resolveFile(getProject().getBaseDir(), sg));
@@ -304,8 +302,8 @@
File generatedFile = getGeneratedFile();
boolean targetIsOutOfDate =
target.lastModified() > generatedFile.lastModified();
- boolean superGrammarIsOutOfDate = superGrammar != null &&
- (superGrammar.lastModified() > generatedFile.lastModified());
+ boolean superGrammarIsOutOfDate = superGrammar != null
+ && (superGrammar.lastModified() >
generatedFile.lastModified());
if (targetIsOutOfDate || superGrammarIsOutOfDate) {
if (targetIsOutOfDate) {
log("Compiling " + target + " as it is newer than "
@@ -431,6 +429,7 @@
try {
bos.close();
} catch (IOException e) {
+ // ignore
}
}
}
1.27 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -u -r1.26 -r1.27
1.18 +26 -26
ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
Index: EchoProperties.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.16 +27 -18
ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
--- IContract.java 10 Feb 2003 14:13:45 -0000 1.15
+++ IContract.java 17 Jul 2003 14:55:41 -0000 1.16
@@ -78,10 +78,13 @@
/**
* Instruments Java classes with iContract DBC preprocessor.
* <br/>
- * The task can generate a properties file for <a
href="http://hjem.sol.no/hellesoy/icontrol.html";>iControl</a>,
- * a graphical user interface that lets you turn on/off assertions. iControl
generates a control file that you can refer to
+ * The task can generate a properties file for
+ * <a href="http://hjem.sol.no/hellesoy/icontrol.html";>iControl</a>,
+ * a graphical user interface that lets you turn on/off assertions.
+ * iControl generates a control file that you can refer to
* from this task using the controlfile attribute.
- * iContract is at <a
href="http://www.reliable-systems.com/tools/";>http://www.reliable-systems.com/tools/</a>
+ * iContract is at
+ * <a
href="http://www.reliable-systems.com/tools/";>http://www.reliable-systems.com/tools/</a>
* <p/>
* Thanks to Rainer Schmitz for enhancements and comments.
*
@@ -154,22 +157,25 @@
* </tr>
* <tr>
* <td valign="top">verbosity</td>
- * <td valign="top">Indicates the verbosity level of iContract. Any
combination
- * of <code>error*,warning*,note*,info*,progress*,debug*</code> (comma
separated) can be
- * used. Defaults to <code>error*</code></td>
+ * <td valign="top">Indicates the verbosity level of iContract.
+ * Any combination of
+ * <code>error*,warning*,note*,info*,progress*,debug*</code>
+ * (comma separated) can be used. Defaults to <code>error*</code></td>
* <td valign="top" align="center">No</td>
* </tr>
* <tr>
* <td valign="top">quiet</td>
- * <td valign="top">Indicates if iContract should be quiet. Turn it off
if many your classes extend uninstrumented classes
- * and you don't want warnings about this. Defaults to
<code>false</code></td>
+ * <td valign="top">Indicates if iContract should be quiet. Turn it off
+ * if many your classes extend uninstrumented classes and you don't
+ * want warnings about this. Defaults to <code>false</code></td>
* <td valign="top" align="center">No</td>
* </tr>
* <tr>
* <td valign="top">updateicontrol</td>
- * <td valign="top">If set to true, it indicates that the properties
file for
- * iControl in the current directory should be updated (or created if
it doesn't exist).
- * Defaults to <code>false</code>.</td>
+ * <td valign="top">If set to true, it indicates that the properties
+ * file for iControl in the current directory should be updated
+ * (or created if it doesn't exist). Defaults to <code>false</code>.
+ * </td>
* <td valign="top" align="center">No</td>
* </tr>
* <tr>
@@ -614,7 +620,8 @@
if (updateIcontrol) {
Properties iControlProps = new Properties();
- try {// to read existing propertiesfile
+ try {
+ // to read existing propertiesfile
iControlProps.load(new
FileInputStream("icontrol.properties"));
} catch (IOException e) {
log("File icontrol.properties not found. That's ok.
Writing a default one.");
@@ -625,7 +632,8 @@
iControlProps.setProperty("controlFile",
controlFile.getAbsolutePath());
iControlProps.setProperty("targetsFile",
targets.getAbsolutePath());
- try {// to read existing propertiesfile
+ try {
+ // to read existing propertiesfile
iControlProps.store(new
FileOutputStream("icontrol.properties"), ICONTROL_PROPERTIES_HEADER);
log("Updated icontrol.properties");
} catch (IOException e) {
@@ -644,7 +652,8 @@
}
throw new BuildException("iContract instrumentation failed.
Code=" + result);
}
- } else {// not dirty
+ } else {
+ // not dirty
//log( "Nothing to do. Everything up to date." );
}
}
@@ -664,10 +673,10 @@
if (repositoryDir == null) {
throw new BuildException("repositorydir attribute must be set!",
getLocation());
}
- if (updateIcontrol == true && classDir == null) {
+ if (updateIcontrol && classDir == null) {
throw new BuildException("classdir attribute must be specified
when updateicontrol=true!", getLocation());
}
- if (updateIcontrol == true && controlFile == null) {
+ if (updateIcontrol && controlFile == null) {
throw new BuildException("controlfile attribute must be
specified when updateicontrol=true!", getLocation());
}
}
@@ -719,8 +728,8 @@
File classFile = new File(buildDir,
files[i].substring(0, files[i].indexOf(".java")) + ".class");
if (srcFile.lastModified() > now) {
- log("Warning: file modified in the future: " +
- files[i], Project.MSG_WARN);
+ log("Warning: file modified in the future: "
+ + files[i], Project.MSG_WARN);
}
if (!classFile.exists() || srcFile.lastModified() >
classFile.lastModified()) {
1.23 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
Index: Javah.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
1.15 +23 -23
ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
Index: Native2Ascii.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.30 +35 -38
ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
Index: PropertyFile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -u -r1.29 -r1.30
--- PropertyFile.java 11 Jul 2003 21:25:35 -0000 1.29
+++ PropertyFile.java 17 Jul 2003 14:55:41 -0000 1.30
@@ -60,9 +60,6 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.ParseException;
1.22 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java
Index: RenameExtensions.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -u -r1.21 -r1.22
1.22 +14 -14
ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
Index: ReplaceRegExp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -u -r1.21 -r1.22
1.15 +8 -8
ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.21 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.11 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
Index: StyleBook.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.13 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/Test.java
Index: Test.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Test.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.27 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
Index: TraXLiaison.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -u -r1.26 -r1.27
1.16 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
Index: XalanLiaison.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
1.17 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java
Index: XslpLiaison.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
1.10 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
Index: InnerClassFilenameFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.25 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -u -r1.24 -r1.25
1.21 +12 -12
ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.14 +8 -8
ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
Index: JlinkTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.33 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
1.17 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
Index: JasperC.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
1.23 +16 -16
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
Index: AggregateTransformer.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
1.10 +8 -8
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
Index: BaseTest.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.15 +9 -9
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
Index: BatchTest.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.8 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.6 +14 -14
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java
Index: Enumerations.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
1.71 +6 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -w -u -r1.70 -r1.71
1.16 +15 -15
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
Index: JUnitTest.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
1.38 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -u -r1.37 -r1.38
1.23 +12 -12
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
1.10 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Index: XalanExecutor.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.10 +16 -16
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
Index: MAudit.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.5 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java
Index: MAuditParser.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
1.9 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java
Index: MAuditStreamHandler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.11 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
Index: MMetricsStreamHandler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.18 +21 -21
ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.12 +9 -9
ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
Index: AntSoundPlayer.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
1.11 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
Index: SoundTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.7 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
Index: SplashScreen.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
1.7 +29 -29
ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
Index: SplashTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
1.9 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
Index: Symlink.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.4 +7 -9
ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
Index: ScriptFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- ScriptFilter.java 4 Jul 2003 14:04:56 -0000 1.3
+++ ScriptFilter.java 17 Jul 2003 14:55:44 -0000 1.4
@@ -73,10 +73,7 @@
* The script is meant to use get self.token and
* set self.token in the reply.
*/
-
-public class ScriptFilter
- extends TokenFilter.ChainableReaderFilter
-{
+public class ScriptFilter extends TokenFilter.ChainableReaderFilter {
/** The language - attribute of element */
private String language;
/** The script - inline text or external file */
@@ -132,12 +129,14 @@
* @exception BuildException if someting goes wrong
*/
private void init() throws BuildException {
- if (initialized)
+ if (initialized) {
return;
+ }
initialized = true;
- if (language == null)
+ if (language == null) {
throw new BuildException(
"scriptfilter: language is not defined");
+ }
try {
addBeans(getProject().getProperties());
@@ -157,8 +156,7 @@
manager.declareBean(key, value, value.getClass());
}
- }
- catch (BSFException e) {
+ } catch (BSFException e) {
Throwable t = e;
Throwable te = e.getTargetException();
if (te != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
