Author: mrisaliti
Date: Mon Mar 14 19:10:37 2011
New Revision: 1081517
URL: http://svn.apache.org/viewvc?rev=1081517&view=rev
Log:
Revert rev. 1081093
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=1081517&r1=1081516&r2=1081517&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
Mon Mar 14 19:10:37 2011
@@ -324,7 +324,7 @@ public class RecurrenceRule {
if (cal.get(Calendar.YEAR) != checkTimeCal.get(Calendar.YEAR)) {
return 0;
}
- break;
+
case MONTHLY:
if (MONTHLY == getFrequency()) {
cal.add(Calendar.MONTH, -getIntervalInt());
@@ -334,7 +334,7 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.MONTH, checkTimeCal.get(Calendar.MONTH));
}
- break;
+
case WEEKLY:
if (WEEKLY == getFrequency()) {
cal.add(Calendar.WEEK_OF_YEAR, -getIntervalInt());
@@ -344,7 +344,7 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.WEEK_OF_YEAR,
checkTimeCal.get(Calendar.WEEK_OF_YEAR));
}
- break;
+
case DAILY:
if (DAILY == getFrequency()) {
cal.add(Calendar.DAY_OF_MONTH, -getIntervalInt());
@@ -354,7 +354,7 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.DAY_OF_MONTH,
checkTimeCal.get(Calendar.DAY_OF_MONTH));
}
- break;
+
case HOURLY:
if (HOURLY == getFrequency()) {
cal.add(Calendar.HOUR_OF_DAY, -getIntervalInt());
@@ -364,7 +364,7 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.HOUR_OF_DAY,
checkTimeCal.get(Calendar.HOUR_OF_DAY));
}
- break;
+
case MINUTELY:
if (MINUTELY == getFrequency()) {
cal.add(Calendar.MINUTE, -getIntervalInt());
@@ -374,7 +374,7 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.MINUTE, checkTimeCal.get(Calendar.MINUTE));
}
- break;
+
case SECONDLY:
if (SECONDLY == getFrequency()) {
cal.add(Calendar.SECOND, -getIntervalInt());
@@ -384,7 +384,6 @@ public class RecurrenceRule {
} else {
cal.set(Calendar.SECOND, checkTimeCal.get(Calendar.SECOND));
}
- break;
}
// Check for validity of the current frequency.
