Removed WindStrength as DimensionIdentifier

java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/DimensionIdentifier.java

@@ -5,7 +5,7 @@ import java.util.Comparator;
 import java.util.List;
 
 public enum DimensionIdentifier {
-    RegattaName, BoatClassName, CourseAreaName, FleetName, RaceName, LegType, LegNumber, Nationality, CompetitorName, SailID, WindStrength, Year;
+    RegattaName, BoatClassName, CourseAreaName, FleetName, RaceName, LegType, LegNumber, Nationality, CompetitorName, SailID, Year;
     
     public static class OrdinalComparator implements Comparator<DimensionIdentifier> {
         private static final List<DimensionIdentifier> dimensions = Arrays.asList(DimensionIdentifier.values());

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/DeprecatedEnumsToFunctionDTOConverter.java

@@ -78,8 +78,6 @@ public class DeprecatedEnumsToFunctionDTOConverter {
                 functionDTO = new FunctionDTOImpl("getCompetitor -> getBoat -> getSailID", HasTrackedLegOfCompetitorContext.class.getSimpleName(),
                         String.class.getSimpleName(), new ArrayList<String>(), "Sail ID", true);
                 break;
-            case WindStrength:
-                break;
             case Year:
                 functionDTO = new FunctionDTOImpl("getYear", HasTrackedRaceContext.class.getSimpleName(),
                         "Integer", new ArrayList<String>(), "Year", true);

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java

@@ -52,26 +52,27 @@ public class TrackedRaceWithContext implements HasTrackedRaceContext {
     
     @Override
     public RaceDefinition getRace() {
-        return trackedRace.getRace();
+        return getTrackedRace().getRace();
     }
 
     @Override
     public Integer getYear() {
         if (!yearHasBeenInitialized) {
-            initializeYear();
+            year = calculateYear();
+            yearHasBeenInitialized = true;
         }
         return year;
     }
 
-    private void initializeYear() {
+    private Integer calculateYear() {
-        TimePoint time = getTrackedRace().getStartOfRace() != null ? getTrackedRace().getStartOfRace() : getTrackedRace().getStartOfTracking();
+        TimePoint startOfRace = getTrackedRace().getStartOfRace();
+        TimePoint time = startOfRace != null ? startOfRace : getTrackedRace().getStartOfTracking();
         if (time == null) {
             year = 0;
         }
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(time.asDate());
-        year = calendar.get(Calendar.YEAR);
+        return calendar.get(Calendar.YEAR);
-        yearHasBeenInitialized = true;
     }
 
 }