From 793bd318e4d3a1a444fa3726234ab2e2f61cc2c1 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 26 Jun 2008 11:25:32 +0000 Subject: [PATCH] Removal of ID elements from slingshot model objects. Removal of unused page-type elements from page model objects. IDs are no longer required at all for model object XML config, the ID is implied by the unique path to the document. A few other minor improvements. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/template/VersionHistoryNode.java | 3 +++ .../java/org/alfresco/service/namespace/QName.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/template/VersionHistoryNode.java b/source/java/org/alfresco/repo/template/VersionHistoryNode.java index 00e9f1208c..83d43a3825 100644 --- a/source/java/org/alfresco/repo/template/VersionHistoryNode.java +++ b/source/java/org/alfresco/repo/template/VersionHistoryNode.java @@ -203,6 +203,7 @@ public class VersionHistoryNode extends BaseContentNode /** * @return The list of aspects applied to this node */ + @Override public Set getAspects() { if (this.aspects == null) @@ -218,6 +219,7 @@ public class VersionHistoryNode extends BaseContentNode * * @return true if the node has the aspect false otherwise */ + @Override public boolean hasAspect(String aspect) { if (this.aspects == null) @@ -247,6 +249,7 @@ public class VersionHistoryNode extends BaseContentNode /** * @see org.alfresco.repo.template.TemplateProperties#getChildren() */ + @Override public List getChildren() { return null; diff --git a/source/java/org/alfresco/service/namespace/QName.java b/source/java/org/alfresco/service/namespace/QName.java index 2deb59c045..6be0b85752 100644 --- a/source/java/org/alfresco/service/namespace/QName.java +++ b/source/java/org/alfresco/service/namespace/QName.java @@ -44,10 +44,10 @@ public final class QName implements QNamePattern, Serializable, Cloneable { private static final long serialVersionUID = 3977016258204348976L; - private String namespaceURI; // never null - private String localName; // never null + private final String namespaceURI; // never null + private final String localName; // never null private int hashCode; - private String prefix; + private final String prefix; public static final char NAMESPACE_PREFIX = ':'; public static final char NAMESPACE_BEGIN = '{'; @@ -342,10 +342,10 @@ public final class QName implements QNamePattern, Serializable, Cloneable */ public String toString() { - return new StringBuffer(80).append(NAMESPACE_BEGIN) - .append(namespaceURI) - .append(NAMESPACE_END) - .append(localName).toString(); + return new StringBuilder(80).append(NAMESPACE_BEGIN) + .append(namespaceURI) + .append(NAMESPACE_END) + .append(localName).toString(); }