Skip to content
This repository has been archived by the owner on May 9, 2020. It is now read-only.

Commit

Permalink
Semantics of @OverRide is different in JDK 1.5 and JDK 1.6. In JDK 1.…
Browse files Browse the repository at this point in the history
…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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release09.04@923118 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
JacquesLeRoux committed Mar 15, 2010
1 parent 47a46e9 commit c716313
Showing 1 changed file with 0 additions and 13 deletions.
Expand Up @@ -121,7 +121,6 @@ protected Recur consolidateRecurs(List<Recur> recurList) {

// ----- TemporalExpressionVisitor Implementation ----- //

@Override
public void visit(Difference expr) {
VisitorState newState = new VisitorState();
newState.isIntersection = this.state.isIntersection;
Expand All @@ -138,7 +137,6 @@ public void visit(Difference expr) {
}

@SuppressWarnings("unchecked")
@Override
public void visit(HourRange expr) {
NumberList hourList = new NumberList();
hourList.addAll(expr.getHourRangeAsSet());
Expand All @@ -147,7 +145,6 @@ public void visit(HourRange expr) {
this.state.addRecur(recur);
}

@Override
public void visit(Intersection expr) {
this.stateStack.push(this.state);
VisitorState newState = new VisitorState();
Expand All @@ -167,7 +164,6 @@ public void visit(Intersection expr) {
}

@SuppressWarnings("unchecked")
@Override
public void visit(MinuteRange expr) {
NumberList minuteList = new NumberList();
minuteList.addAll(expr.getMinuteRangeAsSet());
Expand All @@ -176,10 +172,8 @@ public void visit(MinuteRange expr) {
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");
Expand All @@ -190,15 +184,13 @@ public void visit(TemporalExpressions.DateRange expr) {
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()));
this.state.addRecur(recur);
}

@SuppressWarnings("unchecked")
@Override
public void visit(TemporalExpressions.DayOfMonthRange expr) {
int startDay = expr.getStartDay();
int endDay = expr.getEndDay();
Expand All @@ -214,7 +206,6 @@ public void visit(TemporalExpressions.DayOfMonthRange expr) {
}

@SuppressWarnings("unchecked")
@Override
public void visit(TemporalExpressions.DayOfWeekRange expr) {
int startDay = expr.getStartDay();
int endDay = expr.getEndDay();
Expand All @@ -232,7 +223,6 @@ public void visit(TemporalExpressions.DayOfWeekRange expr) {
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()));
Expand All @@ -256,7 +246,6 @@ public void visit(TemporalExpressions.Frequency expr) {
}

@SuppressWarnings("unchecked")
@Override
public void visit(TemporalExpressions.MonthRange expr) {
int startMonth = expr.getStartMonth();
int endMonth = expr.getEndMonth();
Expand All @@ -277,7 +266,6 @@ public void visit(TemporalExpressions.MonthRange expr) {
}

@SuppressWarnings({ "unchecked", "deprecation" })
@Override
public void visit(TimeOfDayRange expr) {
int startHr = expr.getStartHours();
int endHr = expr.getEndHours();
Expand All @@ -295,7 +283,6 @@ public void visit(TimeOfDayRange expr) {
this.state.addRecur(recur);
}

@Override
public void visit(Union expr) {
for (TemporalExpression childExpr : expr.getExpressionSet()) {
childExpr.accept(this);
Expand Down

0 comments on commit c716313

Please sign in to comment.