svn commit: r923118 - /ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java

Author: jleroux
Date: Mon Mar 15 09:06:26 2010
New Revision: 923118

URL: http://svn.apache.org/viewvc?rev=923118&view=rev
Log:
Semantics of @Override is different in JDK 1.5 and JDK 1.6. In JDK 1.5, the @Override annotation is not allowed for implementations of methods declared in an interface, while they are allowed in JDK 1.6.

Remove a bunch of @Override introduced by Adrian while backporting manually at r903125 (Hand merged the temporal expression bug fixes from the trunk)
Now R9.04 compiles after an ant clean

Modified:
    ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java

Modified: ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java?rev=923118&r1=923117&r2=923118&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java (original)
+++ ofbiz/branches/release09.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java Mon Mar 15 09:06:26 2010
@@ -121,7 +121,6 @@ public class ICalRecurConverter implemen
 
     // ----- TemporalExpressionVisitor Implementation ----- //
 
-    @Override
     public void visit(Difference expr) {
         VisitorState newState = new VisitorState();
         newState.isIntersection = this.state.isIntersection;
@@ -138,7 +137,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void visit(HourRange expr) {
         NumberList hourList = new NumberList();
         hourList.addAll(expr.getHourRangeAsSet());
@@ -147,7 +145,6 @@ public class ICalRecurConverter implemen
         this.state.addRecur(recur);
     }
 
-    @Override
     public void visit(Intersection expr) {
         this.stateStack.push(this.state);
         VisitorState newState = new VisitorState();
@@ -167,7 +164,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void visit(MinuteRange expr) {
         NumberList minuteList = new NumberList();
         minuteList.addAll(expr.getMinuteRangeAsSet());
@@ -176,10 +172,8 @@ public class ICalRecurConverter implemen
         this.state.addRecur(recur);
     }
 
-    @Override
     public void visit(Null expr) {}
 
-    @Override
     public void visit(TemporalExpressions.DateRange expr) {
         if (this.state.isExcluded) {
             throw new IllegalStateException("iCalendar does not support excluded date ranges");
@@ -190,7 +184,6 @@ public class ICalRecurConverter implemen
         this.incDateList.add(new RDate(periodList));
     }
 
-    @Override
     public void visit(TemporalExpressions.DayInMonth expr) {
         Recur recur = new Recur(Recur.MONTHLY, 0);
         recur.getDayList().add(new WeekDay(dayOfWeekArray[expr.getDayOfWeek() - 1], expr.getOccurrence()));
@@ -198,7 +191,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void visit(TemporalExpressions.DayOfMonthRange expr) {
         int startDay = expr.getStartDay();
         int endDay = expr.getEndDay();
@@ -214,7 +206,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void visit(TemporalExpressions.DayOfWeekRange expr) {
         int startDay = expr.getStartDay();
         int endDay = expr.getEndDay();
@@ -232,7 +223,6 @@ public class ICalRecurConverter implemen
         this.state.addRecur(recur);
     }
 
-    @Override
     public void visit(TemporalExpressions.Frequency expr) {
         if (this.dateStart == null) {
             this.dateStart = new DtStart(new net.fortuna.ical4j.model.Date(expr.getStartDate()));
@@ -256,7 +246,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings("unchecked")
-    @Override
     public void visit(TemporalExpressions.MonthRange expr) {
         int startMonth = expr.getStartMonth();
         int endMonth = expr.getEndMonth();
@@ -277,7 +266,6 @@ public class ICalRecurConverter implemen
     }
 
     @SuppressWarnings({ "unchecked", "deprecation" })
-    @Override
     public void visit(TimeOfDayRange expr) {
         int startHr = expr.getStartHours();
         int endHr = expr.getEndHours();
@@ -295,7 +283,6 @@ public class ICalRecurConverter implemen
         this.state.addRecur(recur);
     }
 
-    @Override
     public void visit(Union expr) {
         for (TemporalExpression childExpr : expr.getExpressionSet()) {
             childExpr.accept(this);