Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
UnsubscribePortlet.java NewsletterSubscriptionPortlet.java
NewsletterContentPortlet.java
Log Message:
CMSC-1091 improve code style.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1091
Index: UnsubscribePortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/UnsubscribePortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: NewsletterSubscriptionPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- NewsletterSubscriptionPortlet.java 23 Jul 2008 03:39:44 -0000 1.30
+++ NewsletterSubscriptionPortlet.java 14 Oct 2008 11:22:44 -0000 1.31
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.List;
import javax.portlet.*;
+
import org.apache.commons.lang.StringUtils;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -39,7 +40,7 @@
String[] newsletters = preferences.getValues(ALLOWED_NEWSLETTERS, null);
if (!CommunityModuleAdapter.isUserLogin() ||
- (services.getActiveSubscription(userId).size()<1 && null ==
request.getParameter("action"))) {
+ (services.getActiveSubscription(userId).size() < 1 && null ==
request.getParameter("action"))) {
request.setAttribute("isUserLogin",
CommunityModuleAdapter.isUserLogin());
doInclude("view", "/newsletter/subscription/introduction.jsp",
request, response);
return;
@@ -51,23 +52,21 @@
if ("pause".equals(action)) {
log.debug("Paused subscriptions ,need confrim");
- List<Subscription> subscriptionsToBePause =
getSubscriptionsFromParameter(request,Subscription.STATUS.ACTIVE);
+ List<Subscription> subscriptionsToBePause =
getSubscriptionsFromParameter(request, Subscription.STATUS.ACTIVE);
request.setAttribute("subscriptionsToBePause",
subscriptionsToBePause);
doInclude("view", "/newsletter/subscription/pauseform.jsp", request,
response);
return;
- }
- else if ("resume".equals(action)) {
+ } else if ("resume".equals(action)) {
log.debug("Resume paused subscriptions ,need confrim");
List<Subscription> subscriptionsToBeResume =
getSubscriptionsFromParameter(request, Subscription.STATUS.PAUSED);
request.setAttribute("subscriptionsToBeResume",
subscriptionsToBeResume);
doInclude("view", "/newsletter/subscription/confirmResume.jsp",
request, response);
return;
- }
- else if ("terminate".equals(action)) {
+ } else if ("terminate".equals(action)) {
log.debug("Terminate subscriptions ,need confrim");
- List<Subscription> subscriptionsToBeTerminate =
getSubscriptionsFromParameter(request,null);
+ List<Subscription> subscriptionsToBeTerminate =
getSubscriptionsFromParameter(request, null);
request.setAttribute("subscriptionsToBeTerminate",
subscriptionsToBeTerminate);
doInclude("view", "/newsletter/subscription/confirmTerminate.jsp",
request, response);
@@ -87,7 +86,7 @@
if (null != request.getParameterValues("subscriptions")) {
for (String sId : request.getParameterValues("subscriptions")) {
Subscription subscription = services.getSubscription(sId);
- if (null==status||status.equals(subscription.getStatus())) {
+ if (null == status || status.equals(subscription.getStatus())) {
subscriptions.add(services.getSubscription(sId));
}
}
@@ -116,11 +115,9 @@
response.setWindowState(WindowState.MAXIMIZED);
if ("pause".equals(action)) {
processPause(request, response);
- }
- else if ("terminate".equals(action)) {
+ } else if ("terminate".equals(action)) {
processTermination(request, response);
- }
- else if ("resume".equals(action)) {
+ } else if ("resume".equals(action)) {
processResume(request, response);
}
}
@@ -138,8 +135,7 @@
for (String id : subscriptionIds) {
services.terminateUserSubscription(id);
}
- }
- else {
+ } else {
response.setRenderParameters(request.getParameterMap());
}
}
@@ -155,8 +151,7 @@
for (String id : subscriptionIds) {
services.resume(id);
}
- }
- else {
+ } else {
response.setRenderParameters(request.getParameterMap());
}
}
@@ -177,13 +172,11 @@
for (String id : subscriptionIds) {
if (StringUtils.isBlank(resumeDate)) {
services.pause(id, duration, durationunit);
- }
- else {
+ } else {
services.pause(id, resumeDate);
}
}
- }
- else {
+ } else {
response.setRenderParameters(request.getParameterMap());
}
Index: NewsletterContentPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NewsletterContentPortlet.java 17 Jul 2008 03:04:50 -0000 1.26
+++ NewsletterContentPortlet.java 14 Oct 2008 11:22:44 -0000 1.27
@@ -56,17 +56,16 @@
NavigationItem result =
SiteManagement.getNavigationItemFromPath(currentPath);
if (result != null) {
int itemNumber = result.getId();
- if(!NewsletterUtil.isNewsletter(itemNumber)) {
- if(NewsletterUtil.isNewsletterPublication(itemNumber)) {
+ if (!NewsletterUtil.isNewsletter(itemNumber)) {
+ if (NewsletterUtil.isNewsletterPublication(itemNumber)) {
itemNumber =
NewsletterPublicationUtil.getNewsletterByPublicationNumber(itemNumber).getNumber();
}
}
- addContentElements(request,itemNumber);
- }
- else {
+ addContentElements(request, itemNumber);
+ } else {
throw new RuntimeException("The page number could not be found");
}
- super.doView(request,response);
+ super.doView(request, response);
}
protected void addContentElements(RenderRequest req, int itemNumber) {
@@ -106,16 +105,15 @@
// A live server will remove expired nodes.
useLifecycleBool = false;
}
- int totalItems = 0 ;
+ int totalItems = 0;
List<ContentElement> elements = null;
String termNumbers = req.getParameter(NEWSLETTER_TERMS_PARAM);
- if(StringUtils.isEmpty(termNumbers)) {
+ if (StringUtils.isEmpty(termNumbers)) {
totalItems = NewsletterUtil.countArticlesByNewsletter(itemNumber);
- elements =
NewsletterUtil.getArticlesByNewsletter(itemNumber,offset,elementsPerPage,orderBy,direction);
- }
- else {
- totalItems =
NewsletterUtil.countArticlesByNewsletter(itemNumber,termNumbers);
- elements =
NewsletterUtil.getArticlesByNewsletter(itemNumber,termNumbers,offset,elementsPerPage,orderBy,direction);
+ elements = NewsletterUtil.getArticlesByNewsletter(itemNumber,
offset, elementsPerPage, orderBy, direction);
+ } else {
+ totalItems = NewsletterUtil.countArticlesByNewsletter(itemNumber,
termNumbers);
+ elements = NewsletterUtil.getArticlesByNewsletter(itemNumber,
termNumbers, offset, elementsPerPage, orderBy, direction);
}
if (startIndex > 0) {
@@ -149,8 +147,7 @@
if (StringUtils.isEmpty(indexPosition)) {
setAttribute(req, INDEX_POSITION, "bottom");
}
- }
- else {
+ } else {
setMetaData(req, elementId);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
