Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv13412/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationTest.java
NewsletterSubscriberSearchAction.java
Log Message:
CMSC-907 - Added Generics and removed unread/unused code
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-907
Index: NewsletterPublicationTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterPublicationTest.java 7 May 2008 08:25:58 -0000 1.6
+++ NewsletterPublicationTest.java 7 Jul 2008 20:28:50 -0000 1.7
@@ -16,8 +16,6 @@
import org.mmbase.bridge.Cloud;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.services.NewsletterPublicationService;
-import com.finalist.newsletter.ApplicationContextFactory;
public class NewsletterPublicationTest extends MMBaseFormlessAction {
@@ -33,8 +31,8 @@
int number = Integer.parseInt(getParameter(request, "number", true));
if (isSendAction(request)) {
- String email = getParameter(request, "email");
- String mimeType = getParameter(request, "minetype");
+// String email = getParameter(request, "email");
+// String mimeType = getParameter(request, "minetype");
// UserRole role =
NavigationUtil.getRole(newsletterPublicationNode.getCloud(),
newsletterPublicationNode, false);
// boolean isWebMaster = (role != null &&
SecurityUtil.isWebmaster(role));
@@ -44,7 +42,7 @@
// }
// Thread publisher = new NewsletterPublisher(number);
// publisher.start();
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
+// NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
return mapping.findForward(SUCCESS);
}
Index: NewsletterSubscriberSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterSubscriberSearchAction.java 7 Jul 2008 04:03:43 -0000
1.1
+++ NewsletterSubscriberSearchAction.java 7 Jul 2008 20:28:50 -0000
1.2
@@ -1,7 +1,6 @@
package com.finalist.newsletter.forms;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -17,7 +16,6 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Node;
import org.springframework.web.struts.DispatchActionSupport;
@@ -26,7 +24,6 @@
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.security.AuthenticationService;
-import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.services.NewsletterService;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
@@ -96,9 +93,9 @@
return mapping.findForward("success");
}
- private void AddToMap(List results, String fullName,String userName,
String email, String newsletters, String terms) {
+ private void AddToMap(List<Map<String, String>> results, String
fullName,String userName, String email, String newsletters, String terms) {
- Map result = new HashMap();
+ Map<String, String> result = new HashMap<String, String>();
result.put("fullname", fullName);
result.put("username", userName);
result.put("email", email);
@@ -108,8 +105,8 @@
}
- private List searchSubscribers(int newsletterId, String term, String
fullName, String userName, String email, int pageSize, int offset){
- List results = new ArrayList<Map<String, String>>();
+ private List<Map<String, String>> searchSubscribers(int newsletterId,
String term, String fullName, String userName, String email, int pageSize, int
offset){
+ List<Map<String, String>> results = new ArrayList<Map<String,
String>>();
Set<Integer> authenticationIdList = new HashSet<Integer>();
authenticationIdList =
subscriptionService.getRecordIdByNewsletterAndName(newsletterId,
StringUtils.isNotBlank(term)?term : "");
for(int authenticationId : authenticationIdList){
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
