r1285 - in xwiki/trunk/src/main/java/com/xpn/xwiki: . doc

[Jeremi Joslin]

Author: jeremi
Date: 2006-09-05 19:07:22 +0200 (Tue, 05 Sep 2006)
New Revision: 1285

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
Log:
* Fix the rename page to load the content of the document before.
* rename in XWikiDocument the function renameDocument to copyDocument because it doesn't do a rename.

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-05 14:32:13 UTC (rev 1284)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-09-05 17:07:22 UTC (rev 1285)
@@ -3916,7 +3916,7 @@
     }
 
     public XWikiDocument renamePage(XWikiDocument doc, String newFullName, XWikiContext context) throws XWikiException {
-        XWikiDocument renamedDoc = doc.renameDocument(newFullName, context);
+        XWikiDocument renamedDoc = doc.copyDocument(newFullName, context);
         saveDocument(renamedDoc, context);
         deleteDocument(doc, context);
         refreshLinks(context);

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-09-05 14:32:13 UTC (rev 1284)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-09-05 17:07:22 UTC (rev 1285)
@@ -2322,6 +2322,7 @@
     }
 
     /**
+     * @deprecated {@link #copyDocument(String docname, XWikiContext context)}
      * Only do a copy and not a renaming
      * @param docname
      * @param context
@@ -2329,7 +2330,15 @@
      * @throws XWikiException
      */
     public XWikiDocument renameDocument(String docname, XWikiContext context) throws XWikiException {
+        return copyDocument(docname, context);
+    }
+
+    public XWikiDocument copyDocument(String docname, XWikiContext context) throws XWikiException {
         String oldname = getFullName();
+
+        loadAttachments(context);
+        loadArchive(context);
+
         if (oldname.equals(docname))
             return this;