[jboss-svn-commits] JBL Code SVN: r10933 - labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-04-12 13:30:56 -0400 (Thu, 12 Apr 2007)
New Revision: 10933

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
Log:
Default URL mapping when a portlet is not on a Labs page

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-12 17:23:59 UTC (rev 10932)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java	2007-04-12 17:30:56 UTC (rev 10933)
@@ -2,6 +2,7 @@
 
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.command.InvokeWindowCommand;
 import org.jboss.portal.core.model.portal.command.PortalObjectCommand;
 import org.jboss.portal.core.model.portal.command.InvokePortletWindowActionCommand;
@@ -44,6 +45,11 @@
             }
 
             if (targetId.getName(targetId.getLength() - 1).toLowerCase().contains(getPath())) {
+                PortalObject po = getContainer().getObject(targetId);
+                if (po.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER) == null) {
+                    return null;
+                }
+
                 StringBuffer sb = new StringBuffer();
                 addToPath(sb, targetId, false);
                 addTokenToPath(sb, getPath());
@@ -61,7 +67,7 @@
                     navigationalState = renderCmd.getNavigationalState();
                 }
 
-                String uniqueId = getContainer().getObject(targetId).getDeclaredProperty(
+                String uniqueId = po.getDeclaredProperty(
                         Constants.PORTAL_OBJECT_UNIQUE_ID_MARKER);
                 if (uniqueId != null) {
                     addTokenToPath(sb, uniqueId);