Author: dpillot
Date: Wed May 23 17:09:05 2007
New Revision: 17368
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17368&repname=
=3Djahia
Log:
fix for postfix related mre warnings
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm=
enus/GetMenuItemsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java&re=
v=3D17368&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java Wed May 23 17:09:05 2007
@@ -37,20 +37,18 @@
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.resourcebundle.JahiaResourceBundle;
=
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
+import java.util.*;
=
/**
* Gets the items of a specific Action Menu
*
- * @author Xavier Lawrence
+ * @version $Id: $
*/
public class GetMenuItemsAction extends AjaxAction {
=
@@ -247,7 +245,7 @@
final GuiBean gui =3D new GuiBean(jParams);
final HTMLToolBox box =3D new HTMLToolBox(gui, jParams);
final Map result =3D new HashMap();
-
+ final Locale locale=3DjParams.getLocale();
String domid =3D jParams.getParameter(DOMID);
String[] domidParams =3D domid.split(HTMLToolBox.ID_SEPARATOR);
//see HTMLToolBox.buildUniqueContentID() for param and ordering de=
tails
@@ -313,7 +311,11 @@
jParams.getSiteID()) > 0)) {
launchers.append(curActionURIBean.getLauncherUri()).append=
(DELIMITER);
=
- String name =3D box.getResource(resourceBundle, curActionU=
RIBean.getName() + namePostFix);
+ //check for the key and postfix without warnings
+ String name =3D "";
+ try {
+ name =3D JahiaResourceBundle.getString(ResourceBundle.=
getBundle(resourceBundle, locale), curActionURIBean.getName() + namePostFix=
, locale);
+ } catch (MissingResourceException mre) { name =3D null; }
if (name =3D=3D null || name.length() =3D=3D 0) {
name =3D box.getResource(resourceBundle, curActionURIB=
ean.getName());
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
