Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule
In directory james.mmbase.org:/tmp/cvs-serv10602
Modified Files:
AbstractSchedule.java DailySchedule.java MonthSchedule.java
ScheduleService.java SingleSchedule.java WeeklySchedule.java
Log Message:
CMSC-811
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-811
Index: AbstractSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/AbstractSchedule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractSchedule.java 15 Apr 2008 09:04:36 -0000 1.1
+++ AbstractSchedule.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -4,11 +4,11 @@
public abstract class AbstractSchedule {
- public abstract String chansfer();
+ public abstract String transform();
private Map<String,Object> parameters;
- public void setParameters(Map<String,Object> parameters) {
+ public void setRequestParameters(Map<String,Object> parameters) {
this.parameters = parameters;
}
protected Map<String,Object> getParameters() {
Index: DailySchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/DailySchedule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DailySchedule.java 15 Apr 2008 09:04:36 -0000 1.1
+++ DailySchedule.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -7,29 +7,29 @@
public class DailySchedule extends AbstractSchedule {
/**
- * the Expression is 2|datetime|approach[|interval]
+ * the Expression is 2|datet|hour|minute|approach[|interval]
* approach {0|1|2}
*/
@Override
- public String chansfer() {
- StringBuffer target = new StringBuffer("2");
+ public String transform() {
+ StringBuffer expression = new StringBuffer("2");
String approach = null;
if(getParameters() != null && getParameters().containsKey("date")) {
- target.append("|"+getParameters().get("date"));
+ expression.append("|"+getParameters().get("date"));
}
- appendHourAndMin(target);
+ appendHourAndMin(expression);
if(getParameters() != null && getParameters().containsKey("approach")) {
approach = (String)getParameters().get("approach");
}
if(approach != null) {
- target.append("|"+approach);
+ expression.append("|"+approach);
if(approach.equals("2")) {
if(getParameters().containsKey("interval")) {
- target.append("|"+getParameters().get("interval"));
+ expression.append("|"+getParameters().get("interval"));
}
}
}
- return target.toString();
+ return expression.toString();
}
}
Index: MonthSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/MonthSchedule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MonthSchedule.java 15 Apr 2008 09:04:36 -0000 1.1
+++ MonthSchedule.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -6,36 +6,36 @@
public class MonthSchedule extends AbstractSchedule {
/**
- * the expression is 4|hour|minute|strategy|day or whichweek and week|month
+ * the expression is 4|hour|minute|strategy following |day or
|whichweek|week|month
* whichweek {1|2|3|4|5}
* week {1|2|3|4|5|6|7}
* month e.g. 1000000000000 12 bit ,"1" ,selected,"0" no selected
*/
@Override
- public String chansfer() {
+ public String transform() {
- StringBuffer target = new StringBuffer("4");
+ StringBuffer expression = new StringBuffer("4");
if(getParameters() != null) {
- appendHourAndMin(target);
+ appendHourAndMin(expression);
if(getParameters().containsKey("strategy")) {
- target.append("|"+getParameters().get("strategy"));
+ expression.append("|"+getParameters().get("strategy"));
if(getParameters().get("strategy").equals("0")) {
- target.append("|"+getParameters().get("day"));
+ expression.append("|"+getParameters().get("day"));
}
else if(getParameters().get("strategy").equals("1")) {
- target.append("|"+getParameters().get("whichweek"));
- target.append("|"+getParameters().get("week"));
+ expression.append("|"+getParameters().get("whichweek"));
+ expression.append("|"+getParameters().get("week"));
}
}
if(getParameters().containsKey("month")) {
- target.append("|"+getParameters().get("month"));
+ expression.append("|"+getParameters().get("month"));
}
}
- return target.toString();
+ return expression.toString();
}
}
Index: ScheduleService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/ScheduleService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ScheduleService.java 15 Apr 2008 09:04:36 -0000 1.1
+++ ScheduleService.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -11,11 +11,11 @@
this.schedule = schedule;
}
- public void setParameters(Map<String,Object> parameters) {
- schedule.setParameters(parameters);
+ public void setRequestParameters(Map<String,Object> requestParameters) {
+ schedule.setRequestParameters(requestParameters);
}
- public String chansfer() {
- return schedule.chansfer();
+ public String transform() {
+ return schedule.transform();
}
}
Index: SingleSchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/SingleSchedule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SingleSchedule.java 15 Apr 2008 09:04:36 -0000 1.1
+++ SingleSchedule.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -6,16 +6,16 @@
public class SingleSchedule extends AbstractSchedule {
/**
- * the expression is 1|datetime
+ * the expression is 1|date|hour|minute
*/
@Override
- public String chansfer() {
+ public String transform() {
- StringBuffer target = new StringBuffer("1");
+ StringBuffer expression = new StringBuffer("1");
if(getParameters() != null && getParameters().containsKey("date")) {
- target.append("|"+getParameters().get("date"));
+ expression.append("|"+getParameters().get("date"));
}
- appendHourAndMin(target);
- return target.toString();
+ appendHourAndMin(expression);
+ return expression.toString();
}
}
Index: WeeklySchedule.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/schedule/WeeklySchedule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WeeklySchedule.java 15 Apr 2008 09:04:36 -0000 1.1
+++ WeeklySchedule.java 16 Apr 2008 10:48:11 -0000 1.2
@@ -8,20 +8,20 @@
* week is a String ,e.g. 1000001 ,"1" express being selected,"0" opposite
*/
@Override
- public String chansfer() {
+ public String transform() {
- StringBuffer target = new StringBuffer("3");
+ StringBuffer expression = new StringBuffer("3");
if(getParameters() != null) {
- appendHourAndMin(target);
+ appendHourAndMin(expression);
if(getParameters().containsKey("interval")) {
- target.append("|"+getParameters().get("interval"));
+ expression.append("|"+getParameters().get("interval"));
}
if(getParameters().containsKey("weeks")) {
- target.append("|"+getParameters().get("weeks"));
+ expression.append("|"+getParameters().get("weeks"));
}
}
- return target.toString();
+ return expression.toString();
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
