X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcAntConfig.java;h=9b2824886aca8503e3cc6dba6e73186729691772;hb=4226558ccaf4d40b55d5d8492d0ef3476dfdf0c9;hp=11fdd64310494515431cb0c6384c4ce362a5b55a;hpb=6045cf4f30c0df343c0625bd4815584ff9a4b805;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 11fdd6431..9b2824886 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -127,8 +127,8 @@ public class SlcAntConfig {
 	public static String DEFAULT_TEST_RUN_PROPERTY = "slc.defaultTestRun";
 
 	// SLC LOCAL PROPERTIES
-	/** Property for the dir description (SLC local property file). */
-	public static String DIR_DESCRIPTION_PROPERTY = "slc.dirDescription";
+	/** Property for the dir label (SLC local property file). */
+	public static String DIR_LABEL_PROPERTY = "slc.dirLabel";
 
 	private String slcRootFileName = "slcRoot.properties";
 	private String slcLocalFileName = "slcLocal.properties";
@@ -155,15 +155,15 @@ public class SlcAntConfig {
 		System.getProperties().putAll((Map<?, ?>) project.getUserProperties());
 		Properties all = new Properties();
 		all.putAll(System.getProperties());
-		prepareAllProperties(slcRootFile,all);
+		prepareAllProperties(slcRootFile, all);
 
 		Log log = LogFactory.getLog(this.getClass());
 		for (Object o : all.keySet()) {
 			String key = o.toString();
 			// System.out.println(key+"="+all.getProperty(key));
 			if (project.getUserProperty(key) == null) {// not already set
-//				if (log.isDebugEnabled())
-//					log.debug(key + "=" + all.getProperty(key));
+			// if (log.isDebugEnabled())
+			// log.debug(key + "=" + all.getProperty(key));
 				project.setUserProperty(key, all.getProperty(key));
 			}
 		}
@@ -246,7 +246,8 @@ public class SlcAntConfig {
 			}
 			// Default test run
 			if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
-				all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");
+				all.setProperty(DEFAULT_TEST_RUN_PROPERTY,
+						"defaultTestRun");
 			}
 
 			// Default log4j
@@ -280,7 +281,7 @@ public class SlcAntConfig {
 	/**
 	 * Looks for a file named {@link #getSlcLocalFileName()} in the directory,
 	 * loads it as properties file and return the value of the property
-	 * {@link #DIR_DESCRIPTION_PROPERTY}.
+	 * {@link #DIR_LABEL_PROPERTY}.
 	 */
 	public String getDescriptionForDir(File dir) {
 		String description = dir.getName();
@@ -289,7 +290,7 @@ public class SlcAntConfig {
 		if (slcLocal.exists()) {
 			Properties properties = loadFile(slcLocal.getAbsolutePath());
 			description = properties.getProperty(
-					SlcAntConfig.DIR_DESCRIPTION_PROPERTY, description);
+					SlcAntConfig.DIR_LABEL_PROPERTY, description);
 		}
 		return description;
 	}