Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java Wed Aug 22 12:32:43 2012 @@ -20,7 +20,6 @@ package org.apache.tools.ant.types.selec import java.io.File; import java.util.Enumeration; -import java.util.Iterator; import java.util.Stack; import java.util.Vector; @@ -37,7 +36,7 @@ import org.apache.tools.ant.types.select public abstract class BaseSelectorContainer extends BaseSelector implements SelectorContainer { - private Vector selectorsList = new Vector(); + private Vector<FileSelector> selectorsList = new Vector<FileSelector>(); /** * Default constructor. @@ -79,7 +78,7 @@ public abstract class BaseSelectorContai * Returns an enumerator for accessing the set of selectors. * @return an enumerator for the selectors */ - public Enumeration selectorElements() { + public Enumeration<FileSelector> selectorElements() { dieOnCircularReference(); return selectorsList.elements(); } @@ -93,17 +92,14 @@ public abstract class BaseSelectorContai */ public String toString() { dieOnCircularReference(); - StringBuffer buf = new StringBuffer(); - Enumeration e = selectorElements(); - if (e.hasMoreElements()) { - while (e.hasMoreElements()) { - buf.append(e.nextElement().toString()); - if (e.hasMoreElements()) { - buf.append(", "); - } + StringBuilder buf = new StringBuilder(); + Enumeration<FileSelector> e = selectorElements(); + while (e.hasMoreElements()) { + buf.append(e.nextElement().toString()); + if (e.hasMoreElements()) { + buf.append(", "); } } - return buf.toString(); } @@ -140,7 +136,7 @@ public abstract class BaseSelectorContai if (errmsg != null) { throw new BuildException(errmsg); } - Enumeration e = selectorElements(); + Enumeration<FileSelector> e = selectorElements(); while (e.hasMoreElements()) { Object o = e.nextElement(); if (o instanceof BaseSelector) { @@ -328,7 +324,7 @@ public abstract class BaseSelectorContai appendSelector(selector); } - protected synchronized void dieOnCircularReference(Stack stk, Project p) + protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p) throws BuildException { if (isChecked()) { return; @@ -336,10 +332,9 @@ public abstract class BaseSelectorContai if (isReference()) { super.dieOnCircularReference(stk, p); } else { - for (Iterator i = selectorsList.iterator(); i.hasNext();) { - Object o = i.next(); - if (o instanceof DataType) { - pushAndInvokeCircularReferenceCheck((DataType) o, stk, p); + for (FileSelector fileSelector : selectorsList) { + if (fileSelector instanceof DataType) { + pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p); } } setChecked(true);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java Wed Aug 22 12:32:43 2012 @@ -66,7 +66,7 @@ public class ContainsRegexpSelector exte * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer( + StringBuilder buf = new StringBuilder( "{containsregexpselector expression: "); buf.append(userProvidedExpression); buf.append("}"); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java Wed Aug 22 12:32:43 2012 @@ -63,7 +63,7 @@ public class ContainsSelector extends Ba * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{containsselector text: "); + StringBuilder buf = new StringBuilder("{containsselector text: "); buf.append('"').append(contains).append('"'); buf.append(" casesensitive: "); buf.append(casesensitive ? "true" : "false"); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DateSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DateSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DateSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DateSelector.java Wed Aug 22 12:32:43 2012 @@ -71,7 +71,7 @@ public class DateSelector extends BaseEx * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{dateselector date: "); + StringBuilder buf = new StringBuilder("{dateselector date: "); buf.append(dateTime); buf.append(" compare: ").append(when.getValue()); buf.append(" granularity: "); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DependSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DependSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DependSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DependSelector.java Wed Aug 22 12:32:43 2012 @@ -42,7 +42,7 @@ public class DependSelector extends Mapp * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{dependselector targetdir: "); + StringBuilder buf = new StringBuilder("{dependselector targetdir: "); if (targetdir == null) { buf.append("NOT YET SET"); } else { Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java Wed Aug 22 12:32:43 2012 @@ -57,7 +57,7 @@ public class DepthSelector extends BaseE * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{depthselector min: "); + StringBuilder buf = new StringBuilder("{depthselector min: "); buf.append(min); buf.append(" max: "); buf.append(max); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java Wed Aug 22 12:32:43 2012 @@ -37,7 +37,7 @@ public class ExtendSelector extends Base private String classname = null; private FileSelector dynselector = null; - private Vector paramVec = new Vector(); + private Vector<Parameter> paramVec = new Vector<Parameter>(); private Path classpath = null; /** @@ -61,7 +61,7 @@ public class ExtendSelector extends Base public void selectorCreate() { if (classname != null && classname.length() > 0) { try { - Class c = null; + Class<?> c = null; if (classpath == null) { c = Class.forName(classname); } else { @@ -70,7 +70,7 @@ public class ExtendSelector extends Base = getProject().createClassLoader(classpath); c = Class.forName(classname, true, al); } - dynselector = (FileSelector) c.newInstance(); + dynselector = c.asSubclass(FileSelector.class).newInstance(); final Project p = getProject(); if (p != null) { p.setProjectReference(dynselector); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java Wed Aug 22 12:32:43 2012 @@ -62,7 +62,7 @@ public class FilenameSelector extends Ba * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{filenameselector name: "); + StringBuilder buf = new StringBuilder("{filenameselector name: "); if (pattern != null) { buf.append(pattern); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java Wed Aug 22 12:32:43 2012 @@ -46,7 +46,7 @@ public class MajoritySelector extends Ba * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (hasSelectors()) { buf.append("{majorityselect: "); buf.append(super.toString()); @@ -81,16 +81,14 @@ public class MajoritySelector extends Ba validate(); int yesvotes = 0; int novotes = 0; - Enumeration e = selectorElements(); - boolean result; + Enumeration<FileSelector> e = selectorElements(); while (e.hasMoreElements()) { - result = ((FileSelector) e.nextElement()).isSelected(basedir, - filename, file); - if (result) { - yesvotes = yesvotes + 1; + if (e.nextElement().isSelected(basedir, + filename, file)) { + yesvotes++; } else { - novotes = novotes + 1; + novotes++; } } if (yesvotes > novotes) { Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java Wed Aug 22 12:32:43 2012 @@ -40,7 +40,7 @@ public class NoneSelector extends BaseSe * @return a string representation of the selector */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (hasSelectors()) { buf.append("{noneselect: "); buf.append(super.toString()); @@ -61,13 +61,10 @@ public class NoneSelector extends BaseSe */ public boolean isSelected(File basedir, String filename, File file) { validate(); - Enumeration e = selectorElements(); - boolean result; + Enumeration<FileSelector> e = selectorElements(); while (e.hasMoreElements()) { - result = ((FileSelector) e.nextElement()).isSelected(basedir, - filename, file); - if (result) { + if (e.nextElement().isSelected(basedir, filename, file)) { return false; } } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NotSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NotSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NotSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/NotSelector.java Wed Aug 22 12:32:43 2012 @@ -49,7 +49,7 @@ public class NotSelector extends NoneSel * @return a string representation of the selector */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (hasSelectors()) { buf.append("{notselect: "); buf.append(super.toString()); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/OrSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/OrSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/OrSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/OrSelector.java Wed Aug 22 12:32:43 2012 @@ -39,7 +39,7 @@ public class OrSelector extends BaseSele * @return a string representation of the selector */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (hasSelectors()) { buf.append("{orselect: "); buf.append(super.toString()); @@ -60,14 +60,11 @@ public class OrSelector extends BaseSele */ public boolean isSelected(File basedir, String filename, File file) { validate(); - Enumeration e = selectorElements(); - boolean result; + Enumeration<FileSelector> e = selectorElements(); // First, check that all elements are correctly configured while (e.hasMoreElements()) { - result = ((FileSelector) e.nextElement()).isSelected(basedir, - filename, file); - if (result) { + if (e.nextElement().isSelected(basedir, filename, file)) { return true; } } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java Wed Aug 22 12:32:43 2012 @@ -52,7 +52,7 @@ public class PresentSelector extends Bas * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{presentselector targetdir: "); + StringBuilder buf = new StringBuilder("{presentselector targetdir: "); if (targetdir == null) { buf.append("NOT YET SET"); } else { @@ -108,7 +108,7 @@ public class PresentSelector extends Bas } this.map = fileNameMapper; } - + /** * This sets whether to select a file if its dest file is present. * It could be a <code>negate</code> boolean, but by doing things Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java Wed Aug 22 12:32:43 2012 @@ -114,7 +114,7 @@ public class SelectSelector extends Base * Returns an enumerator for accessing the set of selectors. * @return an enumerator that goes through each of the selectors */ - public Enumeration selectorElements() { + public Enumeration<FileSelector> selectorElements() { if (isReference()) { return getRef().selectorElements(); } @@ -220,11 +220,11 @@ public class SelectSelector extends Base return false; } - Enumeration e = selectorElements(); - if (!(e.hasMoreElements())) { + Enumeration<FileSelector> e = selectorElements(); + if (!e.hasMoreElements()) { return true; } - FileSelector f = (FileSelector) e.nextElement(); + FileSelector f = e.nextElement(); return f.isSelected(basedir, filename, file); } } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java Wed Aug 22 12:32:43 2012 @@ -55,7 +55,7 @@ public interface SelectorContainer { * * @return an enumerator that goes through each of the selectors */ - Enumeration selectorElements(); + Enumeration<FileSelector> selectorElements(); /** * Add a new selector into this container. Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java Wed Aug 22 12:32:43 2012 @@ -172,11 +172,11 @@ public final class SelectorUtils { /** * Tests whether or not a given path matches a given pattern. * - * If you need to call this method multiple times with the same + * If you need to call this method multiple times with the same * pattern you should rather use TokenizedPath * * @see TokenizedPath - * + * * @param pattern The pattern to match against. Must not be * <code>null</code>. * @param str The path to match, as a String. Must not be @@ -192,12 +192,12 @@ public final class SelectorUtils { /** * Tests whether or not a given path matches a given pattern. - * - * If you need to call this method multiple times with the same + * + * If you need to call this method multiple times with the same * pattern you should rather use TokenizedPattern * * @see TokenizedPattern - * + * * @param pattern The pattern to match against. Must not be * <code>null</code>. * @param str The path to match, as a String. Must not be @@ -509,7 +509,7 @@ public final class SelectorUtils { * * @return a Vector of path elements from the tokenized path */ - public static Vector tokenizePath (String path) { + public static Vector<String> tokenizePath(String path) { return tokenizePath(path, File.separator); } @@ -522,8 +522,8 @@ public final class SelectorUtils { * @return a Vector of path elements from the tokenized path * @since Ant 1.6 */ - public static Vector tokenizePath (String path, String separator) { - Vector ret = new Vector(); + public static Vector<String> tokenizePath(String path, String separator) { + Vector<String> ret = new Vector<String>(); if (FileUtils.isAbsolutePath(path)) { String[] s = FILE_UTILS.dissect(path); ret.add(s[0]); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java Wed Aug 22 12:32:43 2012 @@ -75,7 +75,7 @@ public class SizeSelector extends BaseEx * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{sizeselector value: "); + StringBuilder buf = new StringBuilder("{sizeselector value: "); buf.append(sizelimit); buf.append("compare: ").append(when.getValue()); buf.append("}"); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java Wed Aug 22 12:32:43 2012 @@ -41,14 +41,14 @@ public class TokenizedPattern { private final String tokenizedPattern[]; /** - * Initialize the PathPattern by parsing it. + * Initialize the PathPattern by parsing it. * @param pattern The pattern to match against. Must not be * <code>null</code>. */ public TokenizedPattern(String pattern) { this(pattern, SelectorUtils.tokenizePathAsArray(pattern)); } - + TokenizedPattern(String pattern, String[] tokens) { this.pattern = pattern; this.tokenizedPattern = tokens; @@ -69,7 +69,7 @@ public class TokenizedPattern { return SelectorUtils.matchPath(tokenizedPattern, path.getTokens(), isCaseSensitive); } - + /** * Tests whether or not this pattern matches the start of * a path. @@ -86,7 +86,7 @@ public class TokenizedPattern { public String toString() { return pattern; } - + public String getPattern() { return pattern; } @@ -128,7 +128,7 @@ public class TokenizedPattern { * @return the leftmost part of the pattern without wildcards */ public TokenizedPath rtrimWildcardTokens() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int newLen = 0; for (; newLen < tokenizedPattern.length; newLen++) { if (SelectorUtils.hasWildcards(tokenizedPattern[newLen])) { @@ -173,5 +173,5 @@ public class TokenizedPattern { return new TokenizedPattern(pattern.substring(0, index), tokens); } } - + } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java Wed Aug 22 12:32:43 2012 @@ -46,7 +46,7 @@ public class TypeSelector extends BaseEx * @return a string describing this object */ public String toString() { - StringBuffer buf = new StringBuffer("{typeselector type: "); + StringBuilder buf = new StringBuilder("{typeselector type: "); buf.append(type); buf.append("}"); return buf.toString(); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java Wed Aug 22 12:32:43 2012 @@ -40,9 +40,6 @@ public class WritableSelector implements public boolean isSelected(Resource r) { FileProvider fp = r.as(FileProvider.class); - if (fp != null) { - return isSelected(null, null, fp.getFile()); - } - return false; + return fp != null && isSelected(null, null, fp.getFile()); } } \ No newline at end of file Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java Wed Aug 22 12:32:43 2012 @@ -68,5 +68,5 @@ public interface Cache { * Returns an iterator over the keys in the cache. * @return An iterator over the keys. */ - Iterator iterator(); + Iterator<String> iterator(); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java Wed Aug 22 12:32:43 2012 @@ -141,7 +141,7 @@ public class ChecksumAlgorithm implement * @return some information about this algorithm. */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("<ChecksumAlgorithm:"); buf.append("algorithm=").append(algorithm); buf.append(">"); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java Wed Aug 22 12:32:43 2012 @@ -197,7 +197,7 @@ public class DigestAlgorithm implements * @return some information about this algorithm. */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("<DigestAlgorithm:"); buf.append("algorithm=").append(algorithm); buf.append(";provider=").append(provider); Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java Wed Aug 22 12:32:43 2012 @@ -30,7 +30,7 @@ import java.util.Comparator; * @version 2003-09-13 * @since Ant 1.6 */ -public class EqualComparator implements Comparator { +public class EqualComparator implements Comparator<Object> { /** * Implements Comparator.compare(). Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java Wed Aug 22 12:32:43 2012 @@ -191,7 +191,7 @@ public class ModifiedSelector extends Ba /** How should the cached value and the new one compared? */ - private Comparator comparator = null; + private Comparator<? super String> comparator = null; /** Algorithm for computing new values and updating the cache. */ private Algorithm algorithm = null; @@ -209,7 +209,7 @@ public class ModifiedSelector extends Ba * Parameter vector with parameters for later initialization. * @see #configure */ - private Vector configParameter = new Vector(); + private Vector<Parameter> configParameter = new Vector<Parameter>(); /** * Parameter vector with special parameters for later initialization. @@ -217,7 +217,7 @@ public class ModifiedSelector extends Ba * These parameters are used <b>after</b> the parameters with the pattern '*'. * @see #configure */ - private Vector specialParameter = new Vector(); + private Vector<Parameter> specialParameter = new Vector<Parameter>(); /** The classloader of this class. */ private ClassLoader myClassLoader = null; @@ -297,21 +297,20 @@ public class ModifiedSelector extends Ba } Cache defaultCache = new PropertiesfileCache(cachefile); Algorithm defaultAlgorithm = new DigestAlgorithm(); - Comparator defaultComparator = new EqualComparator(); + Comparator<? super String> defaultComparator = new EqualComparator(); // // ----- Set the main attributes, pattern '*' ----- // - for (Iterator itConfig = configParameter.iterator(); itConfig.hasNext();) { - Parameter par = (Parameter) itConfig.next(); - if (par.getName().indexOf(".") > 0) { + for (Parameter parameter : configParameter) { + if (parameter.getName().indexOf(".") > 0) { // this is a *.* parameter for later use - specialParameter.add(par); + specialParameter.add(parameter); } else { - useParameter(par); + useParameter(parameter); } } - configParameter = new Vector(); + configParameter = new Vector<Parameter>(); // specify the algorithm classname if (algoName != null) { @@ -368,10 +367,9 @@ public class ModifiedSelector extends Ba } else { if (comparatorClass != null) { // use Algorithm specified by classname - comparator = (Comparator) loadClass( - comparatorClass, - "is not a Comparator.", - Comparator.class); + @SuppressWarnings("unchecked") + Comparator<? super String> localComparator = loadClass(comparatorClass, "is not a Comparator.", Comparator.class); + comparator = localComparator; } else { // nothing specified - use default comparator = defaultComparator; @@ -381,11 +379,11 @@ public class ModifiedSelector extends Ba // // ----- Set the special attributes, pattern '*.*' ----- // - for (Iterator itSpecial = specialParameter.iterator(); itSpecial.hasNext();) { - Parameter par = (Parameter) itSpecial.next(); + for (Iterator<Parameter> itSpecial = specialParameter.iterator(); itSpecial.hasNext();) { + Parameter par = itSpecial.next(); useParameter(par); } - specialParameter = new Vector(); + specialParameter = new Vector<Parameter>(); } @@ -398,18 +396,18 @@ public class ModifiedSelector extends Ba * @param type the type to check against * @return a castable object */ - protected Object loadClass(String classname, String msg, Class type) { + protected <T> T loadClass(String classname, String msg, Class<? extends T> type) { try { // load the specified class ClassLoader cl = getClassLoader(); - Class clazz = null; + Class<?> clazz = null; if (cl != null) { clazz = cl.loadClass(classname); } else { clazz = Class.forName(classname); } - Object rv = clazz.newInstance(); + T rv = clazz.asSubclass(type).newInstance(); if (!type.isInstance(rv)) { throw new BuildException("Specified class (" + classname + ") " + msg); @@ -944,7 +942,7 @@ public class ModifiedSelector extends Ba * Get the comparator type to use. * @return the enumerated comparator type */ - public Comparator getComparator() { + public Comparator<? super String> getComparator() { return comparator; } Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java Wed Aug 22 12:32:43 2012 @@ -208,11 +208,11 @@ public class PropertiesfileCache impleme * Returns an iterator over the keys in the cache. * @return An iterator over the keys. */ - public Iterator iterator() { - Vector v = new java.util.Vector(); - Enumeration en = cache.propertyNames(); + public Iterator<String> iterator() { + Vector<String> v = new Vector<String>(); + Enumeration<?> en = cache.propertyNames(); while (en.hasMoreElements()) { - v.add(en.nextElement()); + v.add(en.nextElement().toString()); } return v.iterator(); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java Wed Aug 22 12:32:43 2012 @@ -40,15 +40,15 @@ public abstract class AbstractAnalyzer i private Path classPath = new Path(null); /** The list of root classes */ - private final Vector rootClasses = new VectorSet(); + private final Vector<String> rootClasses = new VectorSet<String>(); /** true if dependencies have been determined */ private boolean determined = false; /** the list of File objects that the root classes depend upon */ - private Vector fileDependencies; + private Vector<File> fileDependencies; /** the list of java classes the root classes depend upon */ - private Vector classDependencies; + private Vector<String> classDependencies; /** true if indirect dependencies should be gathered */ private boolean closure = true; @@ -77,7 +77,7 @@ public abstract class AbstractAnalyzer i * * @return an enumeration of File instances. */ - public Enumeration getFileDependencies() { + public Enumeration<File> getFileDependencies() { if (!supportsFileDependencies()) { throw new RuntimeException("File dependencies are not supported " + "by this analyzer"); @@ -95,7 +95,7 @@ public abstract class AbstractAnalyzer i * @return an enumeration of Strings, each being the name of a Java * class in dot notation. */ - public Enumeration getClassDependencies() { + public Enumeration<String> getClassDependencies() { if (!determined) { determineDependencies(fileDependencies, classDependencies); } @@ -201,8 +201,8 @@ public abstract class AbstractAnalyzer i public void reset() { rootClasses.removeAllElements(); determined = false; - fileDependencies = new Vector(); - classDependencies = new Vector(); + fileDependencies = new Vector<File>(); + classDependencies = new Vector<String>(); } /** @@ -211,7 +211,7 @@ public abstract class AbstractAnalyzer i * @return an enumeration of Strings, each of which is a class name * for a root class. */ - protected Enumeration getRootClasses() { + protected Enumeration<String> getRootClasses() { return rootClasses.elements(); } @@ -233,7 +233,7 @@ public abstract class AbstractAnalyzer i * @param classes a vector of Strings into which the names of classes * upon which the root classes depend should be placed. */ - protected abstract void determineDependencies(Vector files, Vector classes); + protected abstract void determineDependencies(Vector<File> files, Vector<String> classes); /** * Indicate if the particular subclass supports file dependency Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java Wed Aug 22 12:32:43 2012 @@ -68,7 +68,7 @@ public interface DependencyAnalyzer { * * @return an enumeration of File instances. */ - Enumeration getFileDependencies(); + Enumeration<File> getFileDependencies(); /** * Get the list of classes upon which root classes depend. This is a @@ -77,7 +77,7 @@ public interface DependencyAnalyzer { * @return an enumeration of Strings, each being the name of a Java * class in dot notation. */ - Enumeration getClassDependencies(); + Enumeration<String> getClassDependencies(); /** Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java Wed Aug 22 12:32:43 2012 @@ -61,15 +61,16 @@ public class AncestorAnalyzer extends Ab * @param classes a vector to be populated with the names of the * dependency classes. */ - protected void determineDependencies(Vector files, Vector classes) { + protected void determineDependencies(Vector<File> files, Vector<String> classes) { // we get the root classes and build up a set of // classes upon which they depend - Hashtable dependencies = new Hashtable(); - Hashtable containers = new Hashtable(); - Hashtable toAnalyze = new Hashtable(); - Hashtable nextAnalyze = new Hashtable(); - for (Enumeration e = getRootClasses(); e.hasMoreElements();) { - String classname = (String) e.nextElement(); + Hashtable<String, String> dependencies = new Hashtable<String, String>(); + Hashtable<File, File> containers = new Hashtable<File, File>(); + Hashtable<String, String> toAnalyze = new Hashtable<String, String>(); + Hashtable<String, String> nextAnalyze = new Hashtable<String, String>(); + + for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) { + String classname = e.nextElement(); toAnalyze.put(classname, classname); } @@ -77,8 +78,7 @@ public class AncestorAnalyzer extends Ab int maxCount = isClosureRequired() ? MAX_LOOPS : 2; while (toAnalyze.size() != 0 && count++ < maxCount) { nextAnalyze.clear(); - for (Enumeration e = toAnalyze.keys(); e.hasMoreElements();) { - String classname = (String) e.nextElement(); + for (String classname : toAnalyze.keySet()) { dependencies.put(classname, classname); try { File container = getClassContainer(classname); @@ -115,19 +115,19 @@ public class AncestorAnalyzer extends Ab } } - Hashtable temp = toAnalyze; + Hashtable<String, String> temp = toAnalyze; toAnalyze = nextAnalyze; nextAnalyze = temp; } files.removeAllElements(); - for (Enumeration e = containers.keys(); e.hasMoreElements();) { - files.addElement((File) e.nextElement()); + for (File f : containers.keySet()) { + files.add(f); } classes.removeAllElements(); - for (Enumeration e = dependencies.keys(); e.hasMoreElements();) { - classes.addElement((String) e.nextElement()); + for (String dependency : dependencies.keySet()) { + classes.add(dependency); } } Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java Wed Aug 22 12:32:43 2012 @@ -33,8 +33,8 @@ import org.apache.bcel.classfile.Constan * */ public class DependencyVisitor extends EmptyVisitor { - /** The collectd dependencies */ - private Hashtable dependencies = new Hashtable(); + /** The collected dependencies */ + private Hashtable<String, String> dependencies = new Hashtable<String, String>(); /** * The current class's constant pool - used to determine class names * from class references. @@ -47,7 +47,7 @@ public class DependencyVisitor extends E * @return a Enumeration of classnames, being the classes upon which the * visited classes depend. */ - public Enumeration getDependencies() { + public Enumeration<String> getDependencies() { return dependencies.keys(); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java?rev=1376015&r1=1376014&r2=1376015&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java Wed Aug 22 12:32:43 2012 @@ -60,14 +60,14 @@ public class FullAnalyzer extends Abstra * @param classes a vector to be populated with the names of the * dependency classes. */ - protected void determineDependencies(Vector files, Vector classes) { + protected void determineDependencies(Vector<File> files, Vector<String> classes) { // we get the root classes and build up a set of // classes upon which they depend - Hashtable dependencies = new Hashtable(); - Hashtable containers = new Hashtable(); - Hashtable toAnalyze = new Hashtable(); - for (Enumeration e = getRootClasses(); e.hasMoreElements();) { - String classname = (String) e.nextElement(); + Hashtable<String, String> dependencies = new Hashtable<String, String>(); + Hashtable<File, File> containers = new Hashtable<File, File>(); + Hashtable<String, String> toAnalyze = new Hashtable<String, String>(); + for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) { + String classname = e.nextElement(); toAnalyze.put(classname, classname); } @@ -75,8 +75,7 @@ public class FullAnalyzer extends Abstra int maxCount = isClosureRequired() ? MAX_LOOPS : 2; while (toAnalyze.size() != 0 && count++ < maxCount) { DependencyVisitor dependencyVisitor = new DependencyVisitor(); - for (Enumeration e = toAnalyze.keys(); e.hasMoreElements();) { - String classname = (String) e.nextElement(); + for (String classname : toAnalyze.keySet()) { dependencies.put(classname, classname); try { File container = getClassContainer(classname); @@ -105,9 +104,9 @@ public class FullAnalyzer extends Abstra toAnalyze.clear(); // now recover all the dependencies collected and add to the list. - Enumeration depsEnum = dependencyVisitor.getDependencies(); + Enumeration<String> depsEnum = dependencyVisitor.getDependencies(); while (depsEnum.hasMoreElements()) { - String className = (String) depsEnum.nextElement(); + String className = depsEnum.nextElement(); if (!dependencies.containsKey(className)) { toAnalyze.put(className, className); } @@ -115,13 +114,13 @@ public class FullAnalyzer extends Abstra } files.removeAllElements(); - for (Enumeration e = containers.keys(); e.hasMoreElements();) { - files.addElement((File) e.nextElement()); + for (File f : containers.keySet()) { + files.add(f); } classes.removeAllElements(); - for (Enumeration e = dependencies.keys(); e.hasMoreElements();) { - classes.addElement((String) e.nextElement()); + for (String dependency : dependencies.keySet()) { + classes.add(dependency); } }
