Removed getEvent from HasTrackedRaceContext, because it wasn't used

This commit is contained in:
Lennart Hensler committed 2014-08-01 18:40:49 +02:00
1 parent 5928704380
commit 2aa933c204
6 files changed
+12 -29

No files matched your search

@@ -2,21 +2,17 @@ package com.sap.sailing.datamining.data;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sse.datamining.shared.annotations.Dimension;
import com.sap.sse.datamining.shared.annotations.Connector;
import com.sap.sse.datamining.shared.annotations.Dimension;
public interface HasTrackedRaceContext {
public TrackedRace getTrackedRace();
@Connector
public Event getEvent();
@Connector
public Regatta getRegatta();
@@ -6,7 +6,6 @@ import java.util.concurrent.ExecutorService;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sailing.datamining.impl.data.TrackedRaceWithContext;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.Regatta;
@@ -36,8 +35,7 @@ public class TrackedRaceFilteringRetrievalProcessor extends
TrackedRace trackedRace = raceColumn.getTrackedRace(fleet);
if (trackedRace != null) {
Regatta regatta = trackedRace.getTrackedRegatta().getRegatta();
Event event = regatta.getEvent();
HasTrackedRaceContext trackedRaceWithContext = new TrackedRaceWithContext(event, regatta, fleet, trackedRace);
HasTrackedRaceContext trackedRaceWithContext = new TrackedRaceWithContext(regatta, fleet, trackedRace);
trackedRacesWithContext.add(trackedRaceWithContext);
}
}
@@ -2,7 +2,6 @@ package com.sap.sailing.datamining.impl.data;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.tracking.GPSFixMoving;
@@ -15,13 +14,13 @@ public class GPSFixWithContext extends TrackedLegOfCompetitorWithContext impleme
private final GPSFixMoving gpsFix;
public GPSFixWithContext(HasTrackedLegOfCompetitorContext legContext, GPSFixMoving gpsFix) {
this(legContext.getEvent(), legContext.getRegatta(), legContext.getFleet(), legContext.getTrackedRace(),
this(legContext.getRegatta(), legContext.getFleet(), legContext.getTrackedRace(),
legContext.getTrackedLeg(), legContext.getLegNumber(), legContext.getTrackedLegOfCompetitor(), gpsFix);
}
public GPSFixWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
public GPSFixWithContext(Regatta regatta, Fleet fleet, TrackedRace trackedRace,
TrackedLeg trackedLeg, int legNumber, TrackedLegOfCompetitor trackedLegOfCompetitor, GPSFixMoving gpsFix) {
super(event, regatta, fleet, trackedRace, trackedLeg, legNumber, trackedLegOfCompetitor);
super(regatta, fleet, trackedRace, trackedLeg, legNumber, trackedLegOfCompetitor);
this.gpsFix = gpsFix;
}
@@ -3,7 +3,6 @@ package com.sap.sailing.datamining.impl.data;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.common.TimePoint;
@@ -17,14 +16,14 @@ public class TrackedLegOfCompetitorWithContext extends TrackedLegWithContext imp
private final Competitor competitor;
public TrackedLegOfCompetitorWithContext(HasTrackedLegContext trackedLegContext, TrackedLegOfCompetitor trackedLegOfCompetitor) {
this(trackedLegContext.getEvent(), trackedLegContext.getRegatta(), trackedLegContext.getFleet(),
this(trackedLegContext.getRegatta(), trackedLegContext.getFleet(),
trackedLegContext.getTrackedRace(), trackedLegContext.getTrackedLeg(),
trackedLegContext.getLegNumber(), trackedLegOfCompetitor);
}
public TrackedLegOfCompetitorWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
public TrackedLegOfCompetitorWithContext(Regatta regatta, Fleet fleet, TrackedRace trackedRace,
TrackedLeg trackedLeg, int legNumber, TrackedLegOfCompetitor trackedLegOfCompetitor) {
super(event, regatta, fleet, trackedRace, trackedLeg, legNumber);
super(regatta, fleet, trackedRace, trackedLeg, legNumber);
this.trackedLegOfCompetitor = trackedLegOfCompetitor;
this.competitor = trackedLegOfCompetitor.getCompetitor();
}
@@ -2,7 +2,6 @@ package com.sap.sailing.datamining.impl.data;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.common.LegType;
@@ -21,12 +20,12 @@ public class TrackedLegWithContext extends TrackedRaceWithContext implements Has
private boolean legTypeHasBeenInitialized;
public TrackedLegWithContext(HasTrackedRaceContext trackedRaceContext, TrackedLeg trackedLeg, int legNumber) {
this(trackedRaceContext.getEvent(), trackedRaceContext.getRegatta(), trackedRaceContext.getFleet(),
this(trackedRaceContext.getRegatta(), trackedRaceContext.getFleet(),
trackedRaceContext.getTrackedRace(), trackedLeg, legNumber);
}
public TrackedLegWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber) {
super(event, regatta, fleet, trackedRace);
public TrackedLegWithContext(Regatta regatta, Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber) {
super(regatta, fleet, trackedRace);
this.trackedLeg = trackedLeg;
this.legNumber = legNumber;
}
@@ -5,7 +5,6 @@ import java.util.Calendar;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.base.Regatta;
@@ -14,25 +13,18 @@ import com.sap.sailing.domain.tracking.TrackedRace;
public class TrackedRaceWithContext implements HasTrackedRaceContext {
private final Event event;
private final Regatta regatta;
private final Fleet fleet;
private final TrackedRace trackedRace;
private Integer year;
private boolean yearHasBeenInitialized;
public TrackedRaceWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace) {
this.event = event;
public TrackedRaceWithContext(Regatta regatta, Fleet fleet, TrackedRace trackedRace) {
this.regatta = regatta;
this.fleet = fleet;
this.trackedRace = trackedRace;
}
@Override
public Event getEvent() {
return event;
}
@Override
public Regatta getRegatta() {
return regatta;