You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Martin Kreidenweis <ma...@tngtech.com> on 2011/03/14 10:10:34 UTC
Re: svn commit: r1081093 - /ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
Hi,
I don't think this change preserves the functionality. Same problem in changeset r1081099.
A quick look at the code suggests to me that the case-fallthrough was intended in both files.
I suggest reverting those changes, or at lease have them double checked by someone who knows the code.
Martin
On 13.03.2011 13:31, mrisaliti@apache.org wrote:
> Author: mrisaliti
> Date: Sun Mar 13 12:31:03 2011
> New Revision: 1081093
>
> URL: http://svn.apache.org/viewvc?rev=1081093&view=rev
> Log:
> Remove some warning in sevice component (OFBIZ-4102)
>
> 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=1081093&r1=1081092&r2=1081093&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 Sun Mar 13 12:31:03 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,6 +384,7 @@ public class RecurrenceRule {
> } else {
> cal.set(Calendar.SECOND, checkTimeCal.get(Calendar.SECOND));
> }
> + break;
> }
>
> // Check for validity of the current frequency.
>
>
Re: svn commit: r1081093 - /ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
Posted by "risalitim@gmail.com" <ri...@gmail.com>.
Hi Martin,
I have reverted it.
Thanks
Marco
Il giorno 14/mar/2011, alle ore 10.10, Martin Kreidenweis ha scritto:
> Hi,
>
> I don't think this change preserves the functionality. Same problem in changeset r1081099.
>
> A quick look at the code suggests to me that the case-fallthrough was intended in both files.
> I suggest reverting those changes, or at lease have them double checked by someone who knows the code.
>
> Martin
>
> On 13.03.2011 13:31, mrisaliti@apache.org wrote:
>> Author: mrisaliti
>> Date: Sun Mar 13 12:31:03 2011
>> New Revision: 1081093
>>
>> URL: http://svn.apache.org/viewvc?rev=1081093&view=rev
>> Log:
>> Remove some warning in sevice component (OFBIZ-4102)
>>
>> 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=1081093&r1=1081092&r2=1081093&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 Sun Mar 13 12:31:03 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,6 +384,7 @@ public class RecurrenceRule {
>> } else {
>> cal.set(Calendar.SECOND, checkTimeCal.get(Calendar.SECOND));
>> }
>> + break;
>> }
>>
>> // Check for validity of the current frequency.
>>
>>