Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv9932/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterDelete.java NewsletterCreate.java
NewsletterTermSearchAction.java
NewsletterPublicationPublish.java ScheduleAction.java
NewsLetterShowForm.java
NewsletterPublicationManagementAction.java NewsletterEdit.java
SubscribeAction.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-217
Index: NewsletterDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterDelete.java 17 Jul 2008 03:04:50 -0000 1.11
+++ NewsletterDelete.java 21 Jul 2008 12:52:40 -0000 1.12
@@ -22,10 +22,6 @@
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.domain.StatisticResult.HANDLE;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
-import com.finalist.newsletter.services.StatisticService;
-import com.finalist.newsletter.services.impl.StatisticServiceImpl;
import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterDelete extends MMBaseFormlessAction {
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterCreate.java 17 Jul 2008 03:04:50 -0000 1.9
+++ NewsletterCreate.java 21 Jul 2008 12:52:40 -0000 1.10
@@ -11,19 +11,15 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.bridge.RelationUtil;
import org.apache.commons.lang.StringUtils;
-
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeManager;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.PagesUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterCreate extends MMBaseFormlessAction {
Index: NewsletterTermSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterTermSearchAction.java 7 Jul 2008 04:03:43 -0000 1.1
+++ NewsletterTermSearchAction.java 21 Jul 2008 12:52:40 -0000 1.2
@@ -8,7 +8,6 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterPublicationPublish.java 22 May 2008 10:35:34 -0000 1.15
+++ NewsletterPublicationPublish.java 21 Jul 2008 12:52:40 -0000 1.16
@@ -12,6 +12,13 @@
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
@@ -22,16 +29,8 @@
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.domain.StatisticResult.HANDLE;
import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.services.StatisticService;
-import com.finalist.newsletter.services.impl.StatisticServiceImpl;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-
-import javax.servlet.http.HttpServletRequest;
public class NewsletterPublicationPublish extends MMBaseFormlessAction {
Index: ScheduleAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/ScheduleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ScheduleAction.java 28 May 2008 11:06:55 -0000 1.1
+++ ScheduleAction.java 21 Jul 2008 12:52:40 -0000 1.2
@@ -1,24 +1,14 @@
package com.finalist.newsletter.forms;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.apache.struts.actions.DispatchAction;
+
import com.finalist.newsletter.domain.Schedule;
-import com.finalist.newsletter.schedule.AbstractSchedule;
-import com.finalist.newsletter.schedule.DailySchedule;
-import com.finalist.newsletter.schedule.MonthSchedule;
-import com.finalist.newsletter.schedule.ScheduleService;
-import com.finalist.newsletter.schedule.SingleSchedule;
-import com.finalist.newsletter.schedule.WeeklySchedule;
+import com.finalist.newsletter.schedule.*;
import com.finalist.newsletter.util.NewsletterUtil;
public class ScheduleAction extends DispatchAction{
@@ -138,8 +128,8 @@
private String getWeeks(String[] weeks) {
StringBuilder sb = new StringBuilder();
Arrays.sort(weeks);
- for(int i = 0 ; i < weeks.length ; i++) {
- sb.append(weeks[i]);
+ for (String week : weeks) {
+ sb.append(week);
}
return sb.toString();
}
Index: NewsLetterShowForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsLetterShowForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsLetterShowForm.java 21 Apr 2008 09:51:03 -0000 1.2
+++ NewsLetterShowForm.java 21 Jul 2008 12:52:40 -0000 1.3
@@ -1,6 +1,5 @@
package com.finalist.newsletter.forms;
-import java.util.Date;
public class NewsLetterShowForm extends org.apache.struts.action.ActionForm {
Index: NewsletterPublicationManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationManagementAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterPublicationManagementAction.java 7 Jul 2008 04:03:43 -0000
1.1
+++ NewsletterPublicationManagementAction.java 21 Jul 2008 12:52:40 -0000
1.2
@@ -1,31 +1,20 @@
package com.finalist.newsletter.forms;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.springframework.web.struts.DispatchActionSupport;
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.newsletter.domain.Publication;
-
import com.finalist.newsletter.services.NewsletterPublicationService;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-
public class NewsletterPublicationManagementAction extends
DispatchActionSupport {
private static Log log = LogFactory
@@ -33,11 +22,13 @@
NewsletterPublicationService publicationService;
+ @Override
protected void onInit() {
super.onInit();
publicationService = (NewsletterPublicationService)
getWebApplicationContext().getBean("publicationService");
}
+ @Override
protected ActionForward unspecified(ActionMapping mapping, ActionForm
form,
HttpServletRequest request, HttpServletResponse
response)
throws Exception {
@@ -56,8 +47,9 @@
offset =
Integer.parseInt(request.getParameter("offset"));
}
String forwardType = "";
-
if(StringUtils.isNotBlank(request.getParameter("searchForwardType")))
+
if(StringUtils.isNotBlank(request.getParameter("searchForwardType"))) {
forwardType =request.getParameter("searchForwardType");
+ }
if(forwardType.equals("statistics")){
request.setAttribute("newsletterId", newsletterId);
ActionForward ret= new
ActionForward(mapping.findForward("statisticmanagement").getPath() +
"?newsletterId=" + newsletterId);
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterEdit.java 7 Jul 2008 04:03:43 -0000 1.10
+++ NewsletterEdit.java 21 Jul 2008 12:52:40 -0000 1.11
@@ -9,13 +9,11 @@
*/
package com.finalist.newsletter.forms;
-import java.net.URL;
import java.net.URLEncoder;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
Index: SubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscribeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SubscribeAction.java 7 May 2008 05:58:37 -0000 1.2
+++ SubscribeAction.java 21 Jul 2008 12:52:40 -0000 1.3
@@ -1,23 +1,22 @@
package com.finalist.newsletter.forms;
-import com.finalist.newsletter.services.*;
-import com.finalist.cmsc.services.community.person.PersonService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.actions.DispatchAction;
+import org.apache.struts.action.*;
import org.springframework.web.struts.DispatchActionSupport;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.finalist.newsletter.services.CommunityModuleAdapter;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
public class SubscribeAction extends DispatchActionSupport {
private static Log log = LogFactory.getLog(SubscribeAction.class);
NewsletterSubscriptionServices service;
+ @Override
protected void onInit() {
super.onInit();
service = (NewsletterSubscriptionServices)
getWebApplicationContext().getBean("subscriptionServices");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
