The filter dimensions are now corresponding to the retriever chain

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

@@ -6,17 +6,18 @@ import java.util.Map;
 
 import com.sap.sse.datamining.shared.components.AggregatorType;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 
 public interface QueryDefinition extends Serializable {
     
     public String getLocaleInfoName();
     
+    public FunctionDTO getStatisticToCalculate();
+    public AggregatorType getAggregatorType();
+    
+    public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition();
     public Map<FunctionDTO, Iterable<? extends Serializable>> getFilterSelection();
     
     public List<FunctionDTO> getDimensionsToGroupBy();
-    
-    public FunctionDTO getStatisticToCalculate();
-    
-    public AggregatorType getAggregatorType();
 
 }

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

@@ -9,15 +9,17 @@ import java.util.Map;
 import com.sap.sse.datamining.shared.QueryDefinition;
 import com.sap.sse.datamining.shared.components.AggregatorType;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 
 public class QueryDefinitionImpl implements QueryDefinition {
     private static final long serialVersionUID = -6438771277564908352L;
     
     private String localeInfoName;
-    private Map<FunctionDTO, Iterable<? extends Serializable>> filterSelection;
-    private List<FunctionDTO> dimensionsToGroupBy;
     private FunctionDTO statisticToCalculate;
     private AggregatorType aggregatorType;
+    private List<FunctionDTO> dimensionsToGroupBy;
+    private DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition;
+    private Map<FunctionDTO, Iterable<? extends Serializable>> filterSelection;
     
     /**
      * <b>Constructor for the GWT-Serialization. Don't use this!</b>
@@ -25,12 +27,13 @@ public class QueryDefinitionImpl implements QueryDefinition {
     @Deprecated
     QueryDefinitionImpl() { }
 
-    public QueryDefinitionImpl(String localeInfoName, FunctionDTO statisticToCalculate, AggregatorType aggregatorType) {
+    public QueryDefinitionImpl(String localeInfoName, FunctionDTO statisticToCalculate, AggregatorType aggregatorType, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition) {
         this.localeInfoName = localeInfoName;
-        this.filterSelection = new HashMap<FunctionDTO, Iterable<? extends Serializable>>();
-        this.dimensionsToGroupBy = new ArrayList<FunctionDTO>();
         this.statisticToCalculate = statisticToCalculate;
         this.aggregatorType = aggregatorType;
+        this.dataRetrieverChainDefinition = dataRetrieverChainDefinition;
+        this.filterSelection = new HashMap<FunctionDTO, Iterable<? extends Serializable>>();
+        this.dimensionsToGroupBy = new ArrayList<FunctionDTO>();
     }
     
     public void setFilterSelectionFor(FunctionDTO dimension, Iterable<? extends Serializable> selection) {
@@ -45,6 +48,11 @@ public class QueryDefinitionImpl implements QueryDefinition {
     public String getLocaleInfoName() {
         return localeInfoName;
     }
+    
+    @Override
+    public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition() {
+        return dataRetrieverChainDefinition;
+    }
 
     @Override
     public Map<FunctionDTO, Iterable<? extends Serializable>> getFilterSelection() {

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java

@@ -1,13 +1,21 @@
 package com.sap.sse.datamining.shared.impl.dto;
 
+import java.io.Serializable;
 import java.util.UUID;
 
-public class DataRetrieverChainDefinitionDTO implements Comparable<DataRetrieverChainDefinitionDTO> {
+public class DataRetrieverChainDefinitionDTO implements Serializable, Comparable<DataRetrieverChainDefinitionDTO> {
+    private static final long serialVersionUID = 7806173601799997214L;
     
-    private final UUID id;
-    private final String name;
-    private final String dataSourceTypeName;
-    private final String retrievedDataTypeName;
+    private UUID id;
+    private String name;
+    private String dataSourceTypeName;
+    private String retrievedDataTypeName;
+
+    /**
+     * <b>Constructor for the GWT-Serialization. Don't use this!</b>
+     */
+    @Deprecated
+    DataRetrieverChainDefinitionDTO() { }
 
     public DataRetrieverChainDefinitionDTO(UUID id, String name, String dataSourceTypeName, String retrievedDataTypeName) {
         this.id = id;