[jboss-svn-commits] JBL Code SVN: r10759 - in labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper: url and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 4 10:34:14 EDT 2007
Author: adamw
Date: 2007-04-04 10:34:14 -0400 (Wed, 04 Apr 2007)
New Revision: 10759
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
Log:
Blog mapper
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java 2007-04-04 13:28:20 UTC (rev 10758)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java 2007-04-04 14:34:14 UTC (rev 10759)
@@ -19,7 +19,7 @@
*/
public abstract class AbstractProjectPortletDelegateCF extends AbstractPageDelegateCF {
public abstract String getPortletName();
- public abstract void fillParams(PathParser parser, Map<String, Object> params);
+ public abstract void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params);
public ControllerCommand doMapping(ServerInvocation invocation, String host,
String contextPath, PathParser parser, Page page) {
@@ -60,16 +60,14 @@
}
Map<String, Object> params = new HashMap<String, Object>();
- fillParams(parser, params);
+ fillParams(invocation, parser, params);
- if (hasMetaParameter(invocation)) {
- return getPortalObjectCF().doMapping(invocation, portletWindow,
+ if (!params.containsKey(PortletRequestDecoder.META_PARAMETER)) {
+ params.put(PortletRequestDecoder.META_PARAMETER, Integer
+ .toHexString(PortletRequestDecoder.RENDER_MASK));
+ }
+
+ return getPortalObjectCF().doMapping(invocation, portletWindow,
params, false);
- } else {
- params.put(PortletRequestDecoder.META_PARAMETER, Integer
- .toString(PortletRequestDecoder.RENDER_MASK));
- return getPortalObjectCF().doMapping(invocation, portletWindow,
- params, false);
- }
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2007-04-04 13:28:20 UTC (rev 10758)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2007-04-04 14:34:14 UTC (rev 10759)
@@ -1,6 +1,8 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.labs.mapper.PathParser;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.portlet.impl.PortletRequestDecoder;
import java.util.Map;
@@ -14,10 +16,21 @@
return "blog";
}
- public void fillParams(PathParser parser, Map<String, Object> params) {
+ public void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
+ boolean maximized = false;
+
String current = parser.getCurrent();
if (current != null) {
params.put("post", parser.getCurrent());
+ maximized = true;
+ } else if (invocation.getServerContext().getQueryParameterMap().containsKey("from")) {
+ maximized = true;
}
+
+ if (maximized) {
+ params.put("windowstate", "maximized");
+ params.put(PortletRequestDecoder.META_PARAMETER, Integer
+ .toHexString((PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
+ }
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java 2007-04-04 13:28:20 UTC (rev 10758)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java 2007-04-04 14:34:14 UTC (rev 10759)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.labs.mapper.PathParser;
+import org.jboss.portal.server.ServerInvocation;
import java.util.Map;
@@ -14,7 +15,7 @@
return "downloads";
}
- public void fillParams(PathParser parser, Map<String, Object> params) {
+ public void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
params.put("category", parser.getCurrent());
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java 2007-04-04 13:28:20 UTC (rev 10758)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java 2007-04-04 14:34:14 UTC (rev 10759)
@@ -39,11 +39,11 @@
PortalObjectCommand poc = (PortalObjectCommand) cmd;
PortalObjectId targetId = poc.getTargetId();
- if (targetId.getLength() >= 0) {
+ if (targetId.getLength() <= 0) {
return null;
}
- if (targetId.getName(Math.abs(targetId.getLength()) - 1).toLowerCase().contains(getPath())) {
+ if (targetId.getName(targetId.getLength() - 1).toLowerCase().contains(getPath())) {
StringBuffer sb = new StringBuffer();
addToPath(sb, targetId, false);
addTokenToPath(sb, getPath());
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2007-04-04 13:28:20 UTC (rev 10758)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2007-04-04 14:34:14 UTC (rev 10759)
@@ -25,60 +25,4 @@
public void finishUrl(ServerURL url) {
url.getParameterMap().remove("post");
}
-
- public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
- if (cmd == null) {
- throw new IllegalArgumentException("No null command accepted");
- }
-
- if (cmd instanceof InvokeWindowCommand) {
- PortalObjectCommand poc = (PortalObjectCommand) cmd;
- PortalObjectId targetId = poc.getTargetId();
-
- if (targetId.getLength() <= 0) {
- return null;
- }
-
- if (targetId.getName(targetId.getLength() - 1).toLowerCase().contains(getPath())) {
- StringBuffer sb = new StringBuffer();
- addToPath(sb, targetId, false);
- addTokenToPath(sb, getPath());
-
- InvokePortletWindowActionCommand actionCmd = null;
- InvokePortletWindowRenderCommand renderCmd = null;
-
- StateString navigationalState = null;
-
- if (poc instanceof InvokePortletWindowActionCommand) {
- actionCmd = (InvokePortletWindowActionCommand) poc;
- navigationalState = actionCmd.getNavigationalState();
- } else if (poc instanceof InvokePortletWindowRenderCommand) {
- renderCmd = (InvokePortletWindowRenderCommand) poc;
- navigationalState = renderCmd.getNavigationalState();
- }
-
- String uniqueId = getContainer().getObject(targetId).getDeclaredProperty(
- Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
- if (uniqueId != null) {
- addTokenToPath(sb, uniqueId);
- }
-
- if (navigationalState instanceof PortletParametersStateString) {
- PortletParametersStateString ppss =
- (PortletParametersStateString) navigationalState;
-
- buildPathFromPortletParameters(sb, ppss);
- }
-
- ServerURL url = convertToURL(sb);
- encodeUrl(actionCmd, renderCmd, url, navigationalState);
-
- finishUrl(url);
-
- return url;
- }
- }
-
- return null;
- }
}
More information about the jboss-svn-commits
mailing list