From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Dec 2007 19:57:12 +0000 (+0000)
Subject: Rename description to label in structure element
X-Git-Tag: argeo-slc-2.1.7~3104
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=77ed5d40c10f8e8e788382ed0da1f3e4a1c31958;p=gpl%2Fargeo-slc.git

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 3f4d35864..136bd5201 100644
--- 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;
 	}
 
-	@Override
-	public String getDescription() {
+	public String getLabel() {
 		String description = super.getDescription();
 		if (description == null) {
 			return "<no task def>";
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 f59fc65b7..ca80d8762 100644
--- 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);
 		paths.add(path);
 		log.debug("Registered " + path + " (desc: '"
-				+ treeSElement.getDescription() + "', position: "
+				+ treeSElement.getLabel() + "', position: "
 				+ elements.size() + ")");
 	}
 
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 868186566..4b50d9c22 100644
--- 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 {
 	/** For ORM */
 	private Long tid;
-	private String description;
+	private String label;
 
 	/** For ORM */
 	public SimpleSElement() {
 	}
 
 	/** Constructor */
-	public SimpleSElement(String description) {
-		this.description = description;
+	public SimpleSElement(String label) {
+		this.label = label;
 	}
 
 	/** Constructor */
-	public SimpleSElement(String description, String defaultDescription) {
-		this(description != null ? description : defaultDescription);
+	public SimpleSElement(String label, String defaultLabel) {
+		this(label != null ? label : defaultLabel);
 	}
 
-	public String getDescription() {
-		return description;
+	public String getLabel() {
+		return label;
 	}
 
-	/** Sets the description. */
-	public void setDescription(String description) {
-		this.description = description;
+	/** Sets the label. */
+	public void setLabel(String label) {
+		this.label = label;
 	}
 
 	Long getTid() {
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 d842839b2..8e9d15bff 100644
--- 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.
  */
 public interface StructureElement {
-	/** Description of this element. */
-	public String getDescription();
+	/** Label of this element. */
+	public String getLabel();
 }
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 e67284375..32ea36413 100644
--- 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) {
 			simpleSElement = (SimpleSElement) element;
 		} else {
-			simpleSElement = new SimpleSElement(element.getDescription());
+			simpleSElement = new SimpleSElement(element.getLabel());
 		}
 
 		if (!(path instanceof TreeSPath))
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 8249c7676..1ee32e479 100644
--- 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) {
 				StructureElement element = registry.getElement(path);
 				if (element != null) {
-					buf.append(element.getDescription());
+					buf.append(element.getLabel());
 				} else {
 					buf.append(path.getName());
 				}
@@ -208,7 +208,7 @@ class ResultPage {
 		if (registry != null) {
 			StructureElement element = registry.getElement(path);
 			if (element != null) {
-				description = element.getDescription();
+				description = element.getLabel();
 			}
 		}
 		buf.append('/').append(description);
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 ed1d80cc1..fde2a34b6 100644
--- 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">
 			<generator class="native" />
 		</id>
-		<property name="description" column="DESCRIPTION"
+		<property name="label" column="LABEL"
 			not-null="true" />
 	</class>
 </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 7317994a7..0fc9f4cdb 100644
--- 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 {
 
 		TreeSRegistry registry2 = treeSRegistryDao.getTreeSRegistry(path);
 		SimpleSElement element = registry2.getElements().get(path);
-		assertEquals(desc, element.getDescription());
+		assertEquals(desc, element.getLabel());
 	}
 
 	@Override