mbenson     2005/02/24 08:48:45

  Modified:    src/main/org/apache/tools/ant/types Path.java
  Log:
  -5 + 2 LOC
  
  Revision  Changes    Path
  1.68      +3 -6      ant/src/main/org/apache/tools/ant/types/Path.java
  
  Index: Path.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Path.java 21 Dec 2004 15:44:51 -0000      1.67
  +++ Path.java 24 Feb 2005 16:48:45 -0000      1.68
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2000-2004 The Apache Software Foundation
  + * Copyright  2000-2005 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.
  @@ -487,11 +487,8 @@
        * <p>Assume the filename is absolute if project is null.</p>
        */
       private static String resolveFile(Project project, String relativeName) {
  -        if (project != null) {
  -            File f = project.resolveFile(relativeName);
  -            return f.getAbsolutePath();
  -        }
  -        return relativeName;
  +        return (project == null) ? relativeName
  +            : project.resolveFile(relativeName).getAbsolutePath();
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to