diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java @ 9361:2aec052d4088

Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
author mschaefer
date Wed, 01 Aug 2018 18:01:11 +0200
parents 08f46ccd37ba
children 6f7e92c16050
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Wed Aug 01 17:13:52 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Wed Aug 01 18:01:11 2018 +0200
@@ -75,7 +75,7 @@
 
         final SalixLineCalculationResults results = (SalixLineCalculationResults) res.getData();
 
-        final List<SalixLineCalculationNoScenarioResult> resultList = results.getResults();
+        final List<SalixLineCalculationResult> resultList = results.getResults();
 
         int facetIndex = 0;
 
@@ -83,25 +83,14 @@
             facets.add(SalixLineProcessor.createSalixLineFacet(context, hash, this.id, facetIndex++, 0));
             facets.add(SalixLineProcessor.createSalixMnwMwFacet(context, hash, this.id, facetIndex++, 0));
 
-            if (resultList.get(0) instanceof SalixLineCalculationRegionalResult) {
-
-                final SalixLineCalculationRegionalResult result = (SalixLineCalculationRegionalResult) resultList.get(0);
+            final SalixLineCalculationResult result = resultList.get(0);
 
-                for (int i = 0; i <= result.getScenarioCount() - 1; i++) {
-                    final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw",
-                            result.getScenarioLabel(i));
-                    // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just
-                    // increment
-                    facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, i, 0, facetIndex++, sublabel));
-                }
-            } else if (resultList.get(0) instanceof SalixLineCalculationSupraRegionalResult) {
-                final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_supraregional");
-                facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, 0, 0, facetIndex++, sublabel));
-            }
-
-            else if (resultList.get(0) instanceof SalixLineCalculationHistoricalResult) {
-                final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_historical");
-                facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, 0, 0, facetIndex++, sublabel));
+            for (int i = 0; i <= result.getScenarioCount() - 1; i++) {
+                final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw",
+                        result.getScenarioLabel(i));
+                // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just
+                // increment
+                facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, i, 0, facetIndex++, sublabel));
             }
 
             final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id);

http://dive4elements.wald.intevation.org