Update of
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
In directory
james.mmbase.org:/tmp/cvs-serv27028/alias/src/java/com/finalist/cmsc/alias
Modified Files:
AliasNavigationRenderer.java AliasNavigationItemManager.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: AliasNavigationRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AliasNavigationRenderer.java 16 Jan 2008 17:29:17 -0000 1.3
+++ AliasNavigationRenderer.java 28 Jan 2008 21:16:09 -0000 1.4
@@ -1,22 +1,11 @@
package com.finalist.cmsc.alias;
import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
+import javax.servlet.http.*;
import com.finalist.cmsc.alias.beans.om.Alias;
import com.finalist.cmsc.beans.om.NavigationItem;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.navigation.NavigationManager;
+import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.portalImpl.registry.PortalRegistry;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
import com.finalist.pluto.portalImpl.aggregation.ScreenFragment;
@@ -26,20 +15,14 @@
protected static String CONTENT_TYPE = "text/html";
- private Log log = LogFactory.getLog(AliasNavigationRenderer.class);
-
public void render(NavigationItem item, HttpServletRequest request,
HttpServletResponse response,
ServletConfig servletConfig) {
if (item instanceof Alias) {
- Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
- Node itemNode = cloud.getNode(item.getId());
- NodeList relatedNodes = itemNode.getRelatedNodes("page", "related",
"destination");
- if(relatedNodes.size() > 0) {
- Node page = relatedNodes.getNode(0);
-
- String path = page.getStringValue("path");
- NavigationItem pageItem =
SiteManagement.getNavigationItemFromPath(path);
+ Alias alias = (Alias) item;
+ if (alias.getPage() > 0 ) {
+ NavigationItem pageItem =
SiteManagement.getNavigationItem(alias.getPage());
+ String path = SiteManagement.getPath(pageItem,
ServerUtil.useServerName());
HttpServletRequest aliasRequest = new
AliasHttpServletRequest(request, path);
PortalEnvironment aliasEnv = new PortalEnvironment(aliasRequest,
response, servletConfig);
Index: AliasNavigationItemManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/alias/src/java/com/finalist/cmsc/alias/AliasNavigationItemManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AliasNavigationItemManager.java 16 Jan 2008 17:29:17 -0000 1.3
+++ AliasNavigationItemManager.java 28 Jan 2008 21:16:09 -0000 1.4
@@ -2,8 +2,7 @@
import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
+import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -12,9 +11,7 @@
import com.finalist.cmsc.alias.tree.AliasTreeItemRenderer;
import com.finalist.cmsc.alias.util.AliasUtil;
import com.finalist.cmsc.beans.om.NavigationItem;
-import com.finalist.cmsc.navigation.NavigationItemManager;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
+import com.finalist.cmsc.navigation.*;
public class AliasNavigationItemManager implements NavigationItemManager {
@@ -41,7 +38,14 @@
return null;
}
- return (Alias) MMBaseNodeMapper.copyNode(node, Alias.class);
+ Alias alias = MMBaseNodeMapper.copyNode(node, Alias.class);
+ NodeList relatedNodes = node.getRelatedNodes("page", "related",
"destination");
+ if(relatedNodes.size() > 0) {
+ Node page = relatedNodes.getNode(0);
+ alias.setPage(page.getNumber());
+ }
+
+ return alias;
}
public Object getPublisher(Cloud cloud, String type) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
