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/12 17:37:08 UTC
svn commit: r169835 - in /lenya/trunk/src/java/org/apache/lenya/cms:
publication/DefaultDocument.java site/usecases/DeleteLanguage.java
Author: jwkaltz
Date: Thu May 12 08:37:08 2005
New Revision: 169835
URL: http://svn.apache.org/viewcvs?rev=169835&view=rev
Log:
deleting language version: lock objects, delete meta source as well
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java?rev=169835&r1=169834&r2=169835&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java Thu May 12 08:37:08 2005
@@ -450,6 +450,7 @@
public void delete() throws DocumentException {
try {
SourceUtil.delete(getSourceURI(), this.manager);
+ SourceUtil.delete(getMetaSourceURI(), this.manager);
if (getArea().equals(Publication.AUTHORING_AREA)) {
SourceUtil.delete(getHistory().getSourceURI(), this.manager);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?rev=169835&r1=169834&r2=169835&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Thu May 12 08:37:08 2005
@@ -16,11 +16,17 @@
*/
package org.apache.lenya.cms.site.usecases;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.util.DocumentHelper;
import org.apache.lenya.cms.usecase.DocumentUsecase;
+import org.apache.lenya.cms.usecase.UsecaseException;
+import org.apache.lenya.transaction.Transactionable;
/**
* Delete a language version.
@@ -43,6 +49,20 @@
} else if (getSourceDocument().getLanguages().length == 1) {
addErrorMessage("The last language version cannot be removed.");
}
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#getObjectsToLock()
+ */
+ protected Transactionable[] getObjectsToLock() throws UsecaseException {
+ List nodes = new ArrayList();
+ Document doc = getSourceDocument();
+ try {
+ nodes.addAll(Arrays.asList(doc.getRepositoryNodes()));
+ } catch (Exception e) {
+ throw new UsecaseException(e);
+ }
+ return (Transactionable[]) nodes.toArray(new Transactionable[nodes.size()]);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org