You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/05/14 17:11:14 UTC
svn commit: r170142 -
/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
Author: jwkaltz
Date: Sat May 14 08:11:14 2005
New Revision: 170142
URL: http://svn.apache.org/viewcvs?rev=170142&view=rev
Log:
[minor change] remove dependency on new document instance
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java?rev=170142&r1=170141&r2=170142&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java Sat May 14 08:11:14 2005
@@ -204,7 +204,7 @@
documentType = documentTypeBuilder.buildDocumentType(documentTypeName, publication);
String parentId = "";
- Document parentDocument = getParentDocument(document);
+ Document parentDocument = getParentDocument();
if (parentDocument != null)
parentId = parentDocument.getId().substring(1);
@@ -239,11 +239,11 @@
protected abstract String getNewDocumentId();
/**
- * @param newDocument the new document being created in the usecase
- * @return the new document's parent
+ * Determine the parent document of the document being created by this usecase
+ * @return the parent document
* @throws DocumentBuildException if an error occurs.
*/
- protected abstract Document getParentDocument(Document newDocument) throws DocumentBuildException;
+ protected abstract Document getParentDocument() throws DocumentBuildException;
/**
* If there is a reference document from which to copy contents,
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java?rev=170142&r1=170141&r2=170142&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java Sat May 14 08:11:14 2005
@@ -89,11 +89,10 @@
}
/**
- * In this usecase, the parent document is simply the source
- * document the usecase was invoked upon.
- * @see Create#getParentDocument(Document)
+ * In this usecase, the parent document is simply the source document the usecase was invoked upon.
+ * @see Create#getParentDocument()
*/
- protected Document getParentDocument(Document newDocument) throws DocumentBuildException {
+ protected Document getParentDocument() throws DocumentBuildException {
return getSourceDocument();
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java?rev=170142&r1=170141&r2=170142&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateLanguage.java Sat May 14 08:11:14 2005
@@ -117,13 +117,12 @@
}
/**
- * The parent document is retrieved via the new document's
- * identity map.
- * @see Create#getParentDocument(Document)
+ * For new language version, the parent document is the same as for the document the usecase is called on
+ * @see Create#getParentDocument()
*/
- protected Document getParentDocument(Document newDocument) throws DocumentBuildException {
- DocumentIdentityMap documentMap = newDocument.getIdentityMap();
- Document parent = documentMap.getParent(newDocument);
+ protected Document getParentDocument() throws DocumentBuildException {
+ DocumentIdentityMap documentMap = getSourceDocument().getIdentityMap();
+ Document parent = documentMap.getParent(getSourceDocument());
return parent;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org