Revize 851ab2cf

re #7885 merge master re #8134 merge master; re #8154 merge master; re #8136 merge master; no comments

src/main/java/vldc/aswi/service/SqlQueryManager.java

@@ -1 +1 @@
 package vldc.aswi.service;
 
+import vldc.aswi.domain.Configuration;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 
@@ -12 +13 @@
 
     /**
      * Get list of  contingencyTableRow.
-     * @param sqlQuery
-     * @param parameterInConfigurations
      * @return List of contingencyTableRow.
      */
-    List<ContingencyTableRow> getContingencyTableRow(String sqlQuery, List<ParameterInConfiguration> parameterInConfigurations);
+    List<ContingencyTableRow> getContingencyTableRow(Configuration configuration);
 
     /**
      * Validate given SQL query.

src/main/java/vldc/aswi/service/SqlQueryManagerImpl.java

@@ -55 +55 @@
         // sort parameters in configuration to have them in order set by user
         Collections.sort(copiedParametersInConfiguration);
 
-        initializeContingencyTableDataLists(rowNames, columnNames, valueFunctions, configuration.getParametersInConfiguration());
+        initializeContingencyTableDataLists(rowNames, columnNames, valueFunctions, copiedParametersInConfiguration);
 
         Converter converter = new Converter(tableColumns, rowNames, columnNames, valueFunctions, true);
         return converter.convertTableColumnsToContingencyTableRows();