Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterTermDeleteAction.java NewsletterEdit.java
NewsletterPublicationManagementAction.java
NewsletterSubscriberSearchForm.java
NewsletterTermsAddAction.java SubscribeAction.java
NewsletterPublicationSendEmail.java ScheduleAction.java
SubscriptioManagementAction.java NewsletterTermForm.java
NewsletterSubscriptionAddRelAction.java
NewsletterPublicationCreate.java
NewsletterPublicationDelete.java
NewsletterPublicationManageForm.java
SubscriptionImportExportAction.java
NewsletterSubscriberSearchAction.java
NewsletterPublicationEdit.java NewsletterPublicationTest.java
NewsletterStatisticSearchAction.java NewsletterTermAction.java
NewsletterStatisticAction.java NewsletterPause.java
NewsletterDelete.java NewsletterPublicationAction.java
NewsletterSubscriberDeleteAction.java
NewsletterPublicationPublish.java NewsletterBounceAction.java
NewsletterPublicationForm.java UnsubscribeAction.java
NewsletterCreate.java SwitchMIMEAction.java
Log Message:
CMSC-1091 improve code style.
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-1091
Index: NewsletterTermDeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermDeleteAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterEdit.java 23 Sep 2008 10:07:29 -0000 1.13
+++ NewsletterEdit.java 14 Oct 2008 11:22:43 -0000 1.14
@@ -26,7 +26,6 @@
* Newsletter Edit Action
*
* @author Lisa
- *
*/
public class NewsletterEdit extends MMBaseFormlessAction {
Index: NewsletterPublicationManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationManagementAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
Index: NewsletterSubscriberSearchForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberSearchForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterSubscriberSearchForm.java 23 Sep 2008 09:07:06 -0000 1.3
+++ NewsletterSubscriberSearchForm.java 14 Oct 2008 11:22:43 -0000 1.4
@@ -1,8 +1,10 @@
package com.finalist.newsletter.forms;
import org.apache.struts.action.ActionForm;
+
/**
* using for searching newsletter subscriber by full name, user name, email,
term
+ *
* @author Lisa
*/
public class NewsletterSubscriberSearchForm extends ActionForm {
@@ -19,8 +21,7 @@
}
/**
- * @param fullname
- * the fullname to set
+ * @param fullname the fullname to set
*/
public void setFullname(String fullname) {
this.fullname = fullname;
@@ -34,8 +35,7 @@
}
/**
- * @param username
- * the username to set
+ * @param username the username to set
*/
public void setUsername(String username) {
this.username = username;
@@ -49,8 +49,7 @@
}
/**
- * @param email
- * the email to set
+ * @param email the email to set
*/
public void setEmail(String email) {
this.email = email;
@@ -64,8 +63,7 @@
}
/**
- * @param term
- * the term to set
+ * @param term the term to set
*/
public void setTerm(String term) {
this.term = term;
Index: NewsletterTermsAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermsAddAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterTermsAddAction.java 23 Sep 2008 09:07:06 -0000 1.3
+++ NewsletterTermsAddAction.java 14 Oct 2008 11:22:43 -0000 1.4
@@ -18,7 +18,6 @@
* using for add newsletter term
*
* @author Lisa
- *
*/
public class NewsletterTermsAddAction extends MMBaseFormlessAction {
Index: SubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscribeAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SubscribeAction.java 21 Jul 2008 12:52:40 -0000 1.3
+++ SubscribeAction.java 14 Oct 2008 11:22:43 -0000 1.4
@@ -28,12 +28,12 @@
int userId = CommunityModuleAdapter.getCurrentUserId();
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- log.debug(String.format("user %s modify status of newsletter
%s",userId,newsletterId));
+ log.debug(String.format("user %s modify status of newsletter %s",
userId, newsletterId));
if (service.noSubscriptionRecord(userId, newsletterId)) {
service.addNewRecord(userId, newsletterId);
- }else{
- service.changeStatus(userId,newsletterId);
+ } else {
+ service.changeStatus(userId, newsletterId);
}
return mapping.findForward("success");
@@ -45,7 +45,7 @@
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
String format = request.getParameter("format");
- log.debug(String.format("user %s modify prefered MIME of newsletter %s
to %s",userId,format,newsletterId));
+ log.debug(String.format("user %s modify prefered MIME of newsletter %s
to %s", userId, format, newsletterId));
service.modifyFormat(userId, newsletterId, format);
@@ -60,12 +60,11 @@
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
int termId = Integer.parseInt(request.getParameter("termId"));
- log.debug(String.format("user %s modify term %s in newsletter
%s",userId,termId,newsletterId));
+ log.debug(String.format("user %s modify term %s in newsletter %s",
userId, termId, newsletterId));
if (hasSelect) {
service.selectTermInLetter(userId, newsletterId, termId);
- }
- else {
+ } else {
service.unSelectTermInLetter(userId, newsletterId, termId);
}
Index: NewsletterPublicationSendEmail.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationSendEmail.java 23 Sep 2008 10:16:00 -0000 1.9
+++ NewsletterPublicationSendEmail.java 14 Oct 2008 11:22:43 -0000 1.10
@@ -24,28 +24,35 @@
public class NewsletterPublicationSendEmail extends MMBaseFormlessAction {
- /** the parameter of action */
+ /**
+ * the parameter of action
+ */
private static final String ACTION = "action";
- /** name of submit button in jsp to send email */
+ /**
+ * name of submit button in jsp to send email
+ */
private static final String ACTION_SEND = "send";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
int number = Integer.parseInt(getParameter(request, "number", true));
-
if(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
+ if
(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
request.setAttribute("isPaused", true);
return mapping.findForward(SUCCESS);
}
if (isSendAction(request)) {
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
- publicationService.deliver(number,email,mimeType);
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+ ;
+ publicationService.deliver(number, email, mimeType);
return mapping.findForward(SUCCESS);
}
Index: ScheduleAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/ScheduleAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ScheduleAction.java 21 Jul 2008 12:52:40 -0000 1.2
+++ ScheduleAction.java 14 Oct 2008 11:22:43 -0000 1.3
@@ -1,4 +1,5 @@
package com.finalist.newsletter.forms;
+
import java.util.*;
import javax.servlet.http.HttpServletRequest;
@@ -11,58 +12,54 @@
import com.finalist.newsletter.schedule.*;
import com.finalist.newsletter.util.NewsletterUtil;
-public class ScheduleAction extends DispatchAction{
+public class ScheduleAction extends DispatchAction {
public ActionForward transform(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- Map<String,Object> requestParameters = new HashMap<String,Object>();
+ Map<String, Object> requestParameters = new HashMap<String, Object>();
AbstractSchedule schedule = null;
//type calendar type , 1 once ,2 daily ,3 weekly ,4 monthly
String type = request.getParameter("type");
String hour = request.getParameter("hour");
String minute = request.getParameter("minute");
- if(type != null) {
+ if (type != null) {
requestParameters.put("hour", hour);
requestParameters.put("minute", minute);
- if(type.equals("1")) {
+ if (type.equals("1")) {
String date = request.getParameter("date");
requestParameters.put("date", date);
schedule = new SingleSchedule();
- }
- else if(type.equals("2")) {
+ } else if (type.equals("2")) {
String date = request.getParameter("date");
requestParameters.put("date", date);
String strategy = request.getParameter("strategy");
requestParameters.put("approach", strategy);
- if(strategy != null && strategy.equals("2")) {
+ if (strategy != null && strategy.equals("2")) {
String interval = request.getParameter("interval");
requestParameters.put("interval", interval);
}
schedule = new DailySchedule();
- }
- else if(type.equals("3")) {
+ } else if (type.equals("3")) {
String interval = request.getParameter("interval");
requestParameters.put("interval", interval);
String[] weeks = request.getParameterValues("weeks");
requestParameters.put("weeks", getWeeks(weeks));
schedule = new WeeklySchedule();
- }
- else {
+ } else {
String strategy = request.getParameter("strategy");
requestParameters.put("strategy", strategy);
- if(strategy != null) {
- if(strategy.equals("0")) {
+ if (strategy != null) {
+ if (strategy.equals("0")) {
String day = request.getParameter("day");
requestParameters.put("day", day);
- }
- else if (strategy.equals("1")) {
+ } else if (strategy.equals("1")) {
String whichweek = request.getParameter("whichweek");
requestParameters.put("whichweek", whichweek);
@@ -80,7 +77,7 @@
String expression = Service.transform();
response.setContentType("text/xml");
- response.getWriter().print("<expression>"+expression+"</expression>");
+ response.getWriter().print("<expression>" + expression +
"</expression>");
}
return null;
}
@@ -93,14 +90,14 @@
StringBuffer sb = new StringBuffer();
String newsletterId = request.getParameter("newsletterid");
List<Schedule> schedules =
NewsletterUtil.getSchedulesBynewsletterId(Integer.valueOf(newsletterId));
- for(Schedule schedule : schedules) {
+ for (Schedule schedule : schedules) {
sb.append("<schedule>");
- sb.append("<number>"+schedule.getId()+"</number>");
- sb.append("<expression>"+schedule.getExpression()+"</expression>");
-
sb.append("<description>"+schedule.getScheduleDescription()+"</description>");
+ sb.append("<number>" + schedule.getId() + "</number>");
+ sb.append("<expression>" + schedule.getExpression() +
"</expression>");
+ sb.append("<description>" + schedule.getScheduleDescription() +
"</description>");
sb.append("</schedule>");
}
- response.getWriter().print("<schedules>"+sb.toString()+"</schedules>");
+ response.getWriter().print("<schedules>" + sb.toString() +
"</schedules>");
return null;
}
@@ -122,6 +119,7 @@
/**
* from array to String
+ *
* @param args
* @return
*/
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- SubscriptioManagementAction.java 24 Sep 2008 09:56:25 -0000 1.13
+++ SubscriptioManagementAction.java 14 Oct 2008 11:22:43 -0000 1.14
@@ -28,9 +28,7 @@
import com.finalist.newsletter.services.SubscriptionHibernateService;
/**
- *
* @author Lisa
- *
*/
public class SubscriptioManagementAction extends DispatchActionSupport {
@@ -94,7 +92,6 @@
}
/**
- *
* @param mapping
* @param form
* @param request
@@ -152,12 +149,9 @@
/**
* get newsletter related newsletter subscription information List
*
- * @param newsletterId
- * subscribed newsletter's Id
- * @param name
- * subscriber's name
- * @param email
- * subscriber's email address
+ * @param newsletterId subscribed newsletter's Id
+ * @param name subscriber's name
+ * @param email subscriber's email address
* @return newsletter subscription list with information subscriber's user
name, email address, authenticationId,user
* name,
*/
@@ -181,8 +175,7 @@
/**
* convert related information to Map
*
- * @param results
- * result list with information of newsletter subscription
+ * @param results result list with information of newsletter
subscription
* @param fullName
* @param userName
* @param email
Index: NewsletterTermForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterTermForm.java 23 Sep 2008 09:07:06 -0000 1.4
+++ NewsletterTermForm.java 14 Oct 2008 11:22:43 -0000 1.5
@@ -3,8 +3,8 @@
import org.apache.struts.action.ActionForm;
/**
- *
* newsletter term form
+ *
* @author Lisa
*/
public class NewsletterTermForm extends ActionForm {
@@ -25,8 +25,7 @@
}
/**
- * @param name
- * the name to set
+ * @param name the name to set
*/
public void setName(String name) {
this.name = name;
@@ -40,8 +39,7 @@
}
/**
- * @param number
- * the number to set
+ * @param number the number to set
*/
public void setNumber(String number) {
this.number = number;
@@ -55,19 +53,22 @@
}
/**
- * @param offset
- * the offset to set
+ * @param offset the offset to set
*/
public void setOffset(String offset) {
this.offset = offset;
}
- /** reset the name */
+ /**
+ * reset the name
+ */
public void reset() {
name = null;
}
- /** reset all */
+ /**
+ * reset all
+ */
public void clear() {
name = null;
offset = null;
Index: NewsletterSubscriptionAddRelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriptionAddRelAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterSubscriptionAddRelAction.java 24 Sep 2008 09:56:25 -0000
1.7
+++ NewsletterSubscriptionAddRelAction.java 14 Oct 2008 11:22:43 -0000
1.8
@@ -15,8 +15,6 @@
* Adding relationship between newsletter and person
*
* @author Lisa
- * @version
- *
*/
public class NewsletterSubscriptionAddRelAction extends DispatchActionSupport {
Index: NewsletterPublicationCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterPublicationCreate.java 23 Sep 2008 10:07:29 -0000 1.20
+++ NewsletterPublicationCreate.java 14 Oct 2008 11:22:43 -0000 1.21
@@ -27,7 +27,6 @@
* Newsletter Publication Create Action
*
* @author Lisa
- *
*/
public class NewsletterPublicationCreate extends MMBaseFormlessAction {
/**
Index: NewsletterPublicationDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationDelete.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationDelete.java 23 Sep 2008 10:07:29 -0000 1.9
+++ NewsletterPublicationDelete.java 14 Oct 2008 11:22:43 -0000 1.10
@@ -29,10 +29,14 @@
*/
public class NewsletterPublicationDelete extends MMBaseFormlessAction {
- /** name of submit button in jsp to confirm removal */
+ /**
+ * name of submit button in jsp to confirm removal
+ */
private static final String ACTION_REMOVE = "remove";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
/**
@@ -79,13 +83,10 @@
}
/**
- *
* @param mapping
* @param request
- * @param forwardType
- * use to distinguish different return back forward
- * @param parent
- * use to record parent id
+ * @param forwardType use to distinguish different return back forward
+ * @param parent use to record parent id
* @return ActionForward turn to correct page
*/
protected ActionForward actionReturn(ActionMapping mapping,
HttpServletRequest request, String forwardType,
Index: NewsletterPublicationManageForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationManageForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterPublicationManageForm.java 23 Sep 2008 09:07:06 -0000
1.2
+++ NewsletterPublicationManageForm.java 14 Oct 2008 11:22:43 -0000
1.3
@@ -21,8 +21,7 @@
}
/**
- * @param title
- * the title to set
+ * @param title the title to set
*/
public void setTitle(String title) {
this.title = title;
@@ -36,8 +35,7 @@
}
/**
- * @param subject
- * the subject to set
+ * @param subject the subject to set
*/
public void setSubject(String subject) {
this.subject = subject;
@@ -51,8 +49,7 @@
}
/**
- * @param period
- * the period to set
+ * @param period the period to set
*/
public void setPeriod(String period) {
this.period = period;
Index: SubscriptionImportExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
Index: NewsletterSubscriberSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberSearchAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterSubscriberSearchAction.java 24 Sep 2008 09:56:25 -0000
1.12
+++ NewsletterSubscriberSearchAction.java 14 Oct 2008 11:22:43 -0000
1.13
@@ -29,7 +29,6 @@
* using for searching Newsletter Subscriber
*
* @author Lisa
- *
*/
public class NewsletterSubscriberSearchAction extends DispatchActionSupport {
@@ -70,7 +69,7 @@
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
int resultCount = countsearchSubscribers(newsletterId, "", "", "", "");
if (resultCount > 0) {
- List<Map<Object,Object>> results = searchSubscribers(newsletterId,
"", "", "", "");
+ List<Map<Object, Object>> results = searchSubscribers(newsletterId,
"", "", "", "");
request.setAttribute("results", results);
}
request.setAttribute("resultCount", resultCount);
@@ -105,7 +104,7 @@
int resultCount = countsearchSubscribers(newsletterId, tmpTerm,
tmpFullName, tmpUserName, tmpEmail);
if (resultCount > 0) {
- List<Map<Object,Object>> results = searchSubscribers(newsletterId,
tmpTerm, tmpFullName, tmpUserName, tmpEmail);
+ List<Map<Object, Object>> results = searchSubscribers(newsletterId,
tmpTerm, tmpFullName, tmpUserName, tmpEmail);
request.setAttribute("results", results);
}
@@ -119,20 +118,13 @@
/**
* convert newsletter subscribers to map
*
- * @param results
- * subscriber List, containing result information
- * @param fullName
- * subscriber's full name
- * @param userName
- * sbuscriber's user name
- * @param email
- * subscriber's email address
- * @param newsletters
- * newsletter name string subscribed by subscriber
- * @param terms
- * newsletter's term name string subscribed by subscriber
- * @param authenticationId
- * subscriber's authenticationId
+ * @param results subscriber List, containing result information
+ * @param fullName subscriber's full name
+ * @param userName sbuscriber's user name
+ * @param email subscriber's email address
+ * @param newsletters newsletter name string subscribed by subscriber
+ * @param terms newsletter's term name string subscribed by
subscriber
+ * @param authenticationId subscriber's authenticationId
*/
private void addToMap(List<Map<Object, Object>> results, String fullName,
String userName, String email,
String newsletters, String terms, int authenticationId) {
@@ -151,16 +143,11 @@
/**
* getting subscriber's subscription information
*
- * @param newsletterId
- * Description of Parameter
- * @param terms
- * Description of Parameter
- * @param fullName
- * Description of Parameter
- * @param userName
- * Description of Parameter
- * @param email
- * Description of Parameter
+ * @param newsletterId Description of Parameter
+ * @param terms Description of Parameter
+ * @param fullName Description of Parameter
+ * @param userName Description of Parameter
+ * @param email Description of Parameter
* @return newsletter Subscriber search result List
*/
private List<Map<Object, Object>> searchSubscribers(int newsletterId,
String terms, String fullName,
@@ -188,16 +175,11 @@
/**
* counting subscriber
*
- * @param newsletterId
- * subscribed newsletterId
- * @param terms
- * subscribed newsletter term name list
- * @param fullName
- * subscriber's full name
- * @param userName
- * subscriber's user name
- * @param email
- * subscriber's email
+ * @param newsletterId subscribed newsletterId
+ * @param terms subscribed newsletter term name list
+ * @param fullName subscriber's full name
+ * @param userName subscriber's user name
+ * @param email subscriber's email
* @return subscriber totalCount
*/
private int countsearchSubscribers(int newsletterId, String terms, String
fullName, String userName, String email) {
Index: NewsletterPublicationEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationEdit.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationEdit.java 23 Sep 2008 10:07:29 -0000 1.9
+++ NewsletterPublicationEdit.java 14 Oct 2008 11:22:43 -0000 1.10
@@ -30,8 +30,8 @@
* @param mapping
* @param request
* @param cloud
- * @throws Exception
* @return ActionForward refresh NewsletterList
+ * @throws Exception
*/
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
Index: NewsletterPublicationTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterPublicationTest.java 23 Sep 2008 10:31:36 -0000 1.9
+++ NewsletterPublicationTest.java 14 Oct 2008 11:22:43 -0000 1.10
@@ -19,10 +19,14 @@
public class NewsletterPublicationTest extends MMBaseFormlessAction {
- /** name of submit button in jsp to confirm removal */
+ /**
+ * name of submit button in jsp to confirm removal
+ */
private static final String ACTION_REMOVE = "remove";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
@Override
Index: NewsletterStatisticSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticSearchAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterStatisticSearchAction.java 24 Sep 2008 09:56:25 -0000
1.6
+++ NewsletterStatisticSearchAction.java 14 Oct 2008 11:22:43 -0000
1.7
@@ -25,7 +25,6 @@
* using for newsletter statistic searching
*
* @author Lisa
- *
*/
public class NewsletterStatisticSearchAction extends DispatchActionSupport {
@@ -52,7 +51,6 @@
* @param request
* @param response
* @return ActionForward refresh Newsletter statistic list
- *
*/
protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws Exception {
@@ -76,15 +74,10 @@
}
/**
- *
- * @param mapping
- * Description of Parameter
- * @param form
- * Description of Parameter
- * @param request
- * Description of Parameter
- * @param response
- * Description of Parameter
+ * @param mapping Description of Parameter
+ * @param form Description of Parameter
+ * @param request Description of Parameter
+ * @param response Description of Parameter
* @return ActionForward Showing newsletter statistic list
*/
public ActionForward searchPublicationStatistic(ActionMapping mapping,
ActionForm form, HttpServletRequest request,
@@ -156,8 +149,7 @@
/**
* convert newsletter publication to map
*
- * @param publications
- * publication list used for containing the result of the
searching.
+ * @param publications publication list used for containing the result of
the searching.
* @return List containing some information of newsletter publication and
send time, subscriptions number, send
* successfully number, and bounced number
*/
Index: NewsletterTermAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterStatisticAction.java 23 Sep 2008 09:29:26 -0000 1.12
+++ NewsletterStatisticAction.java 14 Oct 2008 11:22:43 -0000 1.13
@@ -13,6 +13,7 @@
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts.action.*;
import org.apache.struts.actions.MappingDispatchAction;
@@ -21,7 +22,6 @@
* Search some newsletters according to these search conditions.
*
* @author Eva
- *
*/
public class NewsletterStatisticAction extends MappingDispatchAction {
@@ -74,16 +74,16 @@
List<StatisticResult> records = service.statisticAllByPeriod(
startDate, endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (isAll && !hasDate && isDetail) {
List<StatisticResult> records = service.statisticAll();
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (!isAll && !hasDate && isDetail) {
List<StatisticResult> records = service
.statisticByNewsletter(newsletterId);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (!isAll && hasDate && !isDetail) {
result = service.statisticByNewsletterPeriod(newsletterId,
startDate, endDate);
@@ -104,7 +104,7 @@
.StatisticDetailByNewsletterPeriod(newsletterId, startDate,
endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
}
return mapping.findForward("result");
}
@@ -120,7 +120,7 @@
Newsletter newsletter = new Newsletter();
newsletter.setTitle("ALL");
newsletter.setId(0);
- newsletters.add(0,newsletter);
+ newsletters.add(0, newsletter);
}
private void transferShowingFromDB(List<StatisticResult> records,
@@ -132,12 +132,13 @@
}
}
- private List<StatisticResult> addPagingCondition(HttpServletRequest
request,List<StatisticResult> records ,PagingStatusHolder holder){
+
+ private List<StatisticResult> addPagingCondition(HttpServletRequest
request, List<StatisticResult> records, PagingStatusHolder holder) {
List<StatisticResult> recordsForShow = new ArrayList<StatisticResult>();
int totalCount = records.size();
request.setAttribute("totalCount", totalCount);
- for(int
i=holder.getOffset();i<holder.getPageSize()+holder.getOffset()&&i<totalCount;i++){
+ for (int i = holder.getOffset(); i < holder.getPageSize() +
holder.getOffset() && i < totalCount; i++) {
recordsForShow.add(records.get(i));
}
return recordsForShow;
Index: NewsletterPause.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPause.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Index: NewsletterDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterDelete.java 23 Sep 2008 09:07:06 -0000 1.15
+++ NewsletterDelete.java 14 Oct 2008 11:22:43 -0000 1.16
@@ -26,27 +26,25 @@
* Newsletter Delete Action
*
* @author Lisa Chen
- *
*/
public class NewsletterDelete extends MMBaseFormlessAction {
- /** name of submit button in jsp to confirm removal */
+ /**
+ * name of submit button in jsp to confirm removal
+ */
private static final String ACTION_REMOVE = "remove";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
/**
- *
- * @param mapping
- * Description of Parameter
- * @param request
- * Description of Parameter
- * @param cloud
- * Description of Parameter
- * @exception Exception
- * Description of Exception
+ * @param mapping Description of Parameter
+ * @param request Description of Parameter
+ * @param cloud Description of Parameter
* @return ActionForward refreshing newsletter list
+ * @throws Exception Description of Exception
*/
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
Index: NewsletterPublicationAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterPublicationAction.java 23 Sep 2008 10:07:29 -0000 1.3
+++ NewsletterPublicationAction.java 14 Oct 2008 11:22:43 -0000 1.4
@@ -17,9 +17,7 @@
import com.finalist.newsletter.services.NewsletterPublicationService;
/**
- *
* @author Lisa
- * @version
*/
public class NewsletterPublicationAction extends DispatchActionSupport {
Index: NewsletterSubscriberDeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterSubscriberDeleteAction.java 23 Sep 2008 10:07:29 -0000
1.3
+++ NewsletterSubscriberDeleteAction.java 14 Oct 2008 11:22:43 -0000
1.4
@@ -16,7 +16,6 @@
* using for deleting newsletter subscriber from newsletter
*
* @author Lisa
- *
*/
public class NewsletterSubscriberDeleteAction extends 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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- NewsletterPublicationPublish.java 23 Sep 2008 10:31:36 -0000 1.21
+++ NewsletterPublicationPublish.java 14 Oct 2008 11:22:43 -0000 1.22
@@ -35,10 +35,14 @@
public class NewsletterPublicationPublish extends MMBaseFormlessAction {
- /** name of submit button in jsp to confirm removal */
+ /**
+ * name of submit button in jsp to confirm removal
+ */
private static final String ACTION_REMOVE = "remove";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
/**
Index: NewsletterBounceAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterBounceAction.java 22 Sep 2008 07:53:42 -0000 1.3
+++ NewsletterBounceAction.java 14 Oct 2008 11:22:43 -0000 1.4
@@ -19,7 +19,7 @@
public class NewsletterBounceAction extends DispatchAction {
- public ActionForward list (ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
+ public ActionForward list(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
int pageSize = 12;
int offset = 0;
@@ -30,7 +30,7 @@
if (StringUtils.isNotEmpty(strOffset)) {
offset = Integer.parseInt(strOffset);
}
- List < NewsletterBounce > bounces =
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize);
+ List<NewsletterBounce> bounces =
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize);
int count = NewsletterBounceUtil.getTotalCount();
request.setAttribute("resultList", bounces);
request.setAttribute("resultCount", count);
Index: NewsletterPublicationForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterPublicationForm.java 23 Sep 2008 09:07:06 -0000 1.2
+++ NewsletterPublicationForm.java 14 Oct 2008 11:22:43 -0000 1.3
@@ -6,7 +6,6 @@
* Formbean of NewsletterPublication
*
* @author Lisa
- * @version
*/
public class NewsletterPublicationForm extends ActionForm {
@@ -23,8 +22,7 @@
}
/**
- * @param title
- * the title to set
+ * @param title the title to set
*/
public void setTitle(String title) {
this.title = title;
@@ -38,8 +36,7 @@
}
/**
- * @param description
- * the description to set
+ * @param description the description to set
*/
public void setDescription(String description) {
this.description = description;
@@ -53,8 +50,7 @@
}
/**
- * @param subject
- * the subject to set
+ * @param subject the subject to set
*/
public void setSubject(String subject) {
this.subject = subject;
@@ -68,8 +64,7 @@
}
/**
- * @param intro
- * the intro to set
+ * @param intro the intro to set
*/
public void setIntro(String intro) {
this.intro = intro;
Index: UnsubscribeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/UnsubscribeAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- UnsubscribeAction.java 21 Jul 2008 13:09:00 -0000 1.4
+++ UnsubscribeAction.java 14 Oct 2008 11:22:43 -0000 1.5
@@ -19,8 +19,7 @@
private static final String ACTION_REMOVE = "remove";
- NewsletterSubscriptionServices service ;
-
+ NewsletterSubscriptionServices service;
@Override
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterCreate.java 24 Sep 2008 09:56:25 -0000 1.15
+++ NewsletterCreate.java 14 Oct 2008 11:22:43 -0000 1.16
@@ -25,7 +25,6 @@
* Create Newsletter Action
*
* @author Lisa
- *
*/
public class NewsletterCreate extends MMBaseFormlessAction {
/**
Index: SwitchMIMEAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SwitchMIMEAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SwitchMIMEAction.java 14 May 2008 03:54:40 -0000 1.1
+++ SwitchMIMEAction.java 14 Oct 2008 11:22:43 -0000 1.2
@@ -15,6 +15,6 @@
httpServletRequest.getSession(true).setAttribute("contentType",
targetMIME);
- return new
ActionForward(String.format("/editors/site/NavigatorPanel.do?nodeId=%s",number));
+ return new
ActionForward(String.format("/editors/site/NavigatorPanel.do?nodeId=%s",
number));
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
