Rename description to label in structure element

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
index 3f4d35864abd8017f3ac0629caff3ec8fd9ae99c..136bd5201487e8ac8711971b576327fa625de7f9 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
@@ -109,8 +109,7 @@ public abstract class SAwareTask extends AbstractSpringTask implements
                return path;\r
        }\r
 \r
-       @Override\r
-       public String getDescription() {\r
+       public String getLabel() {\r
                String description = super.getDescription();\r
                if (description == null) {\r
                        return "<no task def>";\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/DefaultSRegistry.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/DefaultSRegistry.java
index f59fc65b7416d27ab1965e2ca39309f6a47562e1..ca80d87625e379c42052b1a5050748e24ffa5ff8 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/DefaultSRegistry.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/DefaultSRegistry.java
@@ -29,7 +29,7 @@ public class DefaultSRegistry implements StructureRegistry {
                elements.add(treeSElement);\r
                paths.add(path);\r
                log.debug("Registered " + path + " (desc: '"\r
-                               + treeSElement.getDescription() + "', position: "\r
+                               + treeSElement.getLabel() + "', position: "\r
                                + elements.size() + ")");\r
        }\r
 \r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
index 8681865662b6fc3dfdb88019eb96cbc84e70291a..4b50d9c22c7a0a4b3b4b7f880f240d48cec0d778 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
@@ -9,29 +9,29 @@ package org.argeo.slc.core.structure;
 public class SimpleSElement implements StructureElement {\r
        /** For ORM */\r
        private Long tid;\r
-       private String description;\r
+       private String label;\r
 \r
        /** For ORM */\r
        public SimpleSElement() {\r
        }\r
 \r
        /** Constructor */\r
-       public SimpleSElement(String description) {\r
-               this.description = description;\r
+       public SimpleSElement(String label) {\r
+               this.label = label;\r
        }\r
 \r
        /** Constructor */\r
-       public SimpleSElement(String description, String defaultDescription) {\r
-               this(description != null ? description : defaultDescription);\r
+       public SimpleSElement(String label, String defaultLabel) {\r
+               this(label != null ? label : defaultLabel);\r
        }\r
 \r
-       public String getDescription() {\r
-               return description;\r
+       public String getLabel() {\r
+               return label;\r
        }\r
 \r
-       /** Sets the description. */\r
-       public void setDescription(String description) {\r
-               this.description = description;\r
+       /** Sets the label. */\r
+       public void setLabel(String label) {\r
+               this.label = label;\r
        }\r
 \r
        Long getTid() {\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/StructureElement.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/StructureElement.java
index d842839b2dcd809717357a97c7d4dee1fae01fc9..8e9d15bffc3120faf983a2a6a27237bc59a44b15 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/StructureElement.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/StructureElement.java
@@ -5,6 +5,6 @@ package org.argeo.slc.core.structure;
  * registered.\r
  */\r
 public interface StructureElement {\r
-       /** Description of this element. */\r
-       public String getDescription();\r
+       /** Label of this element. */\r
+       public String getLabel();\r
 }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
index e67284375380d7c4b64a5519e4c997927b5fe70c..32ea36413657a858d132263102a049d94431ff94 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
@@ -39,7 +39,7 @@ public class TreeSRegistry implements StructureRegistry {
                if (element instanceof SimpleSElement) {\r
                        simpleSElement = (SimpleSElement) element;\r
                } else {\r
-                       simpleSElement = new SimpleSElement(element.getDescription());\r
+                       simpleSElement = new SimpleSElement(element.getLabel());\r
                }\r
 \r
                if (!(path instanceof TreeSPath))\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
index 8249c767685dc67aa63111c041373b61e869a4ba..1ee32e479b438149196c86e46a77b52fcb3d70a3 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
@@ -114,7 +114,7 @@ class ResultPage {
                        if (registry != null) {\r
                                StructureElement element = registry.getElement(path);\r
                                if (element != null) {\r
-                                       buf.append(element.getDescription());\r
+                                       buf.append(element.getLabel());\r
                                } else {\r
                                        buf.append(path.getName());\r
                                }\r
@@ -208,7 +208,7 @@ class ResultPage {
                if (registry != null) {\r
                        StructureElement element = registry.getElement(path);\r
                        if (element != null) {\r
-                               description = element.getDescription();\r
+                               description = element.getLabel();\r
                        }\r
                }\r
                buf.append('/').append(description);\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
index ed1d80cc1ef3e261ebdd4ba6b3a1da0767a9a5ef..fde2a34b680618705795135ad36e8875b1f8192b 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
@@ -7,7 +7,7 @@
                <id name="tid" column="T_ID">\r
                        <generator class="native" />\r
                </id>\r
-               <property name="description" column="DESCRIPTION"\r
+               <property name="label" column="LABEL"\r
                        not-null="true" />\r
        </class>\r
 </hibernate-mapping>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java
index 7317994a73a9e2594439bbfb2aeb7c9346b969e1..0fc9f4cdb84bf21288c477f6afa479e212fa6f2b 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java
@@ -31,7 +31,7 @@ public class TreeSRegistryDaoHibernateTest extends SpringBasedTestCase {
 \r
                TreeSRegistry registry2 = treeSRegistryDao.getTreeSRegistry(path);\r
                SimpleSElement element = registry2.getElements().get(path);\r
-               assertEquals(desc, element.getDescription());\r
+               assertEquals(desc, element.getLabel());\r
        }\r
 \r
        @Override\r