You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jo...@apache.org on 2006/10/03 12:21:40 UTC
svn commit: r452400 - in /lenya/trunk/src: java/org/apache/lenya/cms/site/
java/org/apache/lenya/cms/site/simple/
modules/sitetree/java/src/org/apache/lenya/cms/site/tree/
Author: josias
Date: Tue Oct 3 03:21:39 2006
New Revision: 452400
URL: http://svn.apache.org/viewvc?view=rev&rev=452400
Log:
renamed Label to AbstractLink to make the naming more consistent. now we have 'SiteTreeLink extends AbstractLink implements Link'.
Added:
lenya/trunk/src/java/org/apache/lenya/cms/site/AbstractLink.java
- copied, changed from r452391, lenya/trunk/src/java/org/apache/lenya/cms/site/Label.java
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/site/Label.java
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeLink.java
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Copied: lenya/trunk/src/java/org/apache/lenya/cms/site/AbstractLink.java (from r452391, lenya/trunk/src/java/org/apache/lenya/cms/site/Label.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/site/AbstractLink.java?view=diff&rev=452400&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/Label.java&r1=452391&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/AbstractLink.java&r2=452400
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/Label.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/AbstractLink.java Tue Oct 3 03:21:39 2006
@@ -25,20 +25,20 @@
import org.apache.lenya.cms.publication.Publication;
/**
- * The Label class encapsulates a string label and a associated language.
+ * The AbstractLink class encapsulates a string label and a associated language.
*/
-public abstract class Label implements Link {
+public abstract class AbstractLink implements Link {
private String label = null;
private String language = null;
/**
- * Creates a new Label object.
+ * Creates a new AbstractLink object.
* @param factory The document factory.
* @param node The site node.
* @param _label the actual label
* @param _language the language
*/
- public Label(DocumentFactory factory, SiteNode node, String _label, String _language) {
+ public AbstractLink(DocumentFactory factory, SiteNode node, String _label, String _language) {
this.label = _label;
this.language = _language;
this.factory = factory;
@@ -46,7 +46,7 @@
}
/**
- * Get the actual label of the Label object
+ * Get the actual label of the AbstractLink object
*
* @return the actual label as a String
*/
@@ -55,7 +55,7 @@
}
/**
- * Get the language of this Label object
+ * Get the language of this AbstractLink object
*
* @return the language
*/
@@ -80,7 +80,7 @@
boolean equals = false;
if (getClass().isInstance(obj)) {
- Label otherLabel = (Label) obj;
+ AbstractLink otherLabel = (AbstractLink) obj;
equals = getLabel().equals(otherLabel.getLabel())
&& getLanguage().equals(otherLabel.getLanguage());
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java?view=diff&rev=452400&r1=452399&r2=452400
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/simple/SimpleLink.java Tue Oct 3 03:21:39 2006
@@ -18,12 +18,12 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentFactory;
-import org.apache.lenya.cms.site.Label;
+import org.apache.lenya.cms.site.AbstractLink;
/**
* Link for SimpleSiteManager.
*/
-public class SimpleLink extends Label {
+public class SimpleLink extends AbstractLink {
protected SimpleLink(DocumentFactory factory, SimpleSiteNode node, String _label, String language) {
super(factory, node, _label, language);
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeLink.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeLink.java?view=diff&rev=452400&r1=452399&r2=452400
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeLink.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeLink.java Tue Oct 3 03:21:39 2006
@@ -17,7 +17,7 @@
package org.apache.lenya.cms.site.tree;
import org.apache.lenya.cms.publication.DocumentFactory;
-import org.apache.lenya.cms.site.Label;
+import org.apache.lenya.cms.site.AbstractLink;
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.xml.DocumentHelper;
import org.w3c.dom.Element;
@@ -25,7 +25,7 @@
/**
* SiteTree link.
*/
-public class SiteTreeLink extends Label {
+public class SiteTreeLink extends AbstractLink {
protected SiteTreeLink(DocumentFactory factory, SiteNode node, String _label, String _language,
Element element) {
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java?view=diff&rev=452400&r1=452399&r2=452400
==============================================================================
--- 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 Tue Oct 3 03:21:39 2006
@@ -29,7 +29,6 @@
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.repository.RepositoryItemFactory;
import org.apache.lenya.cms.site.AbstractSiteManager;
-import org.apache.lenya.cms.site.Label;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteException;
@@ -283,8 +282,8 @@
* @return A label.
* @throws SiteException if an error occurs.
*/
- protected Label getLabelObject(Document document) throws SiteException {
- Label label = null;
+ protected Link getLabelObject(Document document) throws SiteException {
+ Link label = null;
SiteTree siteTree = getTree(document);
if (siteTree != null) {
SiteTreeNode node = (SiteTreeNode) siteTree.getByUuid(document.getUUID(),
@@ -292,7 +291,7 @@
if (node == null) {
throw new SiteException("Node for document [" + document + "] does not exist!");
}
- label = (Label) node.getLink(document.getLanguage());
+ label = (Link) node.getLink(document.getLanguage());
}
if (label == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org