From 39df06d724fbe1bbd12e410b827017a88112d998 Mon Sep 17 00:00:00 2001
From: Lennart Hensler <LennartHensler@aol.com>
Date: Thu, 16 Feb 2017 17:47:54 +0100
Subject: [PATCH] Moved the boat class dimension to HasLeaderboardContext

---
 .../sap/sailing/datamining/data/HasLeaderboardContext.java  | 5 +++++
 .../datamining/data/HasRaceResultOfCompetitorContext.java   | 4 ----
 .../sap/sailing/datamining/data/HasTrackedRaceContext.java  | 3 ---
 .../datamining/impl/data/LeaderboardWithContext.java        | 6 ++++++
 .../impl/data/RaceResultOfCompetitorWithContext.java        | 6 ------
 .../datamining/impl/data/TrackedRaceWithContext.java        | 6 ------
 .../polars/datamining/data/HasFleetPolarContext.java        | 4 ----
 .../polars/datamining/data/impl/FleetWithPolarContext.java  | 6 ------
 8 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasLeaderboardContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasLeaderboardContext.java
index b0df69b7beb..6e76d1e0b62 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasLeaderboardContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasLeaderboardContext.java
@@ -1,7 +1,9 @@
 package com.sap.sailing.datamining.data;
 
+import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
 import com.sap.sailing.domain.polars.PolarDataService;
+import com.sap.sse.datamining.annotations.Connector;
 import com.sap.sse.datamining.annotations.Dimension;
 
 public interface HasLeaderboardContext {
@@ -11,4 +13,7 @@ public interface HasLeaderboardContext {
 
     @Dimension(messageKey="Leaderboard", ordinal=1)
     String getName();
+    
+    @Connector(messageKey="BoatClass", ordinal=2)
+    BoatClass getBoatClass();
 }
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceResultOfCompetitorContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceResultOfCompetitorContext.java
index 8d637553619..d1cea86c52a 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceResultOfCompetitorContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceResultOfCompetitorContext.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.datamining.data;
 
-import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sse.datamining.annotations.Connector;
 import com.sap.sse.datamining.annotations.Dimension;
@@ -14,9 +13,6 @@ public interface HasRaceResultOfCompetitorContext {
 
     @Connector(messageKey="Competitor", ordinal=2)
     public Competitor getCompetitor();
-    
-    @Connector(messageKey="BoatClass", ordinal=3)
-    BoatClass getBoatClass();
 
     @Dimension(messageKey="Regatta", ordinal=4)
     String getRegattaName();
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedRaceContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedRaceContext.java
index 1b5f0200163..71198811fd8 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedRaceContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedRaceContext.java
@@ -25,9 +25,6 @@ public interface HasTrackedRaceContext {
     @Connector(messageKey="CourseArea", ordinal=3)
     public CourseArea getCourseArea();
     
-    @Connector(messageKey="BoatClass", ordinal=1)
-    public BoatClass getBoatClass();
-    
     @Connector(messageKey="Fleet", ordinal=4)
     public Fleet getFleet();
     
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/LeaderboardWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/LeaderboardWithContext.java
index ef398fe8c7b..524c626811e 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/LeaderboardWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/LeaderboardWithContext.java
@@ -1,6 +1,7 @@
 package com.sap.sailing.datamining.impl.data;
 
 import com.sap.sailing.datamining.data.HasLeaderboardContext;
+import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
 import com.sap.sailing.domain.polars.PolarDataService;
 
@@ -17,6 +18,11 @@ public class LeaderboardWithContext implements HasLeaderboardContext {
     public Leaderboard getLeaderboard() {
         return leaderboard;
     }
+    
+    @Override
+    public BoatClass getBoatClass() {
+        return getLeaderboard().getBoatClass();
+    }
 
     @Override
     public PolarDataService getPolarDataService() {
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
index cee733e4097..18b2a19f88a 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
@@ -9,7 +9,6 @@ import com.sap.sailing.datamining.Activator;
 import com.sap.sailing.datamining.SailingClusterGroups;
 import com.sap.sailing.datamining.data.HasLeaderboardContext;
 import com.sap.sailing.datamining.data.HasRaceResultOfCompetitorContext;
-import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.base.Leg;
 import com.sap.sailing.domain.base.RaceColumn;
@@ -66,11 +65,6 @@ public class RaceResultOfCompetitorWithContext implements HasRaceResultOfCompeti
         return competitor;
     }
 
-    @Override
-    public BoatClass getBoatClass() {
-        return getLeaderboard().getBoatClass();
-    }
-
     @Override
     public String getRegattaName() {
         Leaderboard leaderboard = getLeaderboard();;
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
index 887931b7eb9..d1a2b9efea0 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
@@ -4,7 +4,6 @@ import java.util.Calendar;
 
 import com.sap.sailing.datamining.data.HasLeaderboardContext;
 import com.sap.sailing.datamining.data.HasTrackedRaceContext;
-import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.base.CourseArea;
 import com.sap.sailing.domain.base.Fleet;
@@ -53,11 +52,6 @@ public class TrackedRaceWithContext implements HasTrackedRaceContext {
         return getRegatta().getDefaultCourseArea();
     }
     
-    @Override
-    public BoatClass getBoatClass() {
-        return getRegatta().getBoatClass();
-    }
-    
     @Override
     public TrackedRace getTrackedRace() {
         return trackedRace;
diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/HasFleetPolarContext.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/HasFleetPolarContext.java
index 5faa649a2f3..a79288dc241 100644
--- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/HasFleetPolarContext.java
+++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/HasFleetPolarContext.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.polars.datamining.data;
 
-import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Fleet;
 import com.sap.sailing.domain.base.RaceColumn;
 import com.sap.sailing.domain.tracking.TrackedRace;
@@ -15,9 +14,6 @@ public interface HasFleetPolarContext {
     
     TrackedRace getTrackedRace();
     
-    @Connector(messageKey="BoatClass")
-    BoatClass getBoatClass();
-    
     @Connector(scanForStatistics=false)
     HasRaceColumnPolarContext getRaceColumnPolarContext();
     
diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/FleetWithPolarContext.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/FleetWithPolarContext.java
index 48dfdc6e74d..97c99956612 100644
--- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/FleetWithPolarContext.java
+++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/FleetWithPolarContext.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.polars.datamining.data.impl;
 
-import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Fleet;
 import com.sap.sailing.domain.base.RaceColumn;
 import com.sap.sailing.domain.tracking.TrackedRace;
@@ -34,11 +33,6 @@ public class FleetWithPolarContext implements HasFleetPolarContext {
         return raceColumn.getTrackedRace(fleet);
     }
 
-    @Override
-    public BoatClass getBoatClass() {
-        return getTrackedRace().getRace().getBoatClass();
-    }
-
     @Override
     public HasRaceColumnPolarContext getRaceColumnPolarContext() {
         return raceColumnPolarContext;