Moving some magic names to a single file

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@405523 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/MagicNames.java

@@ -144,5 +144,24 @@ public final class MagicNames {
      */
     public static final String BUILD_JAVAC_TARGET = "ant.build.javac.target";
 
+    /**
+     * Name of the magic property that controls classloader reuse 
+     * @since Ant 1.4.
+     * Value: {@value}
+     */
+    public static final String REFID_CLASSPATH_REUSE_LOADER = "ant.reuse.loader";
+
+    /**
+     * Prefix used to store classloader references.
+     * Value: {@value}
+     */
+    public static final String REFID_CLASSPATH_LOADER_PREFIX = "ant.loader.";
+
+    /**
+     * Reference used to store the property helper
+     * Value: {@value}
+     */
+    public static final String REFID_PROPERTY_HELPER = "ant.PropertyHelper";
+
 }
 

src/main/org/apache/tools/ant/PropertyHelper.java

@@ -124,14 +124,14 @@ public class PropertyHelper {
     public static synchronized
         PropertyHelper getPropertyHelper(Project project) {
         PropertyHelper helper
-            = (PropertyHelper) project.getReference("ant.PropertyHelper");
+            = (PropertyHelper) project.getReference(MagicNames.REFID_PROPERTY_HELPER);
         if (helper != null) {
             return helper;
         }
         helper = new PropertyHelper();
         helper.setProject(project);
 
-        project.addReference("ant.PropertyHelper", helper);
+        project.addReference(MagicNames.REFID_PROPERTY_HELPER, helper);
         return helper;
     }
 

src/main/org/apache/tools/ant/util/ClasspathUtils.java

@@ -20,6 +20,7 @@ import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
@@ -64,11 +65,11 @@ import org.apache.tools.ant.types.Reference;
  * @since Ant 1.6
  */
 public class ClasspathUtils {
-    private static final String LOADER_ID_PREFIX = "ant.loader.";
+
     /**
      * Name of the magic property that controls classloader reuse in Ant 1.4.
      */
-    public static final String REUSE_LOADER_REF = "ant.reuse.loader";
+    public static final String REUSE_LOADER_REF = MagicNames.REFID_CLASSPATH_REUSE_LOADER;
 
     /**
      * Convenience overloaded version of {@link
@@ -111,7 +112,7 @@ public class ClasspathUtils {
                     + pathId
                     + " does not reference a Path.");
         }
-        String loaderId = LOADER_ID_PREFIX + pathId;
+        String loaderId = MagicNames.REFID_CLASSPATH_LOADER_PREFIX + pathId;
         return getClassLoaderForPath(p, (Path) path, loaderId, reverseLoader);
     }
 
@@ -441,7 +442,7 @@ public class ClasspathUtils {
          * @return The class loader.
          */
         public ClassLoader getClassLoader() {
-            return ClasspathUtils.getClassLoaderForPath(
+            return getClassLoaderForPath(
                     getContextProject(),
                     this.classpath,
                     getClassLoadId(),
@@ -462,7 +463,7 @@ public class ClasspathUtils {
          */
         public String getClassLoadId() {
             return this.loaderId == null && this.classpathId != null
-                ? ClasspathUtils.LOADER_ID_PREFIX + this.classpathId
+                ? MagicNames.REFID_CLASSPATH_LOADER_PREFIX + this.classpathId
                 : this.loaderId;
         }