Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/builder
In directory
james.mmbase.org:/tmp/cvs-serv9932/portlets-newsletter/src/java/com/finalist/newsletter/builder
Modified Files:
NewsletterNavigationItemManager.java
NewsletterPublicationNavigationItemManager.java
Log Message:
CMSC-217 easier to compile against mmbase 1.9
Added usage of MMBaseNodeMapper
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/builder
See also: http://www.mmbase.org/jira/browse/CMSC-217
Index: NewsletterNavigationItemManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/builder/NewsletterNavigationItemManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterNavigationItemManager.java 15 May 2008 08:03:42 -0000
1.6
+++ NewsletterNavigationItemManager.java 21 Jul 2008 12:52:40 -0000
1.7
@@ -1,25 +1,17 @@
package com.finalist.newsletter.builder;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.navigation.PagesUtil;
-import com.finalist.cmsc.navigation.PortletUtil;
-import com.finalist.cmsc.portalImpl.PageNavigationItemManager;
-import com.finalist.cmsc.beans.om.NavigationItem;
-import com.finalist.cmsc.beans.om.Page;
-import com.finalist.newsletter.tree.NewsletterTreeItemRenderer;
-import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.newsletter.beans.om.Newsletter;
+import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+
import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import org.apache.commons.beanutils.BeanUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.portalImpl.PageNavigationItemManager;
+import com.finalist.newsletter.beans.om.Newsletter;
+import com.finalist.newsletter.tree.NewsletterTreeItemRenderer;
+import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterNavigationItemManager extends PageNavigationItemManager
{
private static Logger log =
Logging.getLoggerInstance(NewsletterNavigationItemManager.class.getName());
@@ -27,10 +19,12 @@
private NavigationItemRenderer renderer = new
NewsletterNavigationRenderer();
private NavigationTreeItemRenderer treeRenderer = new
NewsletterTreeItemRenderer();
+ @Override
public Class<? extends NavigationItem> getItemClass() {
return Newsletter.class;
}
+ @Override
public NavigationItem loadNavigationItem(Integer key, Node node) {
Newsletter newsletter = MMBaseNodeMapper.copyNode(node,
Newsletter.class);
@@ -53,6 +47,7 @@
return newsletter;
}
+ @Override
public NavigationItemRenderer getRenderer() {
return renderer;
}
Index: NewsletterPublicationNavigationItemManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/builder/NewsletterPublicationNavigationItemManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationNavigationItemManager.java 15 May 2008 08:03:42
-0000 1.5
+++ NewsletterPublicationNavigationItemManager.java 21 Jul 2008 12:52:40
-0000 1.6
@@ -1,29 +1,26 @@
package com.finalist.newsletter.builder;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
-import com.finalist.cmsc.navigation.PortletUtil;
-import com.finalist.cmsc.navigation.NavigationItemRenderer;
-import com.finalist.cmsc.portalImpl.PageNavigationItemManager;
+import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
+
+import org.mmbase.bridge.*;
+
import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.navigation.*;
+import com.finalist.newsletter.beans.om.Publication;
import com.finalist.newsletter.tree.NewsletterPublicationTreeItemRenderer;
import com.finalist.newsletter.util.NewsletterUtil;
-import com.finalist.newsletter.beans.om.Newsletter;
-import com.finalist.newsletter.beans.om.Publication;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.RelationList;
-import org.mmbase.bridge.RelationIterator;
-import org.mmbase.bridge.Relation;
-import net.sf.mmapps.commons.beans.MMBaseNodeMapper;
public class NewsletterPublicationNavigationItemManager extends
NewsletterNavigationItemManager {
private NavigationTreeItemRenderer treeRenderer = new
NewsletterPublicationTreeItemRenderer();
private NavigationItemRenderer renderer = new
PublicationNavigationRenderer();
+ @Override
public Class<? extends NavigationItem> getItemClass() {
return Publication.class;
}
+ @Override
public NavigationItem loadNavigationItem(Integer key, Node node) {
Publication publication = MMBaseNodeMapper.copyNode(node,
Publication.class);
@@ -44,6 +41,7 @@
return publication;
}
+ @Override
public NavigationItemRenderer getRenderer() {
return renderer;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs