You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by jm...@apache.org on 2005/04/11 21:09:22 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver PortletURLProviderImpl.java
jmacna 2005/04/11 12:09:22
Modified: src/org/apache/wsrp4j/producer/provider/pluto/driver
PortletURLProviderImpl.java
Log:
Fixes WSRP4J-54: PortletURLProviderImpl incorrectly assumes current
mode is always view mode and current state is always normal
Revision Changes Path
1.4 +16 -6 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletURLProviderImpl.java 9 Mar 2004 21:42:09 -0000 1.3
+++ PortletURLProviderImpl.java 11 Apr 2005 19:09:22 -0000 1.4
@@ -179,7 +179,8 @@
if (mode == null)
{
- mode = PortletMode.VIEW;
+ //WSRP4J-54 missing view is ok, retain current mode
+ //mode = PortletMode.VIEW;
if (logger.isLogging(Logger.TRACE_HIGH))
{
logger.text(Logger.TRACE_HIGH, "toString()", "PortletMode is null. Setting portlet mode to 'view'");
@@ -188,7 +189,8 @@
if (state == null)
{
- state = WindowState.NORMAL;
+ // WSRP4J-54 missing state is ok, portlet will retain current state
+ //state = WindowState.NORMAL;
if (logger.isLogging(Logger.TRACE_HIGH))
{
@@ -223,10 +225,14 @@
url =
urlComposer.createBlockingActionURL(
- "wsrp:" + mode.toString(),
+ //WSRP4J-54
+ //"wsrp:" + mode.toString(),
+ (mode != null) ? "wsrp:" + mode.toString() : null,
null,
actionStateStr,
- "wsrp:" + state.toString(),
+ //WSRP4J-54
+ //"wsrp:" + state.toString(),
+ (state != null) ? "wsrp:" + state.toString() : null,
this.secure,
this.runtimeContext,
this.portletContext,
@@ -251,9 +257,13 @@
url =
urlComposer.createRenderURL(
- "wsrp:" + mode.toString(),
+ //WSRP4J-54
+ //"wsrp:" + mode.toString(),
+ (mode != null) ? "wsrp:" + mode.toString() : null,
naviStateStr,
- "wsrp:" + state.toString(),
+ //WSRP4J-54
+ //"wsrp:" + state.toString(),
+ (state != null) ? "wsrp:" + state.toString() : null,
this.secure,
this.runtimeContext,
this.portletContext,