From 0df2b1de3f150d160957e8baccd0b79374c023af Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Wed, 26 Apr 2006 20:55:31 +0000 Subject: [PATCH] Minor updates based on the input of Dave Brosius pr: 39320 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@397298 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/UnknownElement.java | 4 ++-- .../apache/tools/ant/filters/BaseFilterReader.java | 4 ++-- .../org/apache/tools/ant/filters/FixCrLfFilter.java | 8 ++++++++ src/main/org/apache/tools/ant/taskdefs/Copy.java | 2 +- .../apache/tools/ant/taskdefs/DefaultExcludes.java | 10 +++++++--- src/main/org/apache/tools/ant/taskdefs/Exit.java | 4 ++-- .../apache/tools/ant/taskdefs/MacroInstance.java | 4 +++- src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 6 ++++-- .../org/apache/tools/ant/taskdefs/UpToDate.java | 6 +++--- .../org/apache/tools/ant/taskdefs/VerifyJar.java | 6 +++--- src/main/org/apache/tools/ant/taskdefs/Zip.java | 2 +- .../taskdefs/compilers/DefaultCompilerAdapter.java | 4 +++- .../apache/tools/ant/taskdefs/optional/Javah.java | 6 ++++-- .../tools/ant/taskdefs/optional/TraXLiaison.java | 13 +++++++++---- .../ant/taskdefs/optional/dotnet/DotnetCompile.java | 5 ++--- .../optional/ejb/GenericDeploymentTool.java | 4 ++-- .../optional/extension/JarLibManifestTask.java | 3 ++- .../jsp/compilers/DefaultJspCompilerAdapter.java | 6 ++++-- .../ant/taskdefs/optional/junit/JUnitTask.java | 2 +- .../tools/ant/taskdefs/optional/vss/MSVSS.java | 7 ++----- .../tools/ant/taskdefs/rmic/DefaultRmicAdapter.java | 5 +++-- .../org/apache/tools/ant/types/resources/Sort.java | 6 +++--- 23 files changed, 73 insertions(+), 46 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index b07033ccc..e21d91d72 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -212,6 +212,8 @@ Fixed bugs: Other changes: -------------- +* took in bugzilla report 39320. + * Improve compatibility with GNU Classpath and java versions prior to 1.5. Bugzilla 39027. * ${ant.core.lib} may now be used to refer to the library containing the diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index d5b680d8c..bbcd818fb 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 The Apache Software Foundation + * Copyright 2000-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -608,6 +608,6 @@ public class UnknownElement extends Task { } private static boolean equalsString(String a, String b) { - return (a == null) ? (a == b) : a.equals(b); + return (a == null) ? (b == null) : a.equals(b); } } diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java index 742701aa0..237a88c2e 100644 --- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java +++ b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002,2004-2005 The Apache Software Foundation + * Copyright 2002,2004-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ public abstract class BaseFilterReader extends FilterReader { * this placeholder instance to create a chain of real filters. */ public BaseFilterReader() { - super(new StringReader(new String())); + super(new StringReader("")); FileUtils.close(this); } diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java index 9715873c2..6c403de25 100755 --- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java +++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java @@ -857,6 +857,10 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina && getIndex() == ((AddAsisRemove) other).getIndex(); } + public int hashCode() { + return getIndex(); + } + AddAsisRemove resolve() throws IllegalStateException { if (this.equals(ASIS)) { return ASIS; @@ -911,6 +915,10 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina return other instanceof CrLf && getIndex() == ((CrLf) other).getIndex(); } + public int hashCode() { + return getIndex(); + } + CrLf resolve() { if (this.equals(ASIS)) { return ASIS; diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index bdfc2d8da..35850a101 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -539,7 +539,7 @@ public class Copy extends Task { if (nonFileResources.size() > 0) { Resource[] nonFiles = - (Resource[]) nonFileResources.toArray(new Resource[0]); + (Resource[]) nonFileResources.toArray(new Resource[nonFileResources.size()]); // restrict to out-of-date resources Map map = scan(nonFiles, destDir); try { diff --git a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java index cd7c58bfb..0cbe72b56 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java +++ b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2004 The Apache Software Foundation + * Copyright 2003-2004,2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.util.StringUtils; /** * Alters the default excludes for the entire build.. @@ -60,10 +61,13 @@ public class DefaultExcludes extends Task { } if (echo) { StringBuffer message - = new StringBuffer("Current Default Excludes:\n"); + = new StringBuffer("Current Default Excludes:"); + message.append(StringUtils.LINE_SEP); String[] excludes = DirectoryScanner.getDefaultExcludes(); for (int i = 0; i < excludes.length; i++) { - message.append(" " + excludes[i] + "\n"); + message.append(" "); + message.append(excludes[i]); + message.append(StringUtils.LINE_SEP); } log(message.toString(), logLevel); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 7d367846e..e9202ea11 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 The Apache Software Foundation + * Copyright 2000-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ import org.apache.tools.ant.taskdefs.condition.ConditionBase; */ public class Exit extends Task { - private class NestedCondition extends ConditionBase implements Condition { + private static class NestedCondition extends ConditionBase implements Condition { public boolean eval() { if (countConditions() != 1) { throw new BuildException( diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index 5bfac3d5c..d24ab6c5c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -200,7 +200,9 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain String name = macroName.toString().toLowerCase(Locale.US); String value = (String) macroMapping.get(name); if (value == null) { - ret.append("@{" + name + "}"); + ret.append("@{"); + ret.append(name); + ret.append("}"); } else { ret.append(value); } diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 5022b6282..c07565255 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -508,9 +508,11 @@ public class SQLExec extends JDBCTask { } if (!keepformat) { - sql.append(" " + line); + sql.append(" "); + sql.append(line); } else { - sql.append("\n" + line); + sql.append("\n"); + sql.append(line); } // SQL defines "--" as a comment to EOL diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 0699ae61d..741764aaa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 The Apache Software Foundation + * Copyright 2000-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -207,8 +207,8 @@ public class UpToDate extends Task implements Condition { if (upToDate) { Resource[] r = sourceResources.listResources(); upToDate = upToDate && - (ResourceUtils.selectOutOfDateSources(this, r, getMapper(), - getProject()).length + (ResourceUtils.selectOutOfDateResources(this, r, getMapper(), + getProject(), null).length == 0); } diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java index 9a86fbe99..61c100342 100644 --- a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 The Apache Software Foundation + * Copyright 2000-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -150,7 +150,7 @@ public class VerifyJar extends AbstractJarSignerTask { /** * we are not thread safe here. Do not use on multiple threads at the same time. */ - private class BufferingOutputFilter implements ChainableReader { + private static class BufferingOutputFilter implements ChainableReader { private BufferingOutputFilterReader buffer; @@ -173,7 +173,7 @@ public class VerifyJar extends AbstractJarSignerTask { /** * catch the output of the buffer */ - private class BufferingOutputFilterReader extends Reader { + private static class BufferingOutputFilterReader extends Reader { private Reader next; diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index b3a91a8b7..9d3386cc2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -415,7 +415,7 @@ public class Zip extends MatchingTask { */ public void executeMain() throws BuildException { - if (baseDir == null & resources.size() == 0 + if (baseDir == null && resources.size() == 0 && groupfilesets.size() == 0 && "zip".equals(archiveType)) { throw new BuildException("basedir attribute must be set, " + "or at least one " diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 7a1a28f65..7e806b9dd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -408,7 +408,9 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { for (int i = 0; i < compileList.length; i++) { String arg = compileList[i].getAbsolutePath(); cmd.createArgument().setValue(arg); - niceSourceList.append(" " + arg + StringUtils.LINE_SEP); + niceSourceList.append(" "); + niceSourceList.append(arg); + niceSourceList.append(StringUtils.LINE_SEP); } attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index 279805063..5ad62fa5c 100755 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 The Apache Software Foundation + * Copyright 2000-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -442,7 +442,9 @@ public class Javah extends Task { String[] c = getClasses(); for (int i = 0; i < c.length; i++) { cmd.createArgument().setValue(c[i]); - niceClassList.append(" " + c[i] + lSep); + niceClassList.append(" "); + niceClassList.append(c[i]); + niceClassList.append(lSep); } StringBuffer prefix = new StringBuffer("Class"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index cf816da93..60bf170e7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -412,17 +412,22 @@ public class TraXLiaison implements XSLTLiaison2, ErrorListener, XSLTLoggerAware } int line = locator.getLineNumber(); if (line != -1) { - msg.append(":" + line); + msg.append(":"); + msg.append(line); int column = locator.getColumnNumber(); if (column != -1) { - msg.append(":" + column); + msg.append(":"); + msg.append(column); } } } - msg.append(": " + type + "! "); + msg.append(": "); + msg.append(type); + msg.append("! "); msg.append(e.getMessage()); if (e.getCause() != null) { - msg.append(" Cause: " + e.getCause()); + msg.append(" Cause: "); + msg.append(e.getCause()); } logger.log(msg.toString()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index c63520326..367ea06e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -266,10 +266,9 @@ public abstract class DotnetCompile //iterate through the ref list & generate an entry for each //or just rely on the fact that the toString operator does this, but //noting that the separator is ';' on windows, ':' on unix - String refpath = references.toString(); //bail on no references listed - if (refpath.length() == 0) { + if (references.length() == 0) { return null; } @@ -277,7 +276,7 @@ public abstract class DotnetCompile if (isWindows) { s.append('\"'); } - s.append(refpath); + s.append(references); if (isWindows) { s.append('\"'); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 0eaaf04e0..5071411e2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 The Apache Software Foundation + * Copyright 2000-2004,2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -450,7 +450,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool { } catch (SAXException se) { String msg = "SAXException while parsing '" - + descriptorFileName.toString() + + descriptorFileName + "'. This probably indicates badly-formed XML." + " Details: " + se.getMessage(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java index e3ca1f3b3..58ac6d062 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java @@ -279,7 +279,8 @@ public final class JarLibManifestTask extends Task { final int size) { final StringBuffer sb = new StringBuffer(); for (int i = 0; i < size; i++) { - sb.append(listPrefix + i); + sb.append(listPrefix); + sb.append(i); sb.append(' '); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java index ab8c06a2b..07487008b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,9 @@ public abstract class DefaultJspCompilerAdapter while (e.hasMoreElements()) { String arg = (String) e.nextElement(); cmd.createArgument().setValue(arg); - niceSourceList.append(" " + arg + lSep); + niceSourceList.append(" "); + niceSourceList.append(arg); + niceSourceList.append(lSep); } jspc.log(niceSourceList.toString(), Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index ac3a895e5..c31926834 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1449,7 +1449,7 @@ public class JUnitTask extends Task { * Forked test support * @since Ant 1.6.2 */ - private final class ForkedTestConfiguration { + private final static class ForkedTestConfiguration { private boolean filterTrace; private boolean haltOnError; private boolean haltOnFailure; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 613d81c22..2d2709520 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -606,9 +606,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants { env = new String[0]; } String[] newEnv = new String[env.length + 1]; - for (int i = 0; i < env.length; i++) { - newEnv[i] = env[i]; - } + System.arraycopy(env, 0, newEnv, 0, env.length); newEnv[env.length] = "SSDIR=" + serverPath; exe.setEnvironment(newEnv); @@ -635,9 +633,8 @@ public abstract class MSVSS extends Task implements MSVSSConstants { * @throws ParseException */ private String calcDate(String startDate, int daysToAdd) throws ParseException { - Date currentDate = new Date(); Calendar calendar = new GregorianCalendar(); - currentDate = dateFormat.parse(startDate); + Date currentDate = dateFormat.parse(startDate); calendar.setTime(currentDate); calendar.add(Calendar.DATE, daysToAdd); return dateFormat.format(calendar.getTime()); diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 22b48a42d..c06d591e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -263,7 +263,8 @@ public abstract class DefaultRmicAdapter implements RmicAdapter { for (int i = 0; i < cListSize; i++) { String arg = (String) compileList.elementAt(i); cmd.createArgument().setValue(arg); - niceSourceList.append(" " + arg); + niceSourceList.append(" "); + niceSourceList.append(arg); } attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/types/resources/Sort.java b/src/main/org/apache/tools/ant/types/resources/Sort.java index 53faadd8b..e51e7adde 100755 --- a/src/main/org/apache/tools/ant/types/resources/Sort.java +++ b/src/main/org/apache/tools/ant/types/resources/Sort.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 The Apache Software Foundation + * Copyright 2005-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.apache.tools.ant.types.resources.comparators.ResourceComparator; */ public class Sort extends BaseResourceCollectionWrapper { - private class MultiComparator implements Comparator { + private static class MultiComparator implements Comparator { private Vector v = null; synchronized void add(ResourceComparator c) { if (c == null) { @@ -62,7 +62,7 @@ public class Sort extends BaseResourceCollectionWrapper { } //sorted bag impl. borrowed from commons-collections TreeBag: - private class SortedBag extends AbstractCollection { + private static class SortedBag extends AbstractCollection { private class MutableInt { int value = 0; }