Moved AggregatorType and StatisticType to Components

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

@@ -20,13 +20,13 @@ import com.sap.sailing.datamining.impl.criterias.AndCompoundFilterCriteria;
 import com.sap.sailing.datamining.impl.criterias.CompoundFilterCriteria;
 import com.sap.sailing.datamining.impl.criterias.DimensionValuesFilterCriteria;
 import com.sap.sailing.datamining.impl.gpsfix.GPSFixBaseBindingProvider;
-import com.sap.sailing.datamining.impl.gpsfix.SimpleGPSFixRetriever;
+import com.sap.sailing.datamining.impl.gpsfix.GPSFixRetriever;
 import com.sap.sailing.datamining.impl.gpsfix.GroupGPSFixesByDimension;
-import com.sap.sailing.datamining.shared.AggregatorType;
+import com.sap.sailing.datamining.shared.Components.AggregatorType;
+import com.sap.sailing.datamining.shared.Components.StatisticType;
 import com.sap.sailing.datamining.shared.DataTypes;
-import com.sap.sailing.datamining.shared.SharedDimension;
 import com.sap.sailing.datamining.shared.QueryDefinition;
-import com.sap.sailing.datamining.shared.StatisticType;
+import com.sap.sailing.datamining.shared.SharedDimension;
 import com.sap.sailing.domain.base.Moving;
 
 public class DataMiningFactory {
@@ -64,7 +64,7 @@ public class DataMiningFactory {
     }
 
     public static DataRetriever<GPSFixWithContext> createGPSFixRetriever() {
-        return new SimpleGPSFixRetriever();
+        return new GPSFixRetriever();
     }
     
     /**

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/SmartQueryDefinition.java

@@ -3,12 +3,12 @@ package com.sap.sailing.datamining.impl;
 import java.util.List;
 import java.util.Map;
 
-import com.sap.sailing.datamining.shared.AggregatorType;
+import com.sap.sailing.datamining.shared.Components.AggregatorType;
 import com.sap.sailing.datamining.shared.Components.GrouperType;
+import com.sap.sailing.datamining.shared.Components.StatisticType;
 import com.sap.sailing.datamining.shared.DataTypes;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.datamining.shared.SharedDimension;
-import com.sap.sailing.datamining.shared.StatisticType;
 
 public class SmartQueryDefinition implements QueryDefinition {
     private static final long serialVersionUID = -4195720362233906108L;

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/gpsfix/GPSFixRetriever.java

@@ -21,7 +21,7 @@ import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.server.RacingEventService;
 
-public class SimpleGPSFixRetriever implements DataRetriever<GPSFixWithContext> {
+public class GPSFixRetriever implements DataRetriever<GPSFixWithContext> {
     
     @Override
     public Collection<GPSFixWithContext> retrieveData(RacingEventService racingEventService) {

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

@@ -1,7 +0,0 @@
-package com.sap.sailing.datamining.shared;
-
-public enum AggregatorType {
-    
-    Sum, Average
-
-}

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

@@ -1,9 +1,36 @@
 package com.sap.sailing.datamining.shared;
 
 public final class Components {
-    
-    public enum GrouperType { Dimensions, Custom }
-    
-    private Components() { }
+
+    public enum GrouperType {
+        Dimensions, Custom
+    }
+
+    public enum AggregatorType {
+        Sum, Average
+    }
+
+    public enum StatisticType {
+
+        DataAmount(ValueType.Integer), Speed(ValueType.Double);
+
+        public static enum ValueType {
+            Integer, Double
+        }
+
+        private ValueType valueType;
+
+        private StatisticType(ValueType valueType) {
+            this.valueType = valueType;
+        }
+
+        public ValueType getValueType() {
+            return valueType;
+        }
+
+    }
+
+    private Components() {
+    }
 
 }

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

@@ -4,7 +4,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import com.sap.sailing.datamining.shared.Components.AggregatorType;
 import com.sap.sailing.datamining.shared.Components.GrouperType;
+import com.sap.sailing.datamining.shared.Components.StatisticType;
 
 public interface QueryDefinition extends Serializable {
 

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

@@ -6,7 +6,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.sap.sailing.datamining.shared.Components.AggregatorType;
 import com.sap.sailing.datamining.shared.Components.GrouperType;
+import com.sap.sailing.datamining.shared.Components.StatisticType;
 
 public class SimpleQueryDefinition implements QueryDefinition {
     private static final long serialVersionUID = 3476324726640558091L;

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

@@ -1,20 +0,0 @@
-package com.sap.sailing.datamining.shared;
-
-public enum StatisticType {
-    
-    DataAmount(ValueType.Integer),
-    Speed(ValueType.Double);
-    
-    public static enum ValueType {Integer, Double}
-    
-    private ValueType valueType;
-
-    private StatisticType(ValueType valueType) {
-        this.valueType = valueType;
-    }
-
-    public ValueType getValueType() {
-        return valueType;
-    }
-
-}