peterreilly 2003/08/13 07:06:20 Modified: src/main/org/apache/tools/ant ComponentHelper.java src/main/org/apache/tools/ant/helper ProjectHelper2.java src/main/org/apache/tools/ant/types AbstractFileSet.java CommandlineJava.java Log: remove some deprecated methods and 1.1 holdovers Bugzilla: 22326 Revision Changes Path 1.22 +5 -5 ant/src/main/org/apache/tools/ant/ComponentHelper.java Index: ComponentHelper.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ComponentHelper.java 13 Aug 2003 13:18:54 -0000 1.21 +++ ComponentHelper.java 13 Aug 2003 14:06:19 -0000 1.22 @@ -54,8 +54,6 @@ package org.apache.tools.ant; -import org.apache.tools.ant.util.WeakishReference; - import java.util.Enumeration; import java.util.Hashtable; import java.util.HashSet; @@ -67,6 +65,7 @@ import java.util.Vector; import java.io.InputStream; import java.io.IOException; +import java.lang.ref.WeakReference; import java.lang.reflect.Modifier; import org.apache.tools.ant.taskdefs.Typedef; @@ -87,6 +86,7 @@ * * @author Costin Manolache * @author Peter Reilly + * @author <a href="mailto:[EMAIL PROTECTED]">Martijn Kruithof</a> * @since Ant1.6 */ public class ComponentHelper { @@ -551,7 +551,7 @@ v = new Vector(); createdTasks.put(type, v); } - v.addElement(WeakishReference.createReference(task)); + v.addElement(new WeakReference(task)); } } @@ -568,8 +568,8 @@ if (v != null) { Enumeration taskEnum = v.elements(); while (taskEnum.hasMoreElements()) { - WeakishReference ref = - (WeakishReference) taskEnum.nextElement(); + WeakReference ref = + (WeakReference) taskEnum.nextElement(); Task t = (Task) ref.get(); //being a weak ref, it may be null by this point if (t != null) { 1.30 +3 -3 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ProjectHelper2.java 13 Aug 2003 13:18:54 -0000 1.29 +++ ProjectHelper2.java 13 Aug 2003 14:06:19 -0000 1.30 @@ -641,7 +641,7 @@ if (key.equals("default")) { if (value != null && !value.equals("")) { if (!context.isIgnoringProjectTag()) { - project.setDefaultTarget(value); + project.setDefault(value); } } } else if (key.equals("name")) { @@ -707,8 +707,8 @@ if ((new File(baseDir)).isAbsolute()) { project.setBasedir(baseDir); } else { - project.setBaseDir(project.resolveFile(baseDir, - context.getBuildFileParent())); + project.setBaseDir(fu.resolveFile( + context.getBuildFileParent(), baseDir)); } } } 1.24 +4 -4 ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java Index: AbstractFileSet.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- AbstractFileSet.java 29 Jul 2003 08:43:49 -0000 1.23 +++ AbstractFileSet.java 13 Aug 2003 14:06:19 -0000 1.24 @@ -97,6 +97,7 @@ * @author Stefan Bodewig * @author Magesh Umasankar * @author <a href="mailto:[EMAIL PROTECTED]">Bruce Atherton</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Martijn Kruithof</a> */ public abstract class AbstractFileSet extends DataType implements Cloneable, SelectorContainer { @@ -208,7 +209,7 @@ } /** - * add a name entry on the include files list + * add a name entry on the excludes files list */ public PatternSet.NameEntry createExcludesFile() { if (isReference()) { @@ -224,8 +225,7 @@ if (isReference()) { throw tooManyAttributes(); } - FileUtils fileUtils = FileUtils.newFileUtils(); - setDir(fileUtils.getParentFile(file)); + setDir(file.getParentFile()); PatternSet.NameEntry include = createInclude(); include.setName(file.getName()); @@ -277,7 +277,7 @@ } /** - * Sets the name of the file containing the includes patterns. + * Sets the name of the file containing the excludes patterns. * * @param excl The file to fetch the exclude patterns from. */ 1.45 +0 -1 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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- CommandlineJava.java 1 Aug 2003 06:44:36 -0000 1.44 +++ CommandlineJava.java 13 Aug 2003 14:06:20 -0000 1.45 @@ -58,7 +58,6 @@ import java.util.Properties; import java.util.Vector; import java.util.List; -import java.util.ArrayList; import java.util.LinkedList; import java.util.ListIterator;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]