From b32f4587da5b6aa63458564000e7c29ab5f3e5cb Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Mon, 6 Jun 2005 19:45:32 +0000
Subject: [PATCH] PR: 35246 As suggested by Darin Swanson. (use USER_LIBDIR,
 and use File.separatorChar in there)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278406 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/ComponentHelper.java | 5 +----
 src/main/org/apache/tools/ant/Diagnostics.java     | 3 +--
 src/main/org/apache/tools/ant/launch/Launcher.java | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index 54dd4395a..f8f7be894 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -802,10 +802,7 @@ public class ComponentHelper  {
         boolean definitions = false;
         boolean antTask;
         String home = System.getProperty(Launcher.USER_HOMEDIR);
-        File libDir = new File(home,
-                Launcher.ANT_PRIVATEDIR +
-                File.separator +
-                Launcher.ANT_PRIVATELIB);
+        File libDir = new File(home, Launcher.USER_LIBDIR);
         //look up the name
         AntTypeDefinition def = getDefinition(componentName);
         if (def == null) {
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index ef2444d47..64a3bbb9c 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -285,8 +285,7 @@ public final class Diagnostics {
     private static void doReportUserHomeLibraries(PrintStream out) {
         String home = System.getProperty(Launcher.USER_HOMEDIR);
         out.println("user.home: " + home);
-        File libDir = new File(home,
-                Launcher.ANT_PRIVATEDIR + File.separator + Launcher.ANT_PRIVATELIB);
+        File libDir = new File(home, Launcher.USER_LIBDIR);
         File[] libs = listJarFiles(libDir);
         printLibraries(libs, out);
     }
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index 80fcd410f..6817fa103 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -50,7 +50,8 @@ public class Launcher {
     public static final String ANT_PRIVATELIB = "lib";
 
     /** The location of a per-user library directory */
-    public static final String USER_LIBDIR = ANT_PRIVATEDIR + "/" + ANT_PRIVATELIB;
+    public static final String USER_LIBDIR = 
+        ANT_PRIVATEDIR + File.separatorChar + ANT_PRIVATELIB;
 
     /** The startup class that is to be run */
     public static final String MAIN_CLASS = "org.apache.tools.ant.Main";
@@ -206,8 +207,7 @@ public class Launcher {
         URL[] systemJars = Locator.getLocationURLs(antLibDir);
 
         File userLibDir
-            = new File(System.getProperty(USER_HOMEDIR),
-                    ANT_PRIVATEDIR + File.separatorChar + ANT_PRIVATELIB);
+            = new File(System.getProperty(USER_HOMEDIR), USER_LIBDIR);
 
         URL[] userJars = noUserLib ? new URL[0] : Locator.getLocationURLs(userLibDir);