Fixed errors after cleanup

java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/QueryDefinitionImpl.java

@@ -1,10 +1,10 @@
 package com.sap.sailing.datamining.shared.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.gwt.dev.util.collect.HashMap;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sse.datamining.shared.components.AggregatorType;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;

java/com.sap.sailing.datamining/META-INF/MANIFEST.MF

@@ -7,7 +7,8 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.sap.sailing.server,
  org.osgi.framework;version="1.7.0"
-Export-Package: com.sap.sailing.datamining.data,
+Export-Package: com.sap.sailing.datamining,
+ com.sap.sailing.datamining.data,
  com.sap.sailing.datamining.factories
 Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sailing.domain.common,
@@ -15,4 +16,4 @@ Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sse.datamining;bundle-version="1.0.0",
  com.sap.sse.datamining.shared;bundle-version="1.0.0"
 Bundle-ClassPath: .
-Bundle-Activator: com.sap.sailing.datamining.impl.Activator
+Bundle-Activator: com.sap.sailing.datamining.Activator

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

@@ -1,4 +1,4 @@
-package com.sap.sailing.datamining.impl;
+package com.sap.sailing.datamining;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

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

@@ -1,4 +1,4 @@
-package com.sap.sailing.datamining.impl;
+package com.sap.sailing.datamining;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.sap.sailing.datamining.impl;
+package com.sap.sailing.datamining;
 
 import java.util.Map.Entry;
 

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

@@ -3,10 +3,10 @@ package com.sap.sailing.datamining.factories;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sap.sailing.datamining.DeprecatedToFunctionConverter;
+import com.sap.sailing.datamining.QueryDefinitionConverter;
 import com.sap.sailing.datamining.data.HasGPSFixContext;
 import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
-import com.sap.sailing.datamining.impl.DeprecatedToFunctionConverter;
-import com.sap.sailing.datamining.impl.QueryDefinitionConverter;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
 import com.sap.sse.datamining.Query;
@@ -23,7 +23,7 @@ public final class DataMiningFactory {
     }
     
     // TODO Delete, after the deprecated components have been removed
-    public <DataSourceType, ElementType> Query<Double> createQuery(QueryDefinitionDeprecated queryDefinition, DataSourceType dataSource) {
+    public static <DataSourceType, ElementType> Query<Double> createQuery(QueryDefinitionDeprecated queryDefinition, DataSourceType dataSource) {
         return createQuery(QueryDefinitionConverter.convertDeprecatedQueryDefinition(queryDefinition), dataSource);
     }
 

java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataRetrieverFactory.java

@@ -7,10 +7,10 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import com.sap.sailing.datamining.DeprecatedToFunctionConverter;
 import com.sap.sailing.datamining.data.HasGPSFixContext;
 import com.sap.sailing.datamining.data.HasTrackedLegContext;
 import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
-import com.sap.sailing.datamining.impl.DeprecatedToFunctionConverter;
 import com.sap.sailing.datamining.impl.components.GPSFixRetrievalProcessor;
 import com.sap.sailing.datamining.impl.components.LeaderboardGroupRetrievalProcessor;
 import com.sap.sailing.datamining.impl.components.RegattaLeaderboardFilteringRetrievalProcessor;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java

@@ -87,7 +87,8 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
 
     @Override
     public <ResultType extends Number> QueryResult<ResultType> runQuery(QueryDefinitionDeprecated queryDefinition) throws Exception {
-        Query<ResultType> query = DataMiningFactory.createQuery(queryDefinition, getRacingEventService());
+        @SuppressWarnings("unchecked") // TODO Fix after the data mining has been cleaned
+        Query<ResultType> query = (Query<ResultType>) DataMiningFactory.createQuery(queryDefinition, getRacingEventService());
         return query.run();
     }