Simplify structure framework

[gpl/argeo-slc.git] / org.argeo.slc / src / main / java / org / argeo / slc / ant / SlcProjectHelper.java

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 ecb46c07bf0f73822b3e618f0c8e92b7816857d1..34373437d7cd2af7b5dfe99a03cbb4435a38bb62 100644 (file)
--- 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
@@ -40,7 +40,7 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                if (slcRootFile == null) {\r
                        throw new SlcAntException("Cannot find SLC root file");\r
                }\r
-               SlcAntConfig slcAntConfig = new SlcAntConfig(project, slcRootFile);\r
+               SlcAntConfig.initProject(project, slcRootFile);\r
 \r
                // init Spring application context\r
                String acPath = project\r
@@ -56,19 +56,17 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                super.parse(project, source);\r
 \r
                addSlcTasks(project);\r
-               \r
+\r
                // create structure root\r
-               String projectDescription = project.getDescription() != null ? project\r
-                               .getDescription() : "Root";\r
-               TreeSElement element = TreeSElement.createRootElelment(\r
-                               getProjectPathName(project), projectDescription);\r
-               registry.register(element);\r
+               TreeSElement element = new TreeSElement(project.getDescription(),\r
+                               "Root");\r
+               registry.register(getProjectPath(project), element);\r
 \r
        }\r
 \r
        /** Get the path of a project (root). */\r
        public static TreeSPath getProjectPath(Project project) {\r
-               return TreeSPath.createChild(null, getProjectPathName(project));\r
+               return TreeSPath.createRootPath(getProjectPathName(project));\r
        }\r
 \r
        private static String getProjectPathName(Project project) {\r
@@ -109,7 +107,7 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                                project.addTaskDefinition(name, Class.forName(taskdefs\r
                                                .getProperty(name)));\r
                        } catch (ClassNotFoundException e) {\r
-                               log.error("Unknown class for task "+name, e);\r
+                               log.error("Unknown class for task " + name, e);\r
                        }\r
                }\r
        }\r