Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule
In directory
james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule
Modified Files:
ScheduleService.java DailySchedule.java WeeklySchedule.java
SingleSchedule.java AbstractSchedule.java MonthSchedule.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/schedule
See also: http://www.mmbase.org/jira/browse/CMSC-1091
Index: ScheduleService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/ScheduleService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ScheduleService.java 16 Apr 2008 10:48:11 -0000 1.2
+++ ScheduleService.java 14 Oct 2008 11:22:44 -0000 1.3
@@ -11,7 +11,7 @@
this.schedule = schedule;
}
- public void setRequestParameters(Map<String,Object> requestParameters) {
+ public void setRequestParameters(Map<String, Object> requestParameters) {
schedule.setRequestParameters(requestParameters);
}
Index: DailySchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/DailySchedule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DailySchedule.java 21 Jul 2008 12:52:40 -0000 1.3
+++ DailySchedule.java 14 Oct 2008 11:22:44 -0000 1.4
@@ -1,7 +1,6 @@
package com.finalist.newsletter.schedule;
-
public class DailySchedule extends AbstractSchedule {
/**
@@ -12,19 +11,19 @@
public String transform() {
StringBuffer expression = new StringBuffer("2");
String approach = null;
- if(getParameters() != null && getParameters().containsKey("date")) {
- expression.append("|"+getParameters().get("date"));
+ if (getParameters() != null && getParameters().containsKey("date")) {
+ expression.append("|" + getParameters().get("date"));
}
appendHourAndMin(expression);
- if(getParameters() != null && getParameters().containsKey("approach")) {
- approach = (String)getParameters().get("approach");
+ if (getParameters() != null && getParameters().containsKey("approach")) {
+ approach = (String) getParameters().get("approach");
}
- if(approach != null) {
- expression.append("|"+approach);
+ if (approach != null) {
+ expression.append("|" + approach);
- if(approach.equals("2")) {
- if(getParameters().containsKey("interval")) {
- expression.append("|"+getParameters().get("interval"));
+ if (approach.equals("2")) {
+ if (getParameters().containsKey("interval")) {
+ expression.append("|" + getParameters().get("interval"));
}
}
}
Index: WeeklySchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/WeeklySchedule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WeeklySchedule.java 16 Apr 2008 10:48:11 -0000 1.2
+++ WeeklySchedule.java 14 Oct 2008 11:22:44 -0000 1.3
@@ -11,15 +11,15 @@
public String transform() {
StringBuffer expression = new StringBuffer("3");
- if(getParameters() != null) {
+ if (getParameters() != null) {
appendHourAndMin(expression);
- if(getParameters().containsKey("interval")) {
- expression.append("|"+getParameters().get("interval"));
+ if (getParameters().containsKey("interval")) {
+ expression.append("|" + getParameters().get("interval"));
}
- if(getParameters().containsKey("weeks")) {
- expression.append("|"+getParameters().get("weeks"));
+ if (getParameters().containsKey("weeks")) {
+ expression.append("|" + getParameters().get("weeks"));
}
}
return expression.toString();
Index: SingleSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/SingleSchedule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SingleSchedule.java 21 Jul 2008 12:52:40 -0000 1.3
+++ SingleSchedule.java 14 Oct 2008 11:22:44 -0000 1.4
@@ -1,7 +1,6 @@
package com.finalist.newsletter.schedule;
-
public class SingleSchedule extends AbstractSchedule {
/**
@@ -11,8 +10,8 @@
public String transform() {
StringBuffer expression = new StringBuffer("1");
- if(getParameters() != null && getParameters().containsKey("date")) {
- expression.append("|"+getParameters().get("date"));
+ if (getParameters() != null && getParameters().containsKey("date")) {
+ expression.append("|" + getParameters().get("date"));
}
appendHourAndMin(expression);
return expression.toString();
Index: AbstractSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/AbstractSchedule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractSchedule.java 18 Apr 2008 06:15:39 -0000 1.3
+++ AbstractSchedule.java 14 Oct 2008 11:22:44 -0000 1.4
@@ -6,21 +6,22 @@
public abstract String transform();
- private Map<String,Object> parameters;
+ private Map<String, Object> parameters;
- public void setRequestParameters(Map<String,Object> parameters) {
+ public void setRequestParameters(Map<String, Object> parameters) {
this.parameters = parameters;
}
- protected Map<String,Object> getParameters() {
+
+ protected Map<String, Object> getParameters() {
return parameters;
}
protected void appendHourAndMin(StringBuffer deliverPublication) {
- if(getParameters() != null && getParameters().containsKey("hour")) {
- deliverPublication.append("|"+getParameters().get("hour"));
+ if (getParameters() != null && getParameters().containsKey("hour")) {
+ deliverPublication.append("|" + getParameters().get("hour"));
}
- if(getParameters() != null && getParameters().containsKey("minute")) {
- deliverPublication.append("|"+getParameters().get("minute"));
+ if (getParameters() != null && getParameters().containsKey("minute")) {
+ deliverPublication.append("|" + getParameters().get("minute"));
}
}
Index: MonthSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/MonthSchedule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MonthSchedule.java 21 Jul 2008 12:52:40 -0000 1.3
+++ MonthSchedule.java 14 Oct 2008 11:22:44 -0000 1.4
@@ -1,7 +1,6 @@
package com.finalist.newsletter.schedule;
-
public class MonthSchedule extends AbstractSchedule {
/**
@@ -15,22 +14,21 @@
StringBuffer expression = new StringBuffer("4");
- if(getParameters() != null) {
+ if (getParameters() != null) {
appendHourAndMin(expression);
- if(getParameters().containsKey("strategy")) {
- expression.append("|"+getParameters().get("strategy"));
+ if (getParameters().containsKey("strategy")) {
+ expression.append("|" + getParameters().get("strategy"));
- if(getParameters().get("strategy").equals("0")) {
- expression.append("|"+getParameters().get("day"));
- }
- else if(getParameters().get("strategy").equals("1")) {
- expression.append("|"+getParameters().get("whichweek"));
- expression.append("|"+getParameters().get("week"));
+ if (getParameters().get("strategy").equals("0")) {
+ expression.append("|" + getParameters().get("day"));
+ } else if (getParameters().get("strategy").equals("1")) {
+ expression.append("|" + getParameters().get("whichweek"));
+ expression.append("|" + getParameters().get("week"));
}
}
- if(getParameters().containsKey("month")) {
- expression.append("|"+getParameters().get("month"));
+ if (getParameters().containsKey("month")) {
+ expression.append("|" + getParameters().get("month"));
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
