Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv21721
Modified Files:
NewsletterCreate.java
NewsletterPublicationManagementAction.java
NewsletterStatisticSearchAction.java
NewsletterSubscriberSearchAction.java
NewsletterSubscriptionAddRelAction.java
SubscriptioManagementAction.java
SubscriptionImportExportAction.java
Log Message:
CMSC-899 codestyle checked
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-899
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterCreate.java 23 Sep 2008 10:07:29 -0000 1.14
+++ NewsletterCreate.java 24 Sep 2008 09:56:25 -0000 1.15
@@ -29,7 +29,7 @@
*/
public class NewsletterCreate extends MMBaseFormlessAction {
/**
- * @param mapping goto jsp
+ * @param mapping
* @param request
* @param cloud
* @return ActionForward , refresh the Newsletter List
Index: NewsletterPublicationManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationManagementAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterPublicationManagementAction.java 23 Sep 2008 09:07:06 -0000
1.8
+++ NewsletterPublicationManagementAction.java 24 Sep 2008 09:56:25 -0000
1.9
@@ -31,7 +31,7 @@
private static Log log =
LogFactory.getLog(NewsletterPublicationManagementAction.class);
- NewsletterPublicationService publicationService;
+ private NewsletterPublicationService publicationService;
/**
* Initialize the publcationService
Index: NewsletterStatisticSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticSearchAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterStatisticSearchAction.java 23 Sep 2008 09:07:06 -0000
1.5
+++ NewsletterStatisticSearchAction.java 24 Sep 2008 09:56:25 -0000
1.6
@@ -32,7 +32,7 @@
private static Log log =
LogFactory.getLog(NewsletterPublicationManagementAction.class);
- NewsletterPublicationService publicationService;
+ private NewsletterPublicationService publicationService;
/**
* Initialize publicationService
@@ -48,11 +48,9 @@
* unspecified searching newsletter publication with sorting, ordering,
paging
*
* @param mapping
- * Description of Parameter
+ * @param form
* @param request
- * Description of Parameter
* @param response
- * Description of Parameter
* @return ActionForward refresh Newsletter statistic list
*
*/
Index: NewsletterSubscriberSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberSearchAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterSubscriberSearchAction.java 23 Sep 2008 10:07:29 -0000
1.11
+++ NewsletterSubscriberSearchAction.java 24 Sep 2008 09:56:25 -0000
1.12
@@ -35,12 +35,12 @@
private static Log log =
LogFactory.getLog(NewsletterPublicationManagementAction.class);
- NewsletterPublicationService publicationService;
- PersonService personService;
- NewsletterSubscriptionServices subscriptionService;
- AuthenticationService authenticationService;
- NewsletterService newsletterService;
- SubscriptionHibernateService subscriptionHService;
+ private NewsletterPublicationService publicationService;
+ private PersonService personService;
+ private NewsletterSubscriptionServices subscriptionService;
+ private AuthenticationService authenticationService;
+ private NewsletterService newsletterService;
+ private SubscriptionHibernateService subscriptionHService;
/**
* Initialize service object: publicationService , personService,
subscriptionService, authenticationService,
@@ -134,7 +134,7 @@
* @param authenticationId
* subscriber's authenticationId
*/
- private void AddToMap(List<Map<Object, Object>> results, String fullName,
String userName, String email,
+ private void addToMap(List<Map<Object, Object>> results, String fullName,
String userName, String email,
String newsletters, String terms, int authenticationId) {
Map<Object, Object> result = new LinkedHashMap<Object, Object>();
@@ -180,7 +180,7 @@
String tmpNewsletters =
subscriptionService.getNewsletterNameList(tmpAuthenticationId);
String tmpTerms =
subscriptionService.getTermsNameList(tmpAuthenticationId);
String tmpUserName = result[4].toString();
- AddToMap(results, tmpFullName, tmpUserName, tmpEmail, tmpNewsletters,
tmpTerms, tmpAuthenticationId);
+ addToMap(results, tmpFullName, tmpUserName, tmpEmail, tmpNewsletters,
tmpTerms, tmpAuthenticationId);
}
return results;
}
Index: NewsletterSubscriptionAddRelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriptionAddRelAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterSubscriptionAddRelAction.java 23 Sep 2008 10:07:29 -0000
1.6
+++ NewsletterSubscriptionAddRelAction.java 24 Sep 2008 09:56:25 -0000
1.7
@@ -20,7 +20,7 @@
*/
public class NewsletterSubscriptionAddRelAction extends DispatchActionSupport {
- NewsletterSubscriptionServices subscriptionServices;
+ private NewsletterSubscriptionServices subscriptionServices;
/**
* Initialize service object : subscriptionServices
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SubscriptioManagementAction.java 23 Sep 2008 09:07:06 -0000 1.12
+++ SubscriptioManagementAction.java 24 Sep 2008 09:56:25 -0000 1.13
@@ -173,7 +173,7 @@
String tmpEmail = result[2].toString();
int tmpAuthenticationId = Integer.parseInt(result[3].toString());
String tmpUserName = result[4].toString();
- AddToSubscriptionMap(results, tmpFullName, tmpUserName, tmpEmail,
tmpAuthenticationId);
+ addToSubscriptionMap(results, tmpFullName, tmpUserName, tmpEmail,
tmpAuthenticationId);
}
return results;
}
@@ -188,7 +188,7 @@
* @param email
* @param authenticationId
*/
- private void AddToSubscriptionMap(List<Map<Object, Object>> results, String
fullName, String userName, String email,
+ private void addToSubscriptionMap(List<Map<Object, Object>> results, String
fullName, String userName, String email,
int authenticationId) {
Map<Object, Object> result = new LinkedHashMap<Object, Object>();
result.put("fullname", fullName);
@@ -252,7 +252,7 @@
String tmpEmail = result[2].toString();
int tmpAuthenticationId = Integer.parseInt(result[3].toString());
String tmpUserName = result[4].toString();
- AddToSubscriptionMap(results, tmpFullName, tmpUserName, tmpEmail,
tmpAuthenticationId);
+ addToSubscriptionMap(results, tmpFullName, tmpUserName, tmpEmail,
tmpAuthenticationId);
}
return results;
}
Index: SubscriptionImportExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SubscriptionImportExportAction.java 23 Sep 2008 09:07:06 -0000 1.9
+++ SubscriptionImportExportAction.java 24 Sep 2008 09:56:25 -0000 1.10
@@ -35,8 +35,8 @@
private static Log log =
LogFactory.getLog(SubscriptionImportExportAction.class);
private static final String PARAM_NEWSLETTERID = "newsletterId";
- NewsletterSubscriptionServices subscriptionServices;
- NewsletterService newsletterService;
+ private NewsletterSubscriptionServices subscriptionServices;
+ private NewsletterService newsletterService;
protected void onInit() {
super.onInit();
@@ -127,8 +127,8 @@
BufferedReader br = new BufferedReader(new StringReader(fileString));
String tmpLinsStr = br.readLine();
PersonService personService = (PersonService)
ApplicationContextFactory.getBean("personService");
- NewsletterSubscriptionServices subscriptionServices =
(NewsletterSubscriptionServices) ApplicationContextFactory
- .getBean("subscriptionServices");
+ NewsletterSubscriptionServices subscriptionServices =
(NewsletterSubscriptionServices) ApplicationContextFactory.getBean(
+ "subscriptionServices");
while (tmpLinsStr != null) {
String tmpUserInfo = tmpLinsStr.replaceAll("\"", "");
@@ -145,7 +145,9 @@
}
int authId = tmpPerson.getAuthenticationId().intValue();
Subscription subRet = subscriptionServices.getSubscription(authId,
newsletterId);
- if (subRet == null)
subscriptionServices.createSubscription(authId, newsletterId);
+ if (subRet == null) {
+ subscriptionServices.createSubscription(authId, newsletterId);
+ }
tmpLinsStr = br.readLine();
}
return mapping.findForward("success");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs