Author: tmortagne
Date: 2007-10-10 11:53:02 +0200 (Wed, 10 Oct 2007)
New Revision: 5342
Added:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/applicationmanager/
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/applicationmanager/ApplicationResources.properties
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/WikiManagerPluginApi.java
Log:
XAWM-21: Add internationnalised comments to plugin's actions that support
comments (Document.save, XWiki.saveDocument, etc) using XAAM-17
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-10 09:51:53 UTC (rev 5341)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2007-10-10 09:53:02 UTC (rev 5342)
@@ -84,14 +84,14 @@
* @throws XWikiException
* @see com.xpn.xwiki.XWiki#saveDocument(XWikiDocument, XWikiContext)
*/
- public void saveDocument(String wikiName, XWikiDocument doc, XWikiContext
context)
+ public void saveDocument(String wikiName, XWikiDocument doc, String
comment, XWikiContext context)
throws XWikiException
{
String database = context.getDatabase();
try {
context.setDatabase(wikiName);
- context.getWiki().saveDocument(doc, context);
+ context.getWiki().saveDocument(doc, comment, context);
} finally {
context.setDatabase(database);
}
@@ -221,7 +221,7 @@
}
private void copyWiki(String sourceWiki, String targetWiki, String
language,
- XWikiContext context) throws XWikiException
+ String comment, XWikiContext context) throws XWikiException
{
XWiki xwiki = context.getWiki();
@@ -270,9 +270,9 @@
* @see #createNewWikiFromTemplate(XWikiServer, String, boolean,
XWikiContext)
*/
public XWikiServer createNewWikiFromPackage(XWikiServer userWikiSuperDoc,
String packageName,
- boolean failOnExist, XWikiContext context) throws XWikiException
+ boolean failOnExist, String comment, XWikiContext context) throws
XWikiException
{
- return createNewWiki(userWikiSuperDoc, failOnExist, null, packageName,
context);
+ return createNewWiki(userWikiSuperDoc, failOnExist, null, packageName,
comment, context);
}
/**
@@ -290,9 +290,9 @@
* @see #createNewWikiFromPackage(XWikiServer, String, boolean,
XWikiContext)
*/
public XWikiServer createNewWikiFromTemplate(XWikiServer userWikiSuperDoc,
- String templateWikiName, boolean failOnExist, XWikiContext context)
throws XWikiException
+ String templateWikiName, boolean failOnExist, String comment,
XWikiContext context) throws XWikiException
{
- return createNewWiki(userWikiSuperDoc, failOnExist, templateWikiName,
null, context);
+ return createNewWiki(userWikiSuperDoc, failOnExist, templateWikiName,
null, comment, context);
}
/**
@@ -307,13 +307,13 @@
* @throws XWikiException
*/
public XWikiServer createNewWiki(XWikiServer userWikiSuperDoc, boolean
failOnExist,
- XWikiContext context) throws XWikiException
+ String comment, XWikiContext context) throws XWikiException
{
- return createNewWiki(userWikiSuperDoc, failOnExist, null, null,
context);
+ return createNewWiki(userWikiSuperDoc, failOnExist, null, null,
comment, context);
}
private XWikiServer createNewWiki(XWikiServer userWikiSuperDoc, boolean
failOnExist,
- String templateWikiName, String packageName, XWikiContext context)
throws XWikiException
+ String templateWikiName, String packageName, String comment,
XWikiContext context) throws XWikiException
{
if (userWikiSuperDoc.getOwner().length() == 0)
throw new
WikiManagerException(WikiManagerException.ERROR_XWIKI_USER_INACTIVE,
@@ -435,7 +435,7 @@
// Copy base wiki
if (templateWikiName != null) {
- copyWiki(templateWikiName, newWikiName, language, context);
+ copyWiki(templateWikiName, newWikiName, language, comment,
context);
}
if (packageName != null) {
@@ -476,7 +476,7 @@
// Return to root database
context.setDatabase(context.getMainXWiki());
- wikiSuperDocToSave.save();
+ wikiSuperDocToSave.save(comment);
return wikiSuperDocToSave;
} finally {
@@ -626,12 +626,12 @@
* @throws XWikiException
*/
public void createWikiTemplate(XWikiServer wikiSuperDocument, String
packageName,
- XWikiContext context) throws XWikiException
+ String comment, XWikiContext context) throws XWikiException
{
wikiSuperDocument.setVisibility(XWikiServerClass.FIELDL_visibility_template);
// Create empty wiki
WikiManager.getInstance().createNewWikiFromPackage(wikiSuperDocument,
packageName, false,
- context);
+ comment, context);
}
}
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-10 09:51:53 UTC (rev 5341)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-10 09:53:02 UTC (rev 5342)
@@ -21,6 +21,7 @@
package com.xpn.xwiki.plugin.wikimanager;
import com.xpn.xwiki.plugin.applicationmanager.core.api.XWikiExceptionApi;
+import
com.xpn.xwiki.plugin.applicationmanager.core.plugin.XWikiPluginMessageTool;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.plugin.PluginApi;
import com.xpn.xwiki.plugin.wikimanager.doc.XWikiServer;
@@ -32,6 +33,8 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,6 +50,8 @@
protected static final Log LOG =
LogFactory.getLog(WikiManagerPluginApi.class);
private XWikiExceptionApi defaultException;
+
+ private XWikiPluginMessageTool messageTool;
public WikiManagerPluginApi(WikiManagerPlugin plugin, XWikiContext context)
{
@@ -54,6 +59,12 @@
this.defaultException =
new XWikiExceptionApi(WikiManagerException.getDefaultException(),
this.context);
+
+ // Message Tool
+ Locale locale = (Locale) context.get("locale");
+ ResourceBundle bundle =
+ ResourceBundle.getBundle(getPlugin().getName() +
"/ApplicationResources", locale);
+ this.messageTool = new XWikiPluginMessageTool(bundle, context);
}
public XWikiExceptionApi getDefaultException()
@@ -86,11 +97,11 @@
try {
if (templateWiki != null)
-
WikiManager.getInstance().createNewWikiFromTemplate(wikiSuperDocument,
templateWiki, failOnExist, this.context);
+
WikiManager.getInstance().createNewWikiFromTemplate(wikiSuperDocument,
templateWiki, failOnExist,
this.messageTool.get("wikimanager.plugin.createwikifromtemplate.comment", new
String[] {wikiname, templateWiki}), this.context);
else if (pkg != null)
-
WikiManager.getInstance().createNewWikiFromPackage(wikiSuperDocument, pkg,
failOnExist, this.context);
+
WikiManager.getInstance().createNewWikiFromPackage(wikiSuperDocument, pkg,
failOnExist,
this.messageTool.get("wikimanager.plugin.createwikifrompackage.comment", new
String[] {wikiname, pkg}), this.context);
else
- WikiManager.getInstance().createNewWiki(wikiSuperDocument,
failOnExist, this.context);
+ WikiManager.getInstance().createNewWiki(wikiSuperDocument,
failOnExist, this.messageTool.get("wikimanager.plugin.createwiki.comment",
wikiname), this.context);
} catch (WikiManagerException e) {
LOG.error("Try to create wiki \"" + wikiSuperDocument + "\"", e);
@@ -260,7 +271,7 @@
wikiSuperDocument.setOwner(this.context.getUser());
try {
- WikiManager.getInstance().createWikiTemplate(wikiSuperDocument,
packageName,
+ WikiManager.getInstance().createWikiTemplate(wikiSuperDocument,
packageName,
this.messageTool.get("wikimanager.plugin.createwikitemplate.comment", new
String[] {templateName, packageName}),
this.context);
} catch (WikiManagerException e) {
LOG.error("Try to create wiki template \"" + wikiSuperDocument +
"\"", e);
Added:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/applicationmanager/ApplicationResources.properties
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/applicationmanager/ApplicationResources.properties
(rev 0)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/resources/applicationmanager/ApplicationResources.properties
2007-10-10 09:53:02 UTC (rev 5342)
@@ -0,0 +1,4 @@
+wikimanager.plugin.createwiki.comment=create wiki \"{0}\"
+wikimanager.plugin.createwikifromtemplate.comment=import wiki \"{0}\" from
wiki template \"{1}\"
+wikimanager.plugin.createwikifrompackage.comment=reload wiki \"{0}\" from
package \"{1}\"
+wikimanager.plugin.createwikitemplate.comment=create wiki template \"{0}\"
from package \"{1}\"
\ No newline at end of file
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
