[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet PortletTag.java BasicURLTag.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
In directory 
james.mmbase.org:/tmp/cvs-serv26804/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet

Modified Files:
        PortletTag.java BasicURLTag.java 
Log Message:
CMSC-755 Navigation code refactored to use navigationitem


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-755


Index: PortletTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/PortletTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PortletTag.java     26 Nov 2007 11:43:41 -0000      1.6
+++ PortletTag.java     28 Jan 2008 21:15:45 -0000      1.7
@@ -30,8 +30,7 @@
 import org.apache.pluto.om.window.PortletWindow;
 import org.apache.pluto.services.information.PortalContextProvider;
 
-import com.finalist.cmsc.beans.om.Page;
-import com.finalist.cmsc.beans.om.Portlet;
+import com.finalist.cmsc.beans.om.*;
 import com.finalist.cmsc.portalImpl.PortalConstants;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.cmsc.services.sitemanagement.SiteManagementAdmin;
@@ -121,8 +120,8 @@
          boolean mayEditPage = true;
          String pageId = (String) 
request.getAttribute(PortalConstants.CMSC_OM_PAGE_ID);
          if (pageId != null) {
-            Page page = SiteManagement.getPage(Integer.valueOf(pageId));
-            mayEditPage = SiteManagementAdmin.mayEdit(page);
+            NavigationItem item = 
SiteManagement.getNavigationItem(Integer.valueOf(pageId));
+            mayEditPage = SiteManagementAdmin.mayEdit(item);
          }
          boolean mayEditPortlet = SiteManagementAdmin.mayEdit(portlet);
 


Index: BasicURLTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BasicURLTag.java    26 Nov 2007 11:43:41 -0000      1.8
+++ BasicURLTag.java    28 Jan 2008 21:15:45 -0000      1.9
@@ -13,7 +13,7 @@
 
 import net.sf.mmapps.commons.util.StringUtil;
 
-import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.NavigationItem;
 import com.finalist.cmsc.mmbase.ResourcesUtil;
 import com.finalist.cmsc.navigation.ServerUtil;
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
@@ -159,15 +159,9 @@
 
    public String getLink() {
       String link = "";
-      Page pageObject;
-      try {
-         pageObject = SiteManagement.getPage(Integer.parseInt(page));
-      }
-      catch (NumberFormatException e) {
-         pageObject = SiteManagement.getPageFromPath(page);
-      }
-      if (pageObject != null) {
-         link = SiteManagement.getPath(pageObject, 
!ServerUtil.useServerName());
+      NavigationItem item = SiteManagement.convertToNavigationItem(page);
+      if (item != null) {
+         link = SiteManagement.getPath(item, !ServerUtil.useServerName());
       }
       else {
          link = page;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs