Author: tmortagne
Date: 2007-10-09 15:19:07 +0200 (Tue, 09 Oct 2007)
New Revision: 5330

Modified:
   
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1795: Make Document.saveDocument() protected and add a protected 
Document.deleteDocument().

Modified: 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-09 13:18:53 UTC (rev 5329)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-09 13:19:07 UTC (rev 5330)
@@ -1495,7 +1495,7 @@
         }
     }
 
-    private void saveDocument(String comment) throws XWikiException
+    protected void saveDocument(String comment) throws XWikiException
     {
         XWikiDocument doc = getDoc();
         doc.setAuthor(context.getUser());
@@ -1591,11 +1591,21 @@
         return getDoc().removeObjects(className);
     }
 
+    /**
+     * Remove document from the wiki. Reinit <code>cloned</code>.
+     * 
+     * @throws XWikiException
+     */
+    protected void deleteDocument() throws XWikiException
+    {
+        getXWikiContext().getWiki().deleteDocument(getDocument(), 
getXWikiContext());
+        cloned = false;
+    }
+    
     public void delete() throws XWikiException
     {
         if (hasAccessLevel("delete")) {
-            getXWikiContext().getWiki().deleteDocument(getDocument(), 
getXWikiContext());
-            cloned = false;
+            deleteDocument();
         } else {
             java.lang.Object[] args = {doc.getFullName()};
             throw new XWikiException(XWikiException.MODULE_XWIKI_ACCESS,
@@ -1607,8 +1617,7 @@
     public void deleteWithProgrammingRights() throws XWikiException
     {
         if (hasProgrammingRights()) {
-            getXWikiContext().getWiki().deleteDocument(getDocument(), 
getXWikiContext());
-            cloned = false;
+            deleteDocument();
         } else {
             java.lang.Object[] args = {doc.getFullName()};
             throw new XWikiException(XWikiException.MODULE_XWIKI_ACCESS,

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to