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 2005/03/07 23:17:24 UTC

svn commit: r156458 - lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java

Author: andreas
Date: Mon Mar  7 14:17:23 2005
New Revision: 156458

URL: http://svn.apache.org/viewcvs?view=rev&rev=156458
Log:
delete: use unique document ID in trash area

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java?view=diff&r1=156457&r2=156458
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Delete.java Mon Mar  7 14:17:23 2005
@@ -21,6 +21,7 @@
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.publication.util.DocumentHelper;
 import org.apache.lenya.cms.publication.util.DocumentSet;
+import org.apache.lenya.cms.publication.util.UniqueDocumentId;
 import org.apache.lenya.cms.site.SiteManager;
 import org.apache.lenya.cms.usecase.DocumentUsecase;
 
@@ -44,7 +45,7 @@
         if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
             addErrorMessage("This usecase can only be invoked in the authoring area!");
         }
-        
+
         Document document = getSourceDocument();
         DocumentIdentityMap identityMap = getUnitOfWork().getIdentityMap();
         SiteManager manager = document.getPublication().getSiteManager(identityMap);
@@ -52,7 +53,8 @@
         set.add(document);
         Document[] documents = set.getDocuments();
         for (int i = 0; i < documents.length; i++) {
-            Document liveVersion = identityMap.getFactory().getAreaVersion(documents[i], Publication.LIVE_AREA);
+            Document liveVersion = identityMap.getFactory().getAreaVersion(documents[i],
+                    Publication.LIVE_AREA);
             if (liveVersion.exists()) {
                 addErrorMessage("Cannot delete because document [" + liveVersion + "] is live!");
             }
@@ -68,11 +70,15 @@
         Document source = getSourceDocument();
         DocumentIdentityMap identityMap = source.getIdentityMap();
 
-        Document target = identityMap.getFactory().getAreaVersion(source, Publication.TRASH_AREA);
+        String desiredId = "/" + source.getName();
+        UniqueDocumentId helper = new UniqueDocumentId();
+        String availableId = helper.computeUniqueDocumentId(source.getPublication(),
+                Publication.TRASH_AREA,
+                desiredId);
+        Document target = identityMap.getFactory().get(Publication.TRASH_AREA, availableId);
         getDocumentManager().moveAll(source, target);
 
-        Document parent = source.getIdentityMap().getFactory().getParent(source, "/index");
-        setTargetDocument(DocumentHelper.getExistingLanguageVersion(parent));
+        setTargetDocument(target);
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org