From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 27 Oct 2007 21:53:17 +0000 (+0000)
Subject: Introduce directory based structure
X-Git-Tag: argeo-slc-2.1.7~3196
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2052d0beab9c68880b3e8b0172a707274004b35f;p=gpl%2Fargeo-slc.git

Introduce directory based structure

git-svn-id: https://svn.argeo.org/slc/trunk@666 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 6bdb5bf16..8fdefc23f 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -64,11 +64,6 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 
 		// create structure root
 		registerProjectAndParents(project);
-
-		// TreeSElement element = new TreeSElement(project.getDescription(),
-		// "Root");
-		// registry.register(getProjectPath(project), element);
-
 	}
 
 	private void registerProjectAndParents(Project project) {
@@ -99,6 +94,11 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 						.getAbsolutePath());
 				description = properties
 						.getProperty(SlcAntConfig.DIR_DESCRIPTION_PROPERTY);
+			} else {
+				if (i == 0) {// project it self
+					description = project.getDescription() != null ? project
+							.getDescription() : "";
+				}
 			}
 			TreeSElement element = new TreeSElement(description);
 
@@ -114,16 +114,9 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 
 	/** Get the path of a project (root). */
 	public static TreeSPath getProjectPath(Project project) {
-		// return TreeSPath.createRootPath(getProjectPathName(project));
 		return (TreeSPath) project.getReference(REF_PROJECT_PATH);
 	}
 
-	private static String getProjectPathName(Project project) {
-		String projectName = project.getName() != null ? project.getName()
-				: "project";
-		return projectName;
-	}
-
 	private File findSlcRootFile(File dir) {
 		for (File file : dir.listFiles()) {
 			if (!file.isDirectory() && file.getName().equals(slcRootFileName)) {
diff --git a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties b/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties
deleted file mode 100644
index eef40866e..000000000
--- a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.argeo.slc.ant.dirDescription=Second sub Category
\ No newline at end of file