You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/04/12 15:45:27 UTC
svn commit: r527939 - in /lenya/trunk/src:
impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
java/org/apache/lenya/cms/publication/Document.java
Author: andreas
Date: Thu Apr 12 06:45:19 2007
New Revision: 527939
URL: http://svn.apache.org/viewvc?view=rev&rev=527939
Log:
Removed obsolete Document.getId() method
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java?view=diff&rev=527939&r1=527938&r2=527939
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java Thu Apr 12 06:45:19 2007
@@ -153,15 +153,6 @@
}
/**
- * @see org.apache.lenya.cms.publication.Document#getId()
- */
- public String getId() {
- // throw new IllegalStateException("Use getUUID() or getPath()
- // instead");
- return this.identifier.getUUID();
- }
-
- /**
* @see org.apache.lenya.cms.publication.Document#getName()
*/
public String getName() {
@@ -354,7 +345,7 @@
public int hashCode() {
String key = getPublication().getId() + ":" + getPublication().getServletContext() + ":"
- + getArea() + ":" + getId() + ":" + getLanguage();
+ + getArea() + ":" + getUUID() + ":" + getLanguage();
return key.hashCode();
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java?view=diff&rev=527939&r1=527938&r2=527939
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java Thu Apr 12 06:45:19 2007
@@ -94,7 +94,7 @@
getLogger().warn(
"This attribute is deprecated."
+ " Use document-path or document-uuid instead!");
- value = document.getId();
+ value = document.getUUID();
} else if (name.equals(PageEnvelope.DOCUMENT_PARENT)) {
value = document.getLocator().getParent().getPath();
} else if (name.equals(PageEnvelope.DOCUMENT_NAME)) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java?view=diff&rev=527939&r1=527938&r2=527939
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java Thu Apr 12 06:45:19 2007
@@ -63,13 +63,6 @@
Date getExpires() throws DocumentException;
/**
- * Returns the document ID of this document.
- * @return the document-id of this document.
- * @deprecated use {@link #getUUID()} or {@link #getPath()}, respectively, instead.
- */
- String getId();
-
- /**
* Returns the document name of this document.
* @return the document-name of this document.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org