Author: woonsan
Date: Fri Mar 19 16:24:32 2010
New Revision: 925308
URL: http://svn.apache.org/viewvc?rev=925308&view=rev
Log:
JS2-1131: Removing hacky codes which tries to filter out reserved folders and
space folders. Thanks to Randy for fixing JS2-1134
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=925308&r1=925307&r2=925308&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
Fri Mar 19 16:24:32 2010
@@ -19,11 +19,8 @@ package org.apache.jetspeed.portlets.spa
import java.io.IOException;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -44,7 +41,6 @@ import org.apache.jetspeed.container.url
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.portlet.LocalizedField;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.portalsite.Menu;
import org.apache.jetspeed.portalsite.MenuElement;
@@ -294,13 +290,10 @@ public class PageNavigator extends Gener
private List<MenuElement> getSpaceMenuElements(SpaceBean space,
PortletRequest request)
{
- ArrayList<MenuElement> spaceMenuElements = new
ArrayList<MenuElement>();
+ List<MenuElement> spaceMenuElements = null;
try
{
- String spacePath = StringUtils.trim(space.getPath());
- boolean isRootSpace = StringUtils.isBlank(spacePath) ||
Folder.PATH_SEPARATOR.equals(spacePath);
-
RequestContext rc = (RequestContext)
request.getAttribute(RequestContext.REQUEST_PORTALENV);
PortalSiteRequestContext psrc = (PortalSiteRequestContext)
rc.getAttribute(PORTAL_SITE_REQUEST_CONTEXT_ATTR_KEY);
@@ -332,66 +325,7 @@ public class PageNavigator extends Gener
if (spaceMenu != null)
{
- Map<String, Boolean> folderSpaceFlags = null;
-
- for (MenuElement element : (List<MenuElement>)
spaceMenu.getElements())
- {
- String type = element.getElementType();
-
- if (MenuElement.MENU_ELEMENT_TYPE.equals(type))
- {
- Menu folderMenu = (Menu) element;
-
- if (!isRootSpace)
- {
- spaceMenuElements.add(element);
- }
- else
- {
- if (folderSpaceFlags == null)
- {
- folderSpaceFlags = (Map<String, Boolean>)
request.getPortletSession(true).getAttribute(FOLDER_SPACE_FLAGS);
-
- if (folderSpaceFlags == null)
- {
- folderSpaceFlags =
Collections.synchronizedMap(new HashMap<String, Boolean>());
-
request.getPortletSession(true).setAttribute(FOLDER_SPACE_FLAGS,
folderSpaceFlags);
- }
- }
-
- // TODO: folder menu's url is same to path?
- String folderPath = folderMenu.getUrl();
- Boolean isFolderSpace =
folderSpaceFlags.get(folderPath);
-
- if (isFolderSpace == null)
- {
- isFolderSpace = Boolean.FALSE;
-
- if (pageManager.folderExists(folderPath))
- {
- Folder folder =
pageManager.getFolder(folderPath);
- Collection<LocalizedField> fields =
folder.getMetadata().getFields("space-owner");
-
- if (fields != null && !fields.isEmpty())
- {
- isFolderSpace = Boolean.TRUE;
- }
- }
-
- folderSpaceFlags.put(folderPath,
isFolderSpace);
- }
-
- if (!isFolderSpace.booleanValue())
- {
- spaceMenuElements.add(element);
- }
- }
- }
- else if (MenuElement.OPTION_ELEMENT_TYPE.equals(type))
- {
- spaceMenuElements.add(element);
- }
- }
+ spaceMenuElements = spaceMenu.getElements();
}
}
catch (Exception e)
@@ -399,12 +333,17 @@ public class PageNavigator extends Gener
log.error("Failed to retrieve space menu elements.", e);
}
+ if (spaceMenuElements == null)
+ {
+ spaceMenuElements = Collections.emptyList();
+ }
+
return spaceMenuElements;
}
private List<MenuElement> getSpaceLinkMenuElements(SpaceBean space,
PortletRequest request)
{
- ArrayList<MenuElement> spaceLinkMenuElements = new
ArrayList<MenuElement>();
+ List<MenuElement> spaceLinkMenuElements = null;
try
{
@@ -437,17 +376,9 @@ public class PageNavigator extends Gener
}
}
- if (spaceLinksMenu != null && !spaceLinksMenu.isEmpty())
+ if (spaceLinksMenu != null)
{
- for (MenuElement element : (List<MenuElement>)
spaceLinksMenu.getElements())
- {
- String type = element.getElementType();
-
- if (MenuElement.OPTION_ELEMENT_TYPE.equals(type))
- {
- spaceLinkMenuElements.add(element);
- }
- }
+ spaceLinkMenuElements = spaceLinksMenu.getElements();
}
}
catch (Exception e)
@@ -455,6 +386,11 @@ public class PageNavigator extends Gener
log.error("Failed to retrieve space menu elements.", e);
}
+ if (spaceLinkMenuElements == null)
+ {
+ spaceLinkMenuElements = Collections.emptyList();
+ }
+
return spaceLinkMenuElements;
}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=925308&r1=925307&r2=925308&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Fri Mar 19 16:24:32 2010
@@ -59,12 +59,6 @@ private void printMenuItem(MenuElement e
if (MenuElement.MENU_ELEMENT_TYPE.equals(type))
{
String url = ((Menu) element).getUrl();
- boolean reservedFolder = ((Folder)
element.getManagedNode()).isReserved();
- if (reservedFolder)
- {
- return;
- }
-
String styleClass = "closed";
if (((Menu) element).isSelected(psrc))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
