Author: tmortagne
Date: 2007-12-21 14:32:53 +0100 (Fri, 21 Dec 2007)
New Revision: 6449
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/ApplicationManagerPluginApi.java
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/plugin/XWikiPluginMessageTool.java
Log:
Add a constructor to XWikiPluginMessageTool.
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-12-20 23:32:16 UTC (rev 6448)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManager.java
2007-12-21 13:32:53 UTC (rev 6449)
@@ -53,6 +53,11 @@
final class ApplicationManager implements XWikiDocChangeNotificationInterface
{
/**
+ * Key to use with [EMAIL PROTECTED] XWikiContext#get(Object)}.
+ */
+ public static final String MESSAGETOOL_CONTEXT_KEY =
"applicationmanagermessagetool";
+
+ /**
* The logging tool.
*/
protected static final Log LOG =
LogFactory.getLog(ApplicationManager.class);
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManagerPluginApi.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManagerPluginApi.java
2007-12-20 23:32:16 UTC (rev 6448)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/ApplicationManagerPluginApi.java
2007-12-21 13:32:53 UTC (rev 6449)
@@ -25,7 +25,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import java.util.ResourceBundle;
import com.xpn.xwiki.plugin.applicationmanager.core.api.XWikiExceptionApi;
import
com.xpn.xwiki.plugin.applicationmanager.core.plugin.XWikiPluginMessageTool;
@@ -94,9 +93,8 @@
// Message Tool
Locale locale = (Locale) context.get("locale");
- ResourceBundle bundle =
- ResourceBundle.getBundle(getPlugin().getName() +
"/ApplicationResources", locale);
- this.messageTool = new XWikiPluginMessageTool(bundle, context);
+ this.messageTool = new XWikiPluginMessageTool(locale, plugin, context);
+ context.put(ApplicationManager.MESSAGETOOL_CONTEXT_KEY,
this.messageTool);
}
/**
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/plugin/XWikiPluginMessageTool.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/plugin/XWikiPluginMessageTool.java
2007-12-20 23:32:16 UTC (rev 6448)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/plugin/XWikiPluginMessageTool.java
2007-12-21 13:32:53 UTC (rev 6449)
@@ -2,10 +2,13 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Arrays;
import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.plugin.XWikiPluginInterface;
+
import com.xpn.xwiki.web.XWikiMessageTool;
/**
@@ -16,14 +19,15 @@
public class XWikiPluginMessageTool extends XWikiMessageTool
{
/**
- * @param bundle the default Resource Bundle to fall back to if no
document bundle is found when
- * trying to get a key
+ * @param locale the locale.
+ * @param plugin the plugin.
* @param context the [EMAIL PROTECTED] com.xpn.xwiki.XWikiContext}
object, used to get access to XWiki
* primitives for loading documents
*/
- public XWikiPluginMessageTool(ResourceBundle bundle, XWikiContext context)
+ public XWikiPluginMessageTool(Locale locale, XWikiPluginInterface plugin,
XWikiContext context)
{
- super(bundle, context);
+ this(ResourceBundle.getBundle(plugin.getName() +
"/ApplicationResources", locale == null
+ ? Locale.ENGLISH : locale), context);
}
/**
@@ -32,10 +36,21 @@
*/
public XWikiPluginMessageTool(ResourceBundle bundle)
{
- super(bundle, null);
+ this(bundle, null);
}
/**
+ * @param bundle the default Resource Bundle to fall back to if no
document bundle is found when
+ * trying to get a key
+ * @param context the [EMAIL PROTECTED] com.xpn.xwiki.XWikiContext}
object, used to get access to XWiki
+ * primitives for loading documents
+ */
+ public XWikiPluginMessageTool(ResourceBundle bundle, XWikiContext context)
+ {
+ super(bundle, context);
+ }
+
+ /**
* [EMAIL PROTECTED]
* <p>
* Start calling <code>context</code>'s [EMAIL PROTECTED]
XWikiMessageTool#get(String)} then if nothing
@@ -46,7 +61,7 @@
protected String getTranslation(String key)
{
String translation = key;
-
+
if (context != null) {
translation = this.context.getMessageTool().get(key);
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
