ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r396460 - in /ant/core/trunk/src/main/org/apache/tools/ant: helper/ProjectHelperImpl.java taskdefs/optional/NetRexxC.java
Date Mon, 24 Apr 2006 06:59:43 GMT
Author: jkf
Date: Sun Apr 23 23:59:42 2006
New Revision: 396460

URL: http://svn.apache.org/viewcvs?rev=396460&view=rev
Log:
Remove use of deprecated methods

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java?rev=396460&r1=396459&r2=396460&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java Sun Apr 23
23:59:42 2006
@@ -423,8 +423,8 @@
                     if ((new File(baseDir)).isAbsolute()) {
                         helperImpl.project.setBasedir(baseDir);
                     } else {
-                        File resolvedBaseDir = helperImpl.project.resolveFile(baseDir,
-                                helperImpl.buildFileParent);
+                        File resolvedBaseDir = FILE_UTILS.resolveFile(
+                                helperImpl.buildFileParent, baseDir);
                         helperImpl.project.setBaseDir(resolvedBaseDir);
                     }
                 }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java?rev=396460&r1=396459&r2=396460&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java Sun Apr 23
23:59:42 2006
@@ -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.
@@ -33,6 +33,7 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Compiles NetRexx source files.
@@ -670,7 +671,7 @@
                 String toFile = (String) filecopyList.get(fromFile);
 
                 try {
-                    getProject().copyFile(fromFile, toFile);
+                    FileUtils.getFileUtils().copyFile(fromFile, toFile);
                 } catch (IOException ioe) {
                     String msg = "Failed to copy " + fromFile + " to " + toFile
                          + " due to " + ioe.getMessage();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message