Author: tmortagne
Date: 2007-10-09 15:24:49 +0200 (Tue, 09 Oct 2007)
New Revision: 5331
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
Log:
XAAM-16: Just DefaultSuperDocument.save is overwritten adding a "isNew =
false". Use XWIKI-1795 to correctly overwrite deleteDocument and saveDocument.
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java
2007-10-09 13:19:07 UTC (rev 5330)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java
2007-10-09 13:24:49 UTC (rev 5331)
@@ -142,7 +142,7 @@
{
XWikiApplication app = getApplication(appName, context, true);
- app.delete(context);
+ app.delete();
}
public XWikiApplication getApplication(String appName, XWikiContext
context, boolean validate)
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
2007-10-09 13:19:07 UTC (rev 5330)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
2007-10-09 13:24:49 UTC (rev 5331)
@@ -128,19 +128,23 @@
{
return super.isNew() || this.isNew;
}
-
+
/**
- * [EMAIL PROTECTED]
- *
- * @see com.xpn.xwiki.util.SuperDocument#save(com.xpn.xwiki.XWikiContext)
+ * @param comment
+ * @throws XWikiException
*/
- public void save() throws XWikiException
+ protected void saveDocument(String comment) throws XWikiException
{
- super.save();
+ super.save(comment);
this.isNew = false;
}
- public void delete(XWikiContext context) throws XWikiException
+ /**
+ * [EMAIL PROTECTED]
+ *
+ * @see com.xpn.xwiki.api.Document#deleteDocument()
+ */
+ protected void deleteDocument() throws XWikiException
{
super.delete();
this.isNew = true;
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2007-10-09 13:19:07 UTC (rev 5330)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2007-10-09 13:24:49 UTC (rev 5331)
@@ -489,7 +489,7 @@
* <p>
* Only delete the wiki descriptor the corresponding database always exist
after delete.
*
- * @param wikiNameToDelete the name of te wiki to delete.
+ * @param wikiNameToDelete the name of the wiki to delete.
* @param context the XWiki context.
* @throws XWikiException
*/
@@ -497,7 +497,7 @@
{
XWikiServer doc = getWiki(wikiNameToDelete, context, true);
- doc.delete(context);
+ doc.delete();
}
/**
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
2007-10-09 13:19:07 UTC (rev 5330)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
2007-10-09 13:24:49 UTC (rev 5331)
@@ -36,11 +36,6 @@
super(XWikiServerClass.getInstance(context), xdoc, context);
}
- public void delete() throws XWikiException
- {
- super.delete(context);
- }
-
public String getWikiName()
{
return sclass.getItemDefaultName(getFullName(), context);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
