You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2005/02/18 06:10:53 UTC
svn commit: r154237 - in portals/pluto/trunk:
container/src/java/org/apache/pluto/tags/
testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/
Author: ddewolf
Date: Thu Feb 17 21:10:50 2005
New Revision: 154237
URL: http://svn.apache.org/viewcvs?view=rev&rev=154237
Log:
Updates for PLUTO-97 and PLUTO-43
-- PLUTO-97: Fix Tags to ensure that custom states work if declared. Thanks Eric Dalquist
-- PLUTO-42: Modify SimpleParameterTest.java to test for different keys (bug in test)
Modified:
portals/pluto/trunk/container/src/java/org/apache/pluto/tags/ActionURLTag.java
portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java
portals/pluto/trunk/container/src/java/org/apache/pluto/tags/RenderURLTag.java
portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/tags/ActionURLTag.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/org/apache/pluto/tags/ActionURLTag.java?view=diff&r1=154236&r2=154237
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/tags/ActionURLTag.java (original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/tags/ActionURLTag.java Thu Feb 17 21:10:50 2005
@@ -60,7 +60,8 @@
{
try
{
- url.setPortletMode((PortletMode)TEI.portletModes.get(portletMode.toUpperCase()));
+ PortletMode mode = new PortletMode(portletMode);
+ url.setPortletMode(mode);
}
catch (PortletModeException e)
{
@@ -71,7 +72,8 @@
{
try
{
- url.setWindowState((WindowState)TEI.definedWindowStates.get(windowState.toUpperCase()));
+ WindowState state = new WindowState(windowState);
+ url.setWindowState(state);
}
catch (WindowStateException e)
{
Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java?view=diff&r1=154236&r2=154237
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java (original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/tags/BasicURLTag.java Thu Feb 17 21:10:50 2005
@@ -45,63 +45,6 @@
public static class TEI extends TagExtraInfo
{
- public final static Hashtable definedWindowStates = getDefinedWindowStates();
- public final static Hashtable portletModes = getDefinedPortletModes();
-
- /**
- * Provides a list of all static PortletMode available in the specifications by
- * using introspection
- * @return Hashtable
- */
- private static Hashtable getDefinedPortletModes()
- {
- Hashtable portletModes = new Hashtable();
- Field[] f = PortletMode.class.getDeclaredFields();
-
- for (int i = 0; i < f.length; i++)
- {
- if (f[i].getType().isAssignableFrom(javax.portlet.PortletMode.class))
- {
- try
- {
- portletModes.put(f[i].get(f[i]).toString().toUpperCase(), f[i].get(f[i]));
- }
- catch (IllegalAccessException e)
- {
- }
- }
- }
-
- return portletModes;
- }
-
- /**
- * Provides a list of all static WindowsStates available in the specifications by
- * using introspection
- * @return Hashtable
- */
- private static Hashtable getDefinedWindowStates()
- {
- Hashtable definedWindowStates = new Hashtable();
- Field[] f = WindowState.class.getDeclaredFields();
-
- for (int i = 0; i < f.length; i++)
- {
- if (f[i].getType().isAssignableFrom(javax.portlet.WindowState.class))
- {
- try
- {
- definedWindowStates.put(f[i].get(f[i]).toString().toUpperCase(), f[i].get(f[i]));
- }
- catch (IllegalAccessException e)
- {
-
- }
- }
- }
- return definedWindowStates;
- }
-
public VariableInfo[] getVariableInfo(TagData tagData)
{
VariableInfo vi[] = null;
@@ -113,7 +56,6 @@
}
return vi;
}
-
}
protected String portletMode;
Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/tags/RenderURLTag.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/org/apache/pluto/tags/RenderURLTag.java?view=diff&r1=154236&r2=154237
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/tags/RenderURLTag.java (original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/tags/RenderURLTag.java Thu Feb 17 21:10:50 2005
@@ -61,7 +61,8 @@
{
try
{
- url.setPortletMode((PortletMode)TEI.portletModes.get(portletMode.toUpperCase()));
+ PortletMode mode = new PortletMode(portletMode);
+ url.setPortletMode(mode);
}
catch (PortletModeException e)
{
@@ -72,7 +73,8 @@
{
try
{
- url.setWindowState((WindowState)TEI.definedWindowStates.get(windowState.toUpperCase()));
+ WindowState state = new WindowState(windowState);
+ url.setWindowState(state);
}
catch (WindowStateException e)
{
Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java?view=diff&r1=154236&r2=154237
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java Thu Feb 17 21:10:50 2005
@@ -28,7 +28,7 @@
public static final String KEY = "org.apache.pluto.testsuite.PARAM_TEST_KEY";
public static final String VALUE = "org.apache.pluto.testsuite.PARAM_TEST_VALUE";
- private static final String IKEY = "org.apache.pluto.testsuite.PARAM_TEST_KEY";
+ private static final String IKEY = "org.apache.pluto.testsuite.PARAM_TEST_KEY_I";
public String getTestSuiteName() {
return "Simple Parameter Test";