Renamed selection type enum to dimension

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

@@ -16,19 +16,19 @@ import com.sap.sailing.datamining.impl.criterias.SailIDSelectionCriteria;
 import com.sap.sailing.datamining.impl.criterias.WildcardSelectionCriteria;
 import com.sap.sailing.datamining.impl.criterias.WindStrengthSelectionCriteria;
 import com.sap.sailing.datamining.impl.criterias.YearSelectionCriteria;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 import com.sap.sailing.datamining.shared.WindStrength;
 import com.sap.sailing.domain.common.LegType;
 
 public class SelectionCriteriaFactory {
 
-    public static SelectionCriteria createSelectionCriteria(Map<SelectionType, Collection<?>> selection) {
+    public static SelectionCriteria createSelectionCriteria(Map<Dimension, Collection<?>> selection) {
         if (selection.isEmpty()) {
             return new WildcardSelectionCriteria();
         }
         
         CompoundSelectionCriteria criteria = new CompoundSelectionCriteria();
-        for (Entry<SelectionType, Collection<?>> selectionEntry : selection.entrySet()) {
+        for (Entry<Dimension, Collection<?>> selectionEntry : selection.entrySet()) {
             if (selectionEntry.getValue() != null && !selectionEntry.getValue().isEmpty()) {
                 criteria.addCriteria(createSelectionCriteria(selectionEntry.getKey(), selectionEntry.getValue()));
             }
@@ -37,8 +37,8 @@ public class SelectionCriteriaFactory {
     }
     
     @SuppressWarnings("unchecked")
-    public static <T> SelectionCriteria createSelectionCriteria(SelectionType type, Collection<T> selection) {
-        switch (type) {
+    public static <T> SelectionCriteria createSelectionCriteria(Dimension dimension, Collection<T> selection) {
+        switch (dimension) {
         case RegattaName:
             return new RegattaSelectionCriteria((Collection<String>) selection);
         case BoatClass:

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

@@ -4,11 +4,11 @@ import java.util.Collection;
 import java.util.Map;
 
 import com.sap.sailing.datamining.impl.SelectorImpl;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 
 public class SelectorFactory {
 
-    public static Selector createSelector(Map<SelectionType, Collection<?>> selection) {
+    public static Selector createSelector(Map<Dimension, Collection<?>> selection) {
         return new SelectorImpl(SelectionCriteriaFactory.createSelectionCriteria(selection));
     }
 

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

@@ -1,6 +1,6 @@
 package com.sap.sailing.datamining.shared;
 
-public enum SelectionType {
+public enum Dimension {
     
     RegattaName, RaceName, LegNumber,
     BoatClass,

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

@@ -1,7 +0,0 @@
-package com.sap.sailing.datamining.shared;
-
-public enum SelectorType {
-    
-    Events, Regattas
-
-}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java

@@ -9,7 +9,7 @@ import java.util.Set;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 import com.sap.sailing.domain.common.DetailType;
 import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount;
 import com.sap.sailing.domain.common.MaxPointsReason;
@@ -330,5 +330,5 @@ public interface SailingService extends RemoteService {
 
     MasterDataImportObjectCreationCount importMasterData(String host, String[] groupNames, boolean override);
 
-    Pair<Double, Double> runQueryAsBenchmark(Map<SelectionType, Collection<?>> selection);
+    Pair<Double, Double> runQueryAsBenchmark(Map<Dimension, Collection<?>> selection);
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java

@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 import com.sap.sailing.domain.common.DetailType;
 import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount;
 import com.sap.sailing.domain.common.MaxPointsReason;
@@ -455,7 +455,7 @@ public interface SailingServiceAsync {
     /**
      * Creates and runs a data mining query with the specified properties.
      */
-    void runQueryAsBenchmark(Map<SelectionType, Collection<?>> selection, AsyncCallback<Pair<Double, Double>> asyncCallback);
+    void runQueryAsBenchmark(Map<Dimension, Collection<?>> selection, AsyncCallback<Pair<Double, Double>> asyncCallback);
     
 }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ClientQueryData.java

@@ -3,21 +3,21 @@ package com.sap.sailing.gwt.ui.datamining;
 import java.util.Collection;
 import java.util.Map;
 
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 
 public class ClientQueryData {
     
-    private Map<SelectionType, Collection<?>> selection;
+    private Map<Dimension, Collection<?>> selection;
     private int times;
     private int currentRun;
 
-    public ClientQueryData(Map<SelectionType, Collection<?>> selection, int times, int currentRun) {
+    public ClientQueryData(Map<Dimension, Collection<?>> selection, int times, int currentRun) {
         this.selection = selection;
         this.times = times;
         this.currentRun = currentRun;
     }
 
-    public Map<SelectionType, Collection<?>> getSelection() {
+    public Map<Dimension, Collection<?>> getSelection() {
         return selection;
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java

@@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.view.client.ListDataProvider;
 import com.google.gwt.view.client.MultiSelectionModel;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 import com.sap.sailing.domain.common.LegType;
 import com.sap.sailing.domain.common.dto.BoatClassDTO;
 import com.sap.sailing.domain.common.dto.CompetitorDTO;
@@ -140,15 +140,15 @@ public class DataMiningEntryPoint extends AbstractEntryPoint {
         return functionsPanel;
     }
     
-    private Map<SelectionType, Collection<?>> getSelection() {
-        Map<SelectionType, Collection<?>> selection = new HashMap<SelectionType, Collection<?>>();
+    private Map<Dimension, Collection<?>> getSelection() {
+        Map<Dimension, Collection<?>> selection = new HashMap<Dimension, Collection<?>>();
         
         if (!raceNameSelectionModel.getSelectedSet().isEmpty()) {
             Collection<String> regattaNames = new HashSet<String>();
             for (RegattaDTO regatta : regattaNameSelectionModel.getSelectedSet()) {
                 regattaNames.add(regatta.getName());
             }
-            selection.put(SelectionType.RegattaName, regattaNames);
+            selection.put(Dimension.RegattaName, regattaNames);
         }
         
         if (!boatClassSelectionModel.getSelectedSet().isEmpty()) {
@@ -156,7 +156,7 @@ public class DataMiningEntryPoint extends AbstractEntryPoint {
             for (BoatClassDTO boatClass : boatClassSelectionModel.getSelectedSet()) {
                 boatClassNames.add(boatClass.getName());
             }
-            selection.put(SelectionType.BoatClass, boatClassNames);
+            selection.put(Dimension.BoatClass, boatClassNames);
         }
         
         if (!raceNameSelectionModel.getSelectedSet().isEmpty()) {
@@ -164,17 +164,17 @@ public class DataMiningEntryPoint extends AbstractEntryPoint {
             for (RaceDTO race : raceNameSelectionModel.getSelectedSet()) {
                 raceNames.add(race.getName());
             }
-            selection.put(SelectionType.RaceName, raceNames);
+            selection.put(Dimension.RaceName, raceNames);
         }
         
         if (!legNumberSelectionModel.getSelectedSet().isEmpty()) {
             Collection<Integer> raceNames = new HashSet<Integer>(legNumberSelectionModel.getSelectedSet());
-            selection.put(SelectionType.LegNumber, raceNames);
+            selection.put(Dimension.LegNumber, raceNames);
         }
         
         if (!legTypeSelectionModel.getSelectedSet().isEmpty()) {
             Collection<LegType> legTypes = new HashSet<LegType>(legTypeSelectionModel.getSelectedSet());
-            selection.put(SelectionType.LegType, legTypes);
+            selection.put(Dimension.LegType, legTypes);
         }
         
         if (!competitorNameSelectionModel.getSelectedSet().isEmpty()) {
@@ -182,7 +182,7 @@ public class DataMiningEntryPoint extends AbstractEntryPoint {
             for (CompetitorDTO competitor : competitorNameSelectionModel.getSelectedSet()) {
                 competitorNames.add(competitor.getName());
             }
-            selection.put(SelectionType.CompetitorName, competitorNames);
+            selection.put(Dimension.CompetitorName, competitorNames);
         }
         
         if (!competitorSailIDSelectionModel.getSelectedSet().isEmpty()) {
@@ -190,12 +190,12 @@ public class DataMiningEntryPoint extends AbstractEntryPoint {
             for (CompetitorDTO competitor : competitorSailIDSelectionModel.getSelectedSet()) {
                 sailIDs.add(competitor.getSailID());
             }
-            selection.put(SelectionType.SailID, sailIDs);
+            selection.put(Dimension.SailID, sailIDs);
         }
         
         if (!nationalitySelectionModel.getSelectedSet().isEmpty()) {
             Collection<String> nationalities = new HashSet<String>(nationalitySelectionModel.getSelectedSet());
-            selection.put(SelectionType.Nationality, nationalities);
+            selection.put(Dimension.Nationality, nationalities);
         }
         
         return selection;

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

@@ -53,7 +53,7 @@ import com.sap.sailing.datamining.Query;
 import com.sap.sailing.datamining.QueryFactory;
 import com.sap.sailing.datamining.Selector;
 import com.sap.sailing.datamining.SelectorFactory;
-import com.sap.sailing.datamining.shared.SelectionType;
+import com.sap.sailing.datamining.shared.Dimension;
 import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.base.ControlPoint;
@@ -3317,7 +3317,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
     }
 
     @Override
-    public Pair<Double, Double> runQueryAsBenchmark(Map<SelectionType, Collection<?>> selection) {
+    public Pair<Double, Double> runQueryAsBenchmark(Map<Dimension, Collection<?>> selection) {
         final long startTime = System.nanoTime();
         Selector selector = SelectorFactory.createSelector(selection);
         Query query = QueryFactory.createQuery(selector);