You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2006/03/15 23:31:43 UTC
svn commit: r386191 - in
/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree:
SiteTreeNode.java SiteTreeNodeImpl.java TreeSiteManager.java
Author: michi
Date: Wed Mar 15 14:31:42 2006
New Revision: 386191
URL: http://svn.apache.org/viewcvs?rev=386191&view=rev
Log:
UUID implementation started
Modified:
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNode.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNode.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNode.java?rev=386191&r1=386190&r2=386191&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNode.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNode.java Wed Mar 15 14:31:42 2006
@@ -59,6 +59,13 @@
String getId();
/**
+ * Get the uuid of this node.
+ *
+ * @return the uuid.
+ */
+ String getUUID();
+
+ /**
* Get all labels for this node (independent of their language attribute).
*
* @return an <code>Array</code> of labels.
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java?rev=386191&r1=386190&r2=386191&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java Wed Mar 15 14:31:42 2006
@@ -44,6 +44,10 @@
*/
public static final String ID_ATTRIBUTE_NAME = "id";
/**
+ * <code>UUID_ATTRIBUTE_NAME</code> The uuid attribute
+ */
+ public static final String UUID_ATTRIBUTE_NAME = "uuid";
+ /**
* <code>ISIBLEINNAV_ATTRIBUTE_NAME</code>The visibleinnav attribute
*/
public static final String VISIBLEINNAV_ATTRIBUTE_NAME="visibleinnav";
@@ -94,6 +98,17 @@
}
/**
+ * @see org.apache.lenya.cms.site.tree.SiteTreeNode#getUUID()
+ */
+ public String getUUID() {
+ if (this.node == this.node.getOwnerDocument().getDocumentElement()) {
+ getLogger().warn("Node equals OwnerDocument: " + this);
+ return "";
+ }
+ return this.node.getAttributes().getNamedItem(UUID_ATTRIBUTE_NAME).getNodeValue();
+ }
+
+ /**
* @see org.apache.lenya.cms.site.tree.SiteTreeNode#getAbsoluteId()
*/
public String getAbsoluteId() {
@@ -495,4 +510,4 @@
return element.getAttribute(attributeName);
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java?rev=386191&r1=386190&r2=386191&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java Wed Mar 15 14:31:42 2006
@@ -169,6 +169,20 @@
}
/**
+ * @see org.apache.lenya.cms.site.SiteManager#getUUID(org.apache.lenya.cms.publication.Document)
+ */
+ public String getUUID(Document resource) throws SiteException {
+ String uuid = null;
+ SiteTree tree = getTree(resource);
+ SiteTreeNode node = tree.getNode(resource.getId());
+ if (node != null) {
+ uuid = node.getUUID();
+ }
+ if (uuid == null) log.warn("No UUID: " + resource);
+ return uuid;
+ }
+
+ /**
* @see org.apache.lenya.cms.site.SiteManager#containsInAnyLanguage(org.apache.lenya.cms.publication.Document)
*/
public boolean containsInAnyLanguage(Document resource) throws SiteException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org