Author: julien(a)jboss.com Date: 2008-04-13 13:51:14 -0400 (Sun, 13 Apr 2008) New Revision: 10558 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PublicParametersPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java Log: fine tune the public render parameter sample still need to add demonstration using render url Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-13 17:33:04 UTC (rev 10557) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-04-13 17:51:14 UTC (rev 10558) @@ -344,9 +344,12 @@ } // - if (pageUpdates != null) + if (pageUpdates == null) { - pageUpdates.put(name, REMOVAL); + pageUpdates = new HashMap<QName, String[]>(); } + + // + pageUpdates.put(name, REMOVAL); } } Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PublicParametersPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PublicParametersPortlet.java 2008-04-13 17:33:04 UTC (rev 10557) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/PublicParametersPortlet.java 2008-04-13 17:51:14 UTC (rev 10558) @@ -62,7 +62,7 @@ // if (parameterValue.length() > 0) { - if (publicValues == null && !publicValues[0].equals(parameterValue)) + if (publicValues == null || !publicValues[0].equals(parameterValue)) { resp.setRenderParameter(parameterName, parameterValue); } @@ -95,11 +95,11 @@ if (parameterValue != null) { - writer.print("<input type=\"text\" width=\"36\" value=\"" + parameterValue + "\"/>"); + writer.print("<input type=\"text\" name=\"" + parameterName + "\" width=\"36\" value=\"" + parameterValue + "\"/>"); } else { - writer.print("<input type=\"text\" width=\"36\" value=\"\"/>"); + writer.print("<input type=\"text\" name=\"" + parameterName + "\" width=\"36\" value=\"\"/>"); } writer.println(); Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-04-13 17:33:04 UTC (rev 10557) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-04-13 17:51:14 UTC (rev 10558) @@ -323,6 +323,27 @@ <height>0</height> </window> </page> + <page> + <page-name>public parameters test</page-name> + <window> + <window-name>PublicParametersPortletWindow1</window-name> + <instance-ref>PublicParametersPortletInstance1</instance-ref> + <region>left</region> + <height>0</height> + </window> + <window> + <window-name>PublicParametersPortletWindow2</window-name> + <instance-ref>PublicParametersPortletInstance2</instance-ref> + <region>center</region> + <height>0</height> + </window> + <window> + <window-name>PublicParametersPortletWindow3</window-name> + <instance-ref>PublicParametersPortletInstance3</instance-ref> + <region>center</region> + <height>1</height> + </window> + </page> </page> </deployment> <deployment>