[Patch] removed deprecated methods and changed variable scope (private-protected) ProjectHelperImpl

[Kev Jackson]

- swapped out deprecated code where the replacement code was obvious - 
left some deprecated methods where I wasn't sure
- changed visibility of class variables from private to protected

still showing 1700+ warnings/errors :(
Kev
Index: ProjectHelperImpl.java
===================================================================
RCS file: 
/home/cvspublic/ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java,v
retrieving revision 1.28
diff -u -r1.28 ProjectHelperImpl.java
--- ProjectHelperImpl.java      12 Nov 2004 15:14:59 -0000      1.28
+++ ProjectHelperImpl.java      10 Dec 2004 06:22:47 -0000
@@ -55,33 +55,33 @@
      * SAX 1 style parser used to parse the given file. This may
      * in fact be a SAX 2 XMLReader wrapped in an XMLReaderAdapter.
      */
-    private org.xml.sax.Parser parser;
+    protected org.xml.sax.Parser parser;
 
     /** The project to configure. */
-    private Project project;
+    protected Project project;
     /** The configuration file to parse. */
     private File buildFile;
     /**
      * Parent directory of the build file. Used for resolving entities
      * and setting the project's base directory.
      */
-    private File buildFileParent;
+    protected File buildFileParent;
     /**
      * Locator for the configuration file parser.
      * Used for giving locations of errors etc.
      */
-    private Locator locator;
+    protected Locator locator;
     /**
      * Target that all other targets will depend upon implicitly.
      *
      * <p>This holds all tasks and data type definitions that have
      * been placed outside of targets.</p>
      */
-    private Target implicitTarget = new Target();
+    protected Target implicitTarget = new Target();
     /**
      * helper for path -> URI and URI -> path conversions.
      */
-    private static FileUtils fu = FileUtils.newFileUtils();
+    protected static FileUtils fu = FileUtils.newFileUtils();
 
     /**
      * default constructor
@@ -404,7 +404,7 @@
             }
 
             if (def != null && !def.equals("")) {
-                helperImpl.project.setDefaultTarget(def);
+                helperImpl.project.setDefault(def);
             } else {
                 throw new BuildException("The default attribute is required");
             }
@@ -428,8 +428,7 @@
                     if ((new File(baseDir)).isAbsolute()) {
                         helperImpl.project.setBasedir(baseDir);
                     } else {
-                        File resolvedBaseDir = 
helperImpl.project.resolveFile(baseDir,
-                                helperImpl.buildFileParent);
+                        File resolvedBaseDir = 
fu.resolveFile(helperImpl.buildFileParent, baseDir);
                         helperImpl.project.setBaseDir(resolvedBaseDir);
                     }
                 }
@@ -600,7 +599,7 @@
      *
      * @since Ant 1.6
      */
-    private static void handleElement(ProjectHelperImpl helperImpl,
+    protected static void handleElement(ProjectHelperImpl helperImpl,
                                       DocumentHandler parent,
                                       Target target, String elementName,
                                       AttributeList attrs)
@@ -1022,7 +1021,7 @@
      *
      * @see #configure(Object,AttributeList,Project)
      */
-    private void configureId(Object target, AttributeList attr) {
+    protected void configureId(Object target, AttributeList attr) {
         String id = attr.getValue("id");
         if (id != null) {
             project.addReference(id, target);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]