conor 2003/07/17 08:44:45
Modified: src/main/org/apache/tools/ant DemuxOutputStream.java
IntrospectionHelper.java Main.java
src/main/org/apache/tools/ant/filters TailFilter.java
src/main/org/apache/tools/ant/filters/util
ChainReaderHelper.java
src/main/org/apache/tools/ant/helper ProjectHelper2.java
src/main/org/apache/tools/ant/listener MailLogger.java
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
Ant.java Exec.java ExecTask.java
ExecuteWatchdog.java Expand.java FixCRLF.java
Get.java JDBCTask.java Jar.java Java.java
Javadoc.java LoadProperties.java
LogOutputStream.java PathConvert.java Replace.java
SQLExec.java Sequential.java Tstamp.java
WhichResource.java XSLTProcess.java
src/main/org/apache/tools/ant/taskdefs/cvslib
ChangeLogParser.java
src/main/org/apache/tools/ant/taskdefs/email EmailTask.java
src/main/org/apache/tools/ant/taskdefs/optional
EchoProperties.java Javah.java ReplaceRegExp.java
src/main/org/apache/tools/ant/taskdefs/optional/ccm
CCMCheck.java
src/main/org/apache/tools/ant/taskdefs/optional/clearcase
CCMklabel.java CCMklbtype.java CCRmtype.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java DotnetBaseMatchingTask.java
DotnetCompile.java DotnetDefine.java
ImportTypelib.java VisualBasicCompile.java
WsdlToDotnet.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
BorlandGenerateClient.java EjbJar.java
JbossDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers
AntResolver.java LocationResolver.java
URLResolver.java
src/main/org/apache/tools/ant/taskdefs/optional/i18n
Translate.java
src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJWorkspaceScanner.java
src/main/org/apache/tools/ant/taskdefs/optional/j2ee
JonasHotDeploymentTool.java
WebLogicHotDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
FormatterElement.java JUnitTask.java
src/main/org/apache/tools/ant/taskdefs/optional/net
SetProxy.java
src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
src/main/org/apache/tools/ant/taskdefs/optional/unix
Symlink.java
src/main/org/apache/tools/ant/taskdefs/rmic SunRmic.java
src/main/org/apache/tools/ant/types Assertions.java
CommandlineJava.java DataType.java
EnumeratedAttribute.java FilterChain.java
Mapper.java Path.java PropertySet.java
XMLCatalog.java
src/main/org/apache/tools/ant/types/optional/image Draw.java
ImageOperation.java Rotate.java
TransformOperation.java
src/main/org/apache/tools/ant/types/resolver
ApacheCatalog.java ApacheCatalogResolver.java
src/main/org/apache/tools/ant/util ClasspathUtils.java
CollectionUtils.java DateUtils.java JAXPUtils.java
JavaEnvUtils.java KeepAliveOutputStream.java
LazyHashtable.java StringUtils.java TaskLogger.java
WeakishReference.java
src/main/org/apache/tools/ant/util/depend/bcel
DependencyVisitor.java
src/main/org/apache/tools/mail MailMessage.java
Log:
style
Revision Changes Path
1.18 +1 -1 ant/src/main/org/apache/tools/ant/DemuxOutputStream.java
Index: DemuxOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DemuxOutputStream.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.59 +1 -2
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -w -u -r1.58 -r1.59
--- IntrospectionHelper.java 17 Jul 2003 14:36:39 -0000 1.58
+++ IntrospectionHelper.java 17 Jul 2003 15:44:36 -0000 1.59
@@ -417,8 +417,7 @@
*
* @return a helper for the specified class
*/
- public static synchronized IntrospectionHelper getHelper(Project p,
Class c)
- {
+ public static synchronized IntrospectionHelper getHelper(Project p,
Class c) {
IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c);
if (ih == null) {
ih = new IntrospectionHelper(c);
1.88 +4 -4 ant/src/main/org/apache/tools/ant/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -w -u -r1.87 -r1.88
1.11 +1 -2 ant/src/main/org/apache/tools/ant/filters/TailFilter.java
Index: TailFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TailFilter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
--- TailFilter.java 6 Jul 2003 09:57:35 -0000 1.10
+++ TailFilter.java 17 Jul 2003 15:44:36 -0000 1.11
@@ -252,8 +252,7 @@
if (lineList.size() > skip) {
return (String) lineList.removeFirst();
}
- }
- else {
+ } else {
long linesToKeep = lines + (skip > 0 ? skip : 0);
if (linesToKeep < lineList.size()) {
lineList.removeFirst();
1.16 +1 -1
ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
Index: ChainReaderHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
1.22 +4 -4
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -u -r1.21 -r1.22
1.20 +1 -2
ant/src/main/org/apache/tools/ant/listener/MailLogger.java
Index: MailLogger.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/listener/MailLogger.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- MailLogger.java 28 May 2003 20:58:02 -0000 1.19
+++ MailLogger.java 17 Jul 2003 15:44:37 -0000 1.20
@@ -166,8 +166,7 @@
(success) ? "Build Success" : "Build Failure");
if (user.equals("") && password.equals("") && !ssl) {
sendMail(mailhost, port, from, replytoList, toList,
subject, buffer.substring(0));
- }
- else {
+ } else {
sendMimeMail(event.getProject(), mailhost, port, user,
password, ssl, from, replytoList, toList, subject, buffer.substring(0));
}
} catch (Exception e) {
1.20 +14 -14
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
1.81 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -w -u -r1.80 -r1.81
1.35 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
Index: Exec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -u -r1.34 -r1.35
1.54 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -w -u -r1.53 -r1.54
1.15 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
Index: ExecuteWatchdog.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.47 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -w -u -r1.46 -r1.47
1.50 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -w -u -r1.49 -r1.50
1.35 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -u -r1.34 -r1.35
1.11 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
Index: JDBCTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.77 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -w -u -r1.76 -r1.77
1.63 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -w -u -r1.62 -r1.63
1.118 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -w -u -r1.117 -r1.118
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
Index: LoadProperties.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.26 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -u -r1.25 -r1.26
1.42 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
Index: Replace.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
1.58 +11 -18 ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -w -u -r1.57 -r1.58
--- SQLExec.java 16 Jul 2003 17:29:36 -0000 1.57
+++ SQLExec.java 17 Jul 2003 15:44:38 -0000 1.58
@@ -535,19 +535,13 @@
ret = statement.execute(sql);
updateCount = statement.getUpdateCount();
resultSet = statement.getResultSet();
- do
- {
- if (!ret)
- {
- if (updateCount != -1)
- {
+ do {
+ if (!ret) {
+ if (updateCount != -1) {
updateCountTotal += updateCount;
}
- }
- else
- {
- if (print)
- {
+ } else {
+ if (print) {
printResults(out);
}
}
@@ -559,8 +553,7 @@
log(updateCountTotal + " rows affected",
Project.MSG_VERBOSE);
- if (print)
- {
+ if (print) {
StringBuffer line = new StringBuffer();
line.append(updateCountTotal + " rows affected");
out.println(line);
1.15 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java
Index: Sequential.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- Sequential.java 9 Jul 2003 13:12:24 -0000 1.14
+++ Sequential.java 17 Jul 2003 15:44:38 -0000 1.15
@@ -64,8 +64,7 @@
/**
* Sequential is a container task - it can contain other Ant tasks. The
nested
* tasks are simply executed in sequence. Sequential's primary use is to
support
- * the sequential execution of a subset of tasks within the
- [EMAIL PROTECTED] Parallel Parallel Task}
+ * the sequential execution of a subset of tasks within the [EMAIL
PROTECTED] Parallel Parallel Task}
* <p>
* The sequential task has no attributes and does not support any nested
1.36 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
1.4 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
Index: WhichResource.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/WhichResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.67 +8 -8
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -w -u -r1.66 -r1.67
1.19 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
Index: ChangeLogParser.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
1.21 +2 -3
ant/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
Index: EmailTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
--- EmailTask.java 28 May 2003 20:58:03 -0000 1.20
+++ EmailTask.java 17 Jul 2003 15:44:39 -0000 1.21
@@ -103,8 +103,7 @@
* @return a list of valid entries
*/
public String[] getValues() {
- return new String[]
- {AUTO, MIME, UU, PLAIN};
+ return new String[] {AUTO, MIME, UU, PLAIN};
}
}
1.19 +8 -8
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.18
retrieving revision 1.19
diff -u -w -u -r1.18 -r1.19
1.24 +1 -1
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.23
retrieving revision 1.24
diff -u -w -u -r1.23 -r1.24
1.23 +1 -2
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.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
--- ReplaceRegExp.java 17 Jul 2003 14:55:41 -0000 1.22
+++ ReplaceRegExp.java 17 Jul 2003 15:44:39 -0000 1.23
@@ -371,8 +371,7 @@
// first CR in this line
hasCR = true;
}
- }
- else if (c == '\n') {
+ } else if (c == '\n') {
// LF -> EOL
line = linebuf.toString();
res = doReplace(regex, subs, line, options);
1.12 +10 -11
ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
Index: CCMCheck.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- CCMCheck.java 10 Feb 2003 14:13:46 -0000 1.11
+++ CCMCheck.java 17 Jul 2003 15:44:39 -0000 1.12
@@ -184,8 +184,7 @@
/**
* check the file given by getFile().
*/
- private void doit()
- {
+ private void doit() {
Commandline commandLine = new Commandline();
// build the command line from what we got the format is
1.3 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java
Index: CCMklabel.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
1.3 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java
Index: CCMklbtype.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
1.3 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java
Index: CCRmtype.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
1.33 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
1.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java
Index: DotnetBaseMatchingTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.9 +5 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- DotnetCompile.java 18 Apr 2003 23:40:24 -0000 1.8
+++ DotnetCompile.java 17 Jul 2003 15:44:40 -0000 1.9
@@ -168,8 +168,7 @@
* need to reference mscorlib.dll, cos it is always there
*/
- protected static final String[] DEFAULT_REFERENCE_LIST_DOTNET_10 =
- {"Accessibility.dll",
+ protected static final String[] DEFAULT_REFERENCE_LIST_DOTNET_10 =
{"Accessibility.dll",
"cscompmgd.dll",
"CustomMarshalers.dll",
"Mscorcfg.dll",
1.3 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java
Index: DotnetDefine.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
1.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
Index: ImportTypelib.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.5 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java
Index: VisualBasicCompile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
Index: WsdlToDotnet.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.24 +2 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -u -r1.23 -r1.24
--- BorlandDeploymentTool.java 17 Jul 2003 10:36:28 -0000 1.23
+++ BorlandDeploymentTool.java 17 Jul 2003 15:44:41 -0000 1.24
@@ -106,8 +106,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Benoit Moussaud</a>
*
*/
-public class BorlandDeploymentTool extends GenericDeploymentTool implements
ExecuteStreamHandler
-{
+public class BorlandDeploymentTool extends GenericDeploymentTool implements
ExecuteStreamHandler {
public static final String PUBLICID_BORLAND_EJB
= "-//Inprise Corporation//DTD Enterprise JavaBeans 1.1//EN";
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.43 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
Index: EjbJar.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -u -r1.42 -r1.43
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
Index: JbossDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.4 +13 -25
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
Index: AntResolver.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- AntResolver.java 10 Feb 2003 14:14:05 -0000 1.3
+++ AntResolver.java 17 Jul 2003 15:44:41 -0000 1.4
@@ -69,50 +69,42 @@
* @version $Revision$ $Date$
*/
public class AntResolver
- implements ExtensionResolver
-{
+ implements ExtensionResolver {
private File m_antfile;
private File m_destfile;
private String m_target;
- public void setAntfile( File antfile )
- {
+ public void setAntfile( File antfile) {
m_antfile = antfile;
}
- public void setDestfile( File destfile )
- {
+ public void setDestfile( File destfile) {
m_destfile = destfile;
}
- public void setTarget( final String target )
- {
+ public void setTarget( final String target) {
m_target = target;
}
public File resolve( final Extension extension,
final Project project )
- throws BuildException
- {
+ throws BuildException {
validate();
final Ant ant = (Ant)project.createTask( "ant" );
ant.setInheritAll( false );
ant.setAntfile( m_antfile.getName() );
- try
- {
+ try {
final File dir =
m_antfile.getParentFile().getCanonicalFile();
ant.setDir( dir );
}
- catch( final IOException ioe )
- {
+ catch ( final IOException ioe) {
throw new BuildException( ioe.getMessage(), ioe );
}
- if( null != m_target )
- {
+ if (null != m_target) {
ant.setTarget( m_target );
}
@@ -121,23 +113,19 @@
return m_destfile;
}
- private void validate()
- {
- if( null == m_antfile )
- {
+ private void validate() {
+ if (null == m_antfile) {
final String message = "Must specify Buildfile";
throw new BuildException( message );
}
- if( null == m_destfile )
- {
+ if (null == m_destfile) {
final String message = "Must specify destination file";
throw new BuildException( message );
}
}
- public String toString()
- {
+ public String toString() {
return "Ant[" + m_antfile + "==>" + m_destfile + "]";
}
}
1.5 +6 -11
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java
Index: LocationResolver.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- LocationResolver.java 10 Feb 2003 14:14:05 -0000 1.4
+++ LocationResolver.java 17 Jul 2003 15:44:41 -0000 1.5
@@ -67,21 +67,17 @@
* @version $Revision$ $Date$
*/
public class LocationResolver
- implements ExtensionResolver
-{
+ implements ExtensionResolver {
private String m_location;
- public void setLocation( final String location )
- {
+ public void setLocation( final String location) {
m_location = location;
}
public File resolve( final Extension extension,
final Project project )
- throws BuildException
- {
- if( null == m_location )
- {
+ throws BuildException {
+ if (null == m_location) {
final String message = "No location specified for resolver";
throw new BuildException( message );
}
@@ -89,8 +85,7 @@
return project.resolveFile( m_location );
}
- public String toString()
- {
+ public String toString() {
return "Location[" + m_location + "]";
}
}
1.5 +17 -36
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
Index: URLResolver.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- URLResolver.java 10 Feb 2003 14:14:05 -0000 1.4
+++ URLResolver.java 17 Jul 2003 15:44:41 -0000 1.5
@@ -69,31 +69,26 @@
* @version $Revision$ $Date$
*/
public class URLResolver
- implements ExtensionResolver
-{
+ implements ExtensionResolver {
private File m_destfile;
private File m_destdir;
private URL m_url;
- public void setUrl( final URL url )
- {
+ public void setUrl( final URL url) {
m_url = url;
}
- public void setDestfile( final File destfile )
- {
+ public void setDestfile( final File destfile) {
m_destfile = destfile;
}
- public void setDestdir( final File destdir )
- {
+ public void setDestdir( final File destdir) {
m_destdir = destdir;
}
public File resolve( final Extension extension,
final Project project )
- throws BuildException
- {
+ throws BuildException {
validate();
final File file = getDest();
@@ -106,25 +101,17 @@
return file;
}
- private File getDest()
- {
- if( null != m_destfile )
- {
+ private File getDest() {
+ if (null != m_destfile) {
return m_destfile;
- }
- else
- {
+ } else {
final String file = m_url.getFile();
String filename = null;
- if( null == file || file.length() <= 1 )
- {
+ if (null == file || file.length() <= 1) {
filename = "default.file";
- }
- else
- {
+ } else {
int index = file.lastIndexOf( '/' );
- if( -1 == index )
- {
+ if (-1 == index) {
index = 0;
}
filename = file.substring( index );
@@ -134,28 +121,22 @@
}
}
- private void validate()
- {
- if( null == m_url )
- {
+ private void validate() {
+ if (null == m_url) {
final String message = "Must specify URL";
throw new BuildException( message );
}
- if( null == m_destdir && null == m_destfile )
- {
+ if (null == m_destdir && null == m_destfile) {
final String message = "Must specify destination file or
directory";
throw new BuildException( message );
- }
- else if( null != m_destdir && null != m_destfile )
- {
+ } else if (null != m_destdir && null != m_destfile) {
final String message = "Must not specify both destination file
or directory";
throw new BuildException( message );
}
}
- public String toString()
- {
+ public String toString() {
return "URL[" + m_url + "]";
}
}
1.25 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -u -r1.24 -r1.25
--- Translate.java 9 Jul 2003 13:12:24 -0000 1.24
+++ Translate.java 17 Jul 2003 15:44:41 -0000 1.25
@@ -548,8 +548,7 @@
// If there is a white space or = or :, then
// it isn't to be treated as a valid key.
boolean validToken = true;
- for (int k = 0; k < token.length() &&
validToken; k++)
- {
+ for (int k = 0; k < token.length() &&
validToken; k++) {
char c = token.charAt(k);
if (c == ':' || c == '='
|| Character.isSpaceChar(c)) {
1.12 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
Index: VAJWorkspaceScanner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- VAJWorkspaceScanner.java 10 Feb 2003 14:14:07 -0000 1.11
+++ VAJWorkspaceScanner.java 17 Jul 2003 15:44:41 -0000 1.12
@@ -88,8 +88,7 @@
class VAJWorkspaceScanner extends DirectoryScanner {
// Patterns that should be excluded by default.
- private static final String[] DEFAULTEXCLUDES =
- {
+ private static final String[] DEFAULTEXCLUDES = {
"IBM*/**",
"Java class libraries/**",
"Sun class libraries*/**",
1.12 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
Index: JonasHotDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- JonasHotDeploymentTool.java 6 Jul 2003 09:03:18 -0000 1.11
+++ JonasHotDeploymentTool.java 17 Jul 2003 15:44:42 -0000 1.12
@@ -89,8 +89,7 @@
/**
* All the valid actions that weblogic.deploy permits *
*/
- private static final String[] VALID_ACTIONS =
- {ACTION_DELETE, ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY,
ACTION_UPDATE};
+ private static final String[] VALID_ACTIONS = {ACTION_DELETE,
ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY, ACTION_UPDATE};
/**
* Description of the Field
1.8 +10 -12
ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java
Index: WebLogicHotDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
--- WebLogicHotDeploymentTool.java 10 Feb 2003 14:14:09 -0000 1.7
+++ WebLogicHotDeploymentTool.java 17 Jul 2003 15:44:42 -0000 1.8
@@ -72,14 +72,12 @@
* @see
org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool
* @see org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy
*/
-public class WebLogicHotDeploymentTool extends AbstractHotDeploymentTool
implements HotDeploymentTool
-{
+public class WebLogicHotDeploymentTool extends AbstractHotDeploymentTool
implements HotDeploymentTool {
/** The classname of the tool to run **/
private static final String WEBLOGIC_DEPLOY_CLASS_NAME =
"weblogic.deploy";
/** All the valid actions that weblogic.deploy permits **/
- private static final String[] VALID_ACTIONS =
- {ACTION_DELETE, ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY,
ACTION_UPDATE};
+ private static final String[] VALID_ACTIONS = {ACTION_DELETE,
ACTION_DEPLOY, ACTION_LIST, ACTION_UNDEPLOY, ACTION_UPDATE};
/** Represents the "-debug" flag from weblogic.deploy **/
private boolean debug;
1.34 +2 -2
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.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
1.15 +2 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Index: FormatterElement.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- FormatterElement.java 14 Jul 2003 13:42:33 -0000 1.14
+++ FormatterElement.java 17 Jul 2003 15:44:42 -0000 1.15
@@ -182,8 +182,7 @@
* used if the property has been set, otherwise it won't.
* @param ifProperty name of property
*/
- public void setIf(String ifProperty)
- {
+ public void setIf(String ifProperty) {
this.ifProperty = ifProperty;
}
@@ -193,8 +192,7 @@
* will be used.
* @param unlessProperty name of property
*/
- public void setUnless(String unlessProperty)
- {
+ public void setUnless(String unlessProperty) {
this.unlessProperty = unlessProperty;
}
1.72 +3 -3
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.71
retrieving revision 1.72
diff -u -w -u -r1.71 -r1.72
1.14 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
Index: SetProxy.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.24 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
Index: Pvcs.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -u -r1.23 -r1.24
--- Pvcs.java 29 May 2003 21:35:42 -0000 1.23
+++ Pvcs.java 17 Jul 2003 15:44:42 -0000 1.24
@@ -258,8 +258,7 @@
commandLine.clearArgs();
commandLine.setExecutable(getExecutable(GET_EXE));
- if(getConfig() != null && getConfig().length()>0)
- {
+ if (getConfig() != null && getConfig().length()>0) {
commandLine.createArgument().setValue("-c" + getConfig());
}
1.10 +3 -4
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.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- Symlink.java 17 Jul 2003 14:55:44 -0000 1.9
+++ Symlink.java 17 Jul 2003 15:44:42 -0000 1.10
@@ -269,8 +269,7 @@
writePropertyFile(linksToStore, writeTo,
"Symlinks from " +
writeTo.getParent());
}
- }
- else {
+ } else {
handleError("Invalid action specified in symlink");
}
} finally {
1.9 +6 -7
ant/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
Index: SunRmic.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- SunRmic.java 10 Feb 2003 14:14:29 -0000 1.8
+++ SunRmic.java 17 Jul 2003 15:44:42 -0000 1.9
@@ -82,8 +82,7 @@
try {
Class c = Class.forName("sun.rmi.rmic.Main");
- Constructor cons = c.getConstructor(new Class[]
- { OutputStream.class, String.class });
+ Constructor cons = c.getConstructor(new Class[] {
OutputStream.class, String.class });
Object rmic = cons.newInstance(new Object[] { logstr, "rmic" });
Method doRmic = c.getMethod("compile",
1.3 +8 -8 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
1.42 +17 -17
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
1.15 +22 -23 ant/src/main/org/apache/tools/ant/types/DataType.java
Index: DataType.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/DataType.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- DataType.java 13 Jun 2003 05:15:11 -0000 1.14
+++ DataType.java 17 Jul 2003 15:44:43 -0000 1.15
@@ -236,8 +236,7 @@
* get the reference set on this object
* @return the reference or null
*/
- protected Reference getRefid()
- {
+ protected Reference getRefid() {
return ref;
}
1.11 +6 -6
ant/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
Index: EnumeratedAttribute.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -u -r1.10 -r1.11
1.13 +6 -12 ant/src/main/org/apache/tools/ant/types/FilterChain.java
Index: FilterChain.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterChain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
--- FilterChain.java 4 Jul 2003 14:04:56 -0000 1.12
+++ FilterChain.java 17 Jul 2003 15:44:43 -0000 1.13
@@ -79,8 +79,7 @@
* @author Magesh Umasankar
*/
public final class FilterChain extends DataType
- implements Cloneable
-{
+ implements Cloneable {
private Vector filterReaders = new Vector();
@@ -170,8 +169,7 @@
* containsregex
* @since Ant 1.6
*/
- public void addContainsRegex(TokenFilter.ContainsRegex filter)
- {
+ public void addContainsRegex(TokenFilter.ContainsRegex filter) {
filterReaders.addElement(filter);
}
@@ -179,8 +177,7 @@
* replaceregex
* @since Ant 1.6
*/
- public void addReplaceRegex(TokenFilter.ReplaceRegex filter)
- {
+ public void addReplaceRegex(TokenFilter.ReplaceRegex filter) {
filterReaders.addElement(filter);
}
@@ -188,8 +185,7 @@
* trim
* @since Ant 1.6
*/
- public void addTrim(TokenFilter.Trim filter)
- {
+ public void addTrim(TokenFilter.Trim filter) {
filterReaders.addElement(filter);
}
@@ -198,8 +194,7 @@
* @since Ant 1.6
*/
public void addReplaceString(
- TokenFilter.ReplaceString filter)
- {
+ TokenFilter.ReplaceString filter) {
filterReaders.addElement(filter);
}
@@ -208,8 +203,7 @@
* @since Ant 1.6
*/
public void addIgnoreBlank(
- TokenFilter.IgnoreBlank filter)
- {
+ TokenFilter.IgnoreBlank filter) {
filterReaders.addElement(filter);
}
1.21 +1 -1 ant/src/main/org/apache/tools/ant/types/Mapper.java
Index: Mapper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Mapper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -u -r1.20 -r1.21
1.52 +1 -2 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -w -u -r1.51 -r1.52
--- Path.java 15 Jul 2003 14:54:14 -0000 1.51
+++ Path.java 17 Jul 2003 15:44:43 -0000 1.52
@@ -654,8 +654,7 @@
// IBM's 1.4 has rt.jar split into 4 smaller jars and a combined
// JCE/JSSE in security.jar.
- String[] ibmJars =
- { "core", "graphics", "security", "server", "xml" };
+ String[] ibmJars = { "core", "graphics", "security", "server",
"xml" };
for (int i = 0; i < ibmJars.length; i++) {
addExisting(new Path(null,
System.getProperty("java.home")
1.6 +3 -6 ant/src/main/org/apache/tools/ant/types/PropertySet.java
Index: PropertySet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PropertySet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- PropertySet.java 4 Jul 2003 14:04:56 -0000 1.5
+++ PropertySet.java 17 Jul 2003 15:44:43 -0000 1.6
@@ -206,8 +206,7 @@
if (!getDynamic()) {
cachedNames = names;
}
- }
- else {
+ } else {
names = cachedNames;
}
@@ -247,16 +246,14 @@
if (prj.getProperty(ref.name) != null) {
names.addElement(ref.name);
}
- }
- else if (ref.prefix != null) {
+ } else if (ref.prefix != null) {
for (Enumeration p = properties.keys();
p.hasMoreElements();) {
String name = (String) p.nextElement();
if (name.startsWith(ref.prefix)) {
names.addElement(name);
}
}
- }
- else if (ref.regex != null) {
+ } else if (ref.regex != null) {
RegexpMatcherFactory matchMaker = new RegexpMatcherFactory();
RegexpMatcher matcher = matchMaker.newRegexpMatcher();
matcher.setPattern(ref.regex);
1.28 +11 -21 ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -u -r1.27 -r1.28
--- XMLCatalog.java 15 Jul 2003 14:54:14 -0000 1.27
+++ XMLCatalog.java 17 Jul 2003 15:44:43 -0000 1.28
@@ -927,23 +927,19 @@
try {
setXMLCatalog =
resolverImplClass.getMethod("setXMLCatalog",
- new Class[]
- {XMLCatalog.class});
+ new Class[]
{XMLCatalog.class});
parseCatalog =
resolverImplClass.getMethod("parseCatalog",
- new Class[]
- {String.class});
+ new Class[] {String.class});
resolveEntity =
resolverImplClass.getMethod("resolveEntity",
- new Class[]
- {String.class, String.class});
+ new Class[] {String.class,
String.class});
resolve =
resolverImplClass.getMethod("resolve",
- new Class[]
- {String.class, String.class});
+ new Class[] {String.class,
String.class});
} catch (NoSuchMethodException ex) {
throw new BuildException(ex);
}
@@ -977,8 +973,7 @@
try {
result =
(InputSource) resolveEntity.invoke(resolverImpl,
- new Object[]
- {publicId, systemId});
+ new Object[]
{publicId, systemId});
} catch (Exception ex) {
throw new BuildException(ex);
}
@@ -995,8 +990,7 @@
try {
result =
(InputSource) resolveEntity.invoke(resolverImpl,
- new Object[]
- {publicId, systemId});
+ new Object[]
{publicId, systemId});
} catch (Exception ex) {
throw new BuildException(ex);
}
@@ -1059,8 +1053,7 @@
try {
result =
(SAXSource) resolve.invoke(resolverImpl,
- new Object[]
- {href, base});
+ new Object[] {href,
base});
} catch (Exception ex) {
throw new BuildException(ex);
}
@@ -1077,8 +1070,7 @@
try {
result =
(SAXSource) resolve.invoke(resolverImpl,
- new Object[]
- {href, base});
+ new Object[] {href, base});
} catch (Exception ex) {
throw new BuildException(ex);
}
@@ -1099,8 +1091,7 @@
try {
setXMLCatalog.invoke(resolverImpl,
- new Object[]
- {XMLCatalog.this});
+ new Object[] {XMLCatalog.this});
} catch (Exception ex) {
throw new BuildException(ex);
}
@@ -1117,8 +1108,7 @@
log("Parsing " + catFile, Project.MSG_DEBUG);
try {
parseCatalog.invoke(resolverImpl,
- new Object[]
- {catFile.getPath()});
+ new Object[] {catFile.getPath()});
} catch (Exception ex) {
throw new BuildException(ex);
}
1.6 +11 -23
ant/src/main/org/apache/tools/ant/types/optional/image/Draw.java
Index: Draw.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/Draw.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- Draw.java 22 Apr 2003 07:35:17 -0000 1.5
+++ Draw.java 17 Jul 2003 15:44:44 -0000 1.6
@@ -62,58 +62,46 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Z Grey</a>
* @see org.apache.tools.ant.tasks.optional.image.Image
*/
-public class Draw extends TransformOperation
-{
+public class Draw extends TransformOperation {
protected int xloc = 0;
protected int yloc = 0;
- public void setXloc(int x)
- {
+ public void setXloc(int x) {
xloc = x;
}
- public void setYloc(int y)
- {
+ public void setYloc(int y) {
yloc = y;
}
- public void addRectangle(Rectangle rect)
- {
+ public void addRectangle(Rectangle rect) {
instructions.add(rect);
}
- public void addText(Text text)
- {
+ public void addText(Text text) {
instructions.add(text);
}
- public void addEllipse(Ellipse elip)
- {
+ public void addEllipse(Ellipse elip) {
instructions.add(elip);
}
- public void addArc(Arc arc)
- {
+ public void addArc(Arc arc) {
instructions.add(arc);
}
- public PlanarImage executeTransformOperation(PlanarImage image)
- {
+ public PlanarImage executeTransformOperation(PlanarImage image) {
BufferedImage bi = image.getAsBufferedImage();
Graphics2D graphics = (Graphics2D)bi.getGraphics();
- for (int i=0; i<instructions.size(); i++)
- {
+ for (int i=0; i<instructions.size(); i++) {
ImageOperation instr =
((ImageOperation)instructions.elementAt(i));
- if (instr instanceof DrawOperation)
- {
+ if (instr instanceof DrawOperation) {
PlanarImage op =
((DrawOperation)instr).executeDrawOperation();
log("\tDrawing to x=" + xloc + " y=" + yloc);
graphics.drawImage(op.getAsBufferedImage(),null,xloc,yloc);
- }
- else if (instr instanceof TransformOperation)
- {
+ } else if (instr instanceof TransformOperation) {
PlanarImage op =
((TransformOperation)instr).executeTransformOperation(null);
BufferedImage child = op.getAsBufferedImage();
log("\tDrawing to x=" + xloc + " y=" + yloc);
1.5 +6 -12
ant/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java
Index: ImageOperation.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- ImageOperation.java 22 Apr 2003 07:35:17 -0000 1.4
+++ ImageOperation.java 17 Jul 2003 15:44:44 -0000 1.5
@@ -61,32 +61,26 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Z Grey</a>
* @see org.apache.tools.ant.tasks.optional.image.Image
*/
-public abstract class ImageOperation extends DataType
-{
+public abstract class ImageOperation extends DataType {
protected Vector instructions = new Vector();
- public void addRotate(Rotate instr)
- {
+ public void addRotate(Rotate instr) {
instructions.add(instr);
}
- public void addDraw(Draw instr)
- {
+ public void addDraw(Draw instr) {
instructions.add(instr);
}
- public void addRectangle(Rectangle instr)
- {
+ public void addRectangle(Rectangle instr) {
instructions.add(instr);
}
- public void addText(Text instr)
- {
+ public void addText(Text instr) {
instructions.add(instr);
}
- public void addScale(Scale instr)
- {
+ public void addScale(Scale instr) {
instructions.add(instr);
}
}
1.5 +10 -21
ant/src/main/org/apache/tools/ant/types/optional/image/Rotate.java
Index: Rotate.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/Rotate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- Rotate.java 22 Apr 2003 07:35:17 -0000 1.4
+++ Rotate.java 17 Jul 2003 15:44:44 -0000 1.5
@@ -66,22 +66,19 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Z Grey</a>
* @see org.apache.tools.ant.tasks.optional.image.Image
*/
-public class Rotate extends TransformOperation implements DrawOperation
-{
+public class Rotate extends TransformOperation implements DrawOperation {
protected float angle = 0.0F;
/**
* Sets the angle of rotation in degrees.
* @param ang The angle at which to rotate the image
*/
- public void setAngle(String ang)
- {
+ public void setAngle(String ang) {
angle = Float.parseFloat(ang);
}
- public PlanarImage performRotate(PlanarImage image)
- {
+ public PlanarImage performRotate(PlanarImage image) {
float t_angle = (float) (angle * (Math.PI / 180.0F));
ParameterBlock pb = new ParameterBlock();
pb.addSource(image);
@@ -97,24 +94,19 @@
* Performs the image rotation when being handled as a
TransformOperation.
* @param image The image to perform the transformation on.
*/
- public PlanarImage executeTransformOperation(PlanarImage image)
- {
+ public PlanarImage executeTransformOperation(PlanarImage image) {
BufferedImage bi = null;
Graphics2D graphics = null;
- for (int i = 0; i < instructions.size(); i++)
- {
+ for (int i = 0; i < instructions.size(); i++) {
ImageOperation instr = ((ImageOperation)
instructions.elementAt(i));
- if (instr instanceof DrawOperation)
- {
+ if (instr instanceof DrawOperation) {
// If this TransformOperation has DrawOperation children
// then Rotate the first child and return.
System.out.println("Execing Draws");
PlanarImage op = ((DrawOperation)
instr).executeDrawOperation();
image = performRotate(op);
return image;
- }
- else if (instr instanceof TransformOperation)
- {
+ } else if (instr instanceof TransformOperation) {
bi = image.getAsBufferedImage();
graphics = (Graphics2D) bi.getGraphics();
System.out.println("Execing Transforms");
@@ -135,13 +127,10 @@
* ONE image.
* @param image The image to perform the transformation on.
*/
- public PlanarImage executeDrawOperation()
- {
- for (int i = 0; i < instructions.size(); i++)
- {
+ public PlanarImage executeDrawOperation() {
+ for (int i = 0; i < instructions.size(); i++) {
ImageOperation instr = ((ImageOperation)
instructions.elementAt(i));
- if (instr instanceof DrawOperation)
- {
+ if (instr instanceof DrawOperation) {
// If this TransformOperation has DrawOperation children
// then Rotate the first child and return.
PlanarImage op = ((DrawOperation)
instr).executeDrawOperation();
1.4 +2 -4
ant/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java
Index: TransformOperation.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- TransformOperation.java 18 Apr 2003 23:40:29 -0000 1.3
+++ TransformOperation.java 17 Jul 2003 15:44:44 -0000 1.4
@@ -59,12 +59,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Z Grey</a>
* @see org.apache.tools.ant.tasks.optional.image.Image
*/
-public abstract class TransformOperation extends ImageOperation
-{
+public abstract class TransformOperation extends ImageOperation {
public abstract PlanarImage executeTransformOperation(PlanarImage img);
- public void addRectangle(Rectangle instr)
- {
+ public void addRectangle(Rectangle instr) {
instructions.add(instr);
}
1.8 +7 -9
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.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
--- ApacheCatalog.java 22 Apr 2003 07:35:17 -0000 1.7
+++ ApacheCatalog.java 17 Jul 2003 15:44:44 -0000 1.8
@@ -131,8 +131,7 @@
if (resolver == null) {
catalogManager.debug
.message(1, "Internal Error: null
ApacheCatalogResolver");
- }
- else {
+ } else {
resolver.addPublicEntry(publicid, systemid, base);
}
@@ -144,8 +143,7 @@
if (resolver == null) {
catalogManager.debug
.message(1, "Internal Error: null
ApacheCatalogResolver");
- }
- else {
+ } else {
resolver.addURIEntry(uri, altURI, base);
}
1.9 +14 -15
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.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- ApacheCatalogResolver.java 22 Apr 2003 07:35:17 -0000 1.8
+++ ApacheCatalogResolver.java 17 Jul 2003 15:44:44 -0000 1.9
@@ -103,8 +103,7 @@
/** The XMLCatalog object to callback. */
private XMLCatalog xmlCatalog = null;
- static
- {
+ static {
//
// If you don't do this, you get all sorts of annoying
// warnings about a missing properties file. However, it
1.4 +1 -1
ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java
Index: ClasspathUtils.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.8 +5 -5
ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/CollectionUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.9 +5 -7 ant/src/main/org/apache/tools/ant/util/DateUtils.java
Index: DateUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/DateUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- DateUtils.java 7 Mar 2003 11:23:08 -0000 1.8
+++ DateUtils.java 17 Jul 2003 15:44:44 -0000 1.9
@@ -108,11 +108,9 @@
private static final double[] LIMITS = {0, 1, 2};
- private static final String[] MINUTES_PART =
- {"", "1 minute ", "{0,number} minutes "};
+ private static final String[] MINUTES_PART = {"", "1 minute ",
"{0,number} minutes "};
- private static final String[] SECONDS_PART =
- {"0 seconds", "1 second", "{1,number} seconds"};
+ private static final String[] SECONDS_PART = {"0 seconds", "1 second",
"{1,number} seconds"};
private static final ChoiceFormat MINUTES_FORMAT =
new ChoiceFormat(LIMITS, MINUTES_PART);
1.8 +1 -1 ant/src/main/org/apache/tools/ant/util/JAXPUtils.java
Index: JAXPUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/JAXPUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
1.14 +1 -1 ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
Index: JavaEnvUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
1.4 +1 -1
ant/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
Index: KeepAliveOutputStream.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
1.5 +4 -4 ant/src/main/org/apache/tools/ant/util/LazyHashtable.java
Index: LazyHashtable.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/LazyHashtable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
1.7 +5 -5 ant/src/main/org/apache/tools/ant/util/StringUtils.java
Index: StringUtils.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/StringUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
1.4 +8 -15 ant/src/main/org/apache/tools/ant/util/TaskLogger.java
Index: TaskLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/TaskLogger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- TaskLogger.java 10 Feb 2003 14:14:38 -0000 1.3
+++ TaskLogger.java 17 Jul 2003 15:44:44 -0000 1.4
@@ -62,40 +62,33 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @version $Revision$ $Date$
*/
-public final class TaskLogger
-{
+public final class TaskLogger {
/**
* Task to use to do logging.
*/
private Task m_task;
- public TaskLogger( final Task task )
- {
+ public TaskLogger( final Task task) {
this.m_task = task;
}
- public void info( final String message )
- {
+ public void info( final String message) {
m_task.log( message, Project.MSG_INFO );
}
- public void error( final String message )
- {
+ public void error( final String message) {
m_task.log( message, Project.MSG_ERR );
}
- public void warning( final String message )
- {
+ public void warning( final String message) {
m_task.log( message, Project.MSG_WARN );
}
- public void verbose( final String message )
- {
+ public void verbose( final String message) {
m_task.log( message, Project.MSG_VERBOSE );
}
- public void debug( final String message )
- {
+ public void debug( final String message) {
m_task.log( message, Project.MSG_DEBUG );
}
}
1.10 +1 -1
ant/src/main/org/apache/tools/ant/util/WeakishReference.java
Index: WeakishReference.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/WeakishReference.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
1.8 +7 -10
ant/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
Index: DependencyVisitor.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -u -r1.7 -r1.8
--- DependencyVisitor.java 15 Apr 2003 06:03:08 -0000 1.7
+++ DependencyVisitor.java 17 Jul 2003 15:44:45 -0000 1.8
@@ -133,8 +133,7 @@
if (index2 != -1) {
// class name has more than 1 package level
'com.company.Class'
start = classname.charAt(index2 + 1);
- }
- else {
+ } else {
// class name has only 1 package level 'package.Class'
start = classname.charAt(0);
}
@@ -145,13 +144,11 @@
classname = classname.substring(0, index) + "$" +
classname.substring(index + 1);
addClass(classname);
- }
- else {
+ } else {
// Add the class in dotted notation 'com.company.Class'
addClass(classname);
}
- }
- else {
+ } else {
// Add a class with no package 'Class'
addClass(classname);
}
1.15 +1 -1 ant/src/main/org/apache/tools/mail/MailMessage.java
Index: MailMessage.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/mail/MailMessage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
