[portal-commits] JBoss Portal SVN: r11171 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/impl/model/content/generic and 2 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-06-27 10:48:49 -0400 (Fri, 27 Jun 2008) New Revision: 11171 Modified: branches/JBoss_Portal_Branch_2_7/api/src/main/org/jboss/portal/api/content/SelectedContent.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java Log: - Make content framework parameters cleaner Modified: branches/JBoss_Portal_Branch_2_7/api/src/main/org/jboss/portal/api/content/SelectedContent.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/api/src/main/org/jboss/portal/api/content/SelectedContent.java 2008-06-27 13:08:10 UTC (rev 11170) +++ branches/JBoss_Portal_Branch_2_7/api/src/main/org/jboss/portal/api/content/SelectedContent.java 2008-06-27 14:48:49 UTC (rev 11171) @@ -53,16 +53,5 @@ { return parameters; } - - public static String encode(String key, String value) - { - return key + "__EQUALS__" + value; - } - - public static String[] decode(String encoded) - { - String[] foo = encoded.split("__EQUALS__"); - return foo; - } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-06-27 13:08:10 UTC (rev 11170) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-06-27 14:48:49 UTC (rev 11171) @@ -42,6 +42,7 @@ import org.jboss.portal.core.model.portal.content.ContentRendererContext; import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.identity.User; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; @@ -237,16 +238,19 @@ } if (id_parameters != null) { - List<String> encodedParams = new ArrayList<String>(); + List<String> paramNames = new ArrayList<String>(); Iterator<String> params = content.getParameterNames(); + ParameterMap parameterMap2 = new ParameterMap(); while (params.hasNext()) { String name = params.next(); String value = content.getParameter(name); - encodedParams.add(SelectedContent.encode(name, value)); + parameterMap2.put(id_parameters + "." + name, new String[]{value}); + paramNames.add(name); } + invocation.setNavigationalState(ParametersStateString.create(parameterMap2)); - parameterMap.put(id_parameters, encodedParams.toArray(new String[encodedParams.size()])); + parameterMap.put(id_parameters, paramNames.toArray(new String[paramNames.size()])); } invocation.setPublicNavigationalState(parameterMap); } Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java 2008-06-27 13:08:10 UTC (rev 11170) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java 2008-06-27 14:48:49 UTC (rev 11171) @@ -146,14 +146,13 @@ Map<String, String> parametersMap = new HashMap<String, String>(); - String[] parameters = req.getParameterValues("parameters"); - if (parameters != null) + String[] parametersNames = req.getParameterValues("parameters"); + if (parametersNames != null) { - for (String encoded: parameters) + for (String parameterName: parametersNames) { - String[] decodedValue = SelectedContent.decode(encoded); - String value = (decodedValue.length == 2) ? decodedValue[1] : ""; - parametersMap.put(decodedValue[0], value); + String[] value = req.getParameterValues("parameters." + parameterName); + parametersMap.put(parameterName, value[0]); } } Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java 2008-06-27 13:08:10 UTC (rev 11170) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java 2008-06-27 14:48:49 UTC (rev 11171) @@ -188,14 +188,13 @@ Map<String, String> parametersMap = new HashMap<String, String>(); - String[] parameters = req.getParameterValues("parameters"); - if (parameters != null) + String[] parametersNames = req.getParameterValues("parameters"); + if (parametersNames != null) { - for (String encoded: parameters) + for (String parameterName: parametersNames) { - String[] decodedValue = SelectedContent.decode(encoded); - String value = (decodedValue.length == 2) ? decodedValue[1] : ""; - parametersMap.put(decodedValue[0], value); + String[] value = req.getParameterValues("parameters." + parameterName); + parametersMap.put(parameterName, value[0]); } }