[portal-commits] JBoss Portal SVN: r8124 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance.
Author: thomas.heute(a)jboss.com
Date: 2007-08-31 08:42:31 -0400 (Fri, 31 Aug 2007)
New Revision: 8124
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java
Log:
RenderPortletInstanceCommand was left out from the InstanceURLFactory (problem enountered
by Emanuel while trying to use it with non-logged in users)
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31
12:30:35 UTC (rev 8123)
+++
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31
12:42:31 UTC (rev 8124)
@@ -27,11 +27,13 @@
import org.jboss.portal.core.controller.ControllerContext;
import
org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand;
import
org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand;
+import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand;
import org.jboss.portal.core.model.instance.command.PortletInstanceCommand;
import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.AbstractServerURL;
import org.jboss.portal.portlet.impl.PortletRequestEncoder;
+import org.jboss.util.NotImplementedException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -45,7 +47,7 @@
/** . */
private String instanceId;
-
+
public String getPath()
{
return path;
@@ -87,12 +89,22 @@
PortletRequestEncoder encoder = new
PortletRequestEncoder(url.getParameterMap());
encoder.encodeRender(iprc.getNavigationalState(), null, null);
}
- else
+ else if (cmd instanceof RenderPortletInstanceCommand)
{
+ RenderPortletInstanceCommand rpic = (RenderPortletInstanceCommand)cmd;
+ PortletRequestEncoder encoder = new
PortletRequestEncoder(url.getParameterMap());
+ encoder.encodeRender(rpic.getNavigationalState(), null, null);
+ }
+ else if (cmd instanceof InvokePortletInstanceActionCommand)
+ {
InvokePortletInstanceActionCommand iprc =
(InvokePortletInstanceActionCommand)cmd;
PortletRequestEncoder encoder = new
PortletRequestEncoder(url.getParameterMap());
encoder.encodeAction(iprc.getNavigationalState(),
iprc.getInteractionState(), null, null);
}
+ else
+ {
+ throw new NotImplementedException(cmd + "is an unknown sub-class of
PortletInstanceCommand");
+ }
return url;
}