Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java @ 9347:08f46ccd37ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
salix.regional refactoring
author gernotbelger
date Tue, 31 Jul 2018 16:04:01 +0200
parents a978b601a034
children 2aec052d4088
comparison
equal deleted inserted replaced
9346:d89976700474 9347:08f46ccd37ba
75 75
76 final SalixLineCalculationResults results = (SalixLineCalculationResults) res.getData(); 76 final SalixLineCalculationResults results = (SalixLineCalculationResults) res.getData();
77 77
78 final List<SalixLineCalculationNoScenarioResult> resultList = results.getResults(); 78 final List<SalixLineCalculationNoScenarioResult> resultList = results.getResults();
79 79
80 int facetIndex = 0;
81
80 if (!resultList.isEmpty()) { 82 if (!resultList.isEmpty()) {
81 facets.add(SalixLineProcessor.createSalixLineFacet(context, hash, this.id, resultList.get(0), 0, 0)); 83 facets.add(SalixLineProcessor.createSalixLineFacet(context, hash, this.id, facetIndex++, 0));
82 facets.add(SalixLineProcessor.createSalixMnwMwFacet(context, hash, this.id, resultList.get(0), 0, 0)); 84 facets.add(SalixLineProcessor.createSalixMnwMwFacet(context, hash, this.id, facetIndex++, 0));
85
83 if (resultList.get(0) instanceof SalixLineCalculationRegionalResult) { 86 if (resultList.get(0) instanceof SalixLineCalculationRegionalResult) {
87
84 final SalixLineCalculationRegionalResult result = (SalixLineCalculationRegionalResult) resultList.get(0); 88 final SalixLineCalculationRegionalResult result = (SalixLineCalculationRegionalResult) resultList.get(0);
89
85 for (int i = 0; i <= result.getScenarioCount() - 1; i++) { 90 for (int i = 0; i <= result.getScenarioCount() - 1; i++) {
86 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw", 91 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_deltaw", "uinfo_salix_scenario_deltaw",
87 result.getScenarioLabel(i)); 92 result.getScenarioLabel(i));
88 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, result, i, 0, sublabel)); 93 // REMARK: using data index as facetIndex, as we know there is only one result of this type. Else we should just
94 // increment
95 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, i, 0, facetIndex++, sublabel));
89 } 96 }
90 } 97 } else if (resultList.get(0) instanceof SalixLineCalculationSupraRegionalResult) {
91 else if (resultList.get(0) instanceof SalixLineCalculationSupraRegionalResult) {
92 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_supraregional"); 98 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_supraregional");
93 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, resultList.get(0), 0, 0, sublabel)); 99 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, 0, 0, facetIndex++, sublabel));
94 } 100 }
95 101
96 else if (resultList.get(0) instanceof SalixLineCalculationHistoricalResult) { 102 else if (resultList.get(0) instanceof SalixLineCalculationHistoricalResult) {
97 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_historical"); 103 final String sublabel = Resources.getMsg(context.getMeta(), "uinfo_salix_scenario_historical");
98 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, resultList.get(0), 0, 0, sublabel)); 104 facets.add(SalixLineProcessor.createSalixScenarioFacet(context, hash, this.id, 0, 0, facetIndex++, sublabel));
99 } 105 }
100 106
101 final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id); 107 final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id);
102 final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id); 108 final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id);
103 109
http://dive4elements.wald.intevation.org