Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java @ 7306:d7b2c14a9693
issue1345: Adjust name of sediment yield/load facets to include fraction name and times.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 14 Oct 2013 09:53:54 +0200 |
| parents | 63fd11f57379 |
| children | 24023630f693 |
comparison
equal
deleted
inserted
replaced
| 7305:2e4ffd35cafa | 7306:d7b2c14a9693 |
|---|---|
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.artifacts; | 9 package org.dive4elements.river.artifacts; |
| 10 | 10 |
| 11 import java.util.ArrayList; | 11 import java.util.ArrayList; |
| 12 import java.util.Calendar; | |
| 13 import java.util.Date; | |
| 12 import java.util.List; | 14 import java.util.List; |
| 13 | 15 |
| 14 import org.apache.log4j.Logger; | 16 import org.apache.log4j.Logger; |
| 15 import org.w3c.dom.Document; | 17 import org.w3c.dom.Document; |
| 16 | 18 |
| 27 import org.dive4elements.river.artifacts.model.CalculationResult; | 29 import org.dive4elements.river.artifacts.model.CalculationResult; |
| 28 import org.dive4elements.river.artifacts.model.minfo.SedimentLoad; | 30 import org.dive4elements.river.artifacts.model.minfo.SedimentLoad; |
| 29 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFacet; | 31 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFacet; |
| 30 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFactory; | 32 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFactory; |
| 31 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadResult; | 33 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadResult; |
| 34 import org.dive4elements.river.artifacts.resources.Resources; | |
| 32 import org.dive4elements.river.artifacts.states.StaticState; | 35 import org.dive4elements.river.artifacts.states.StaticState; |
| 33 | 36 |
| 34 import org.dive4elements.river.artifacts.model.FacetTypes; | 37 import org.dive4elements.river.artifacts.model.FacetTypes; |
| 35 | 38 |
| 36 | 39 |
| 141 | 144 |
| 142 List<Facet> fs = new ArrayList<Facet>(); | 145 List<Facet> fs = new ArrayList<Facet>(); |
| 143 String code = getDatacageIDValue(data); | 146 String code = getDatacageIDValue(data); |
| 144 | 147 |
| 145 if (code != null) { | 148 if (code != null) { |
| 146 String name = SedimentLoadFactory.getSedimentYieldDescription(Integer.valueOf(code)); | 149 String fraction = SedimentLoadFactory.getSedimentYieldFractionName(Integer.valueOf(code)); |
| 150 String fractionName = Resources.getMsg(callMeta, fraction, "-"); | |
| 151 Date[] dates = SedimentLoadFactory.getSedimentYieldTimes(Integer.valueOf(code)); | |
| 152 Calendar date = Calendar.getInstance(); | |
| 153 date.setTime(dates[0]); | |
| 154 String name = fractionName + " " + date.get(Calendar.YEAR); | |
| 155 if (dates[1] != null) { | |
| 156 date.setTime(dates[1]); | |
| 157 name += " - " + date.get(Calendar.YEAR); | |
| 158 } | |
| 147 | 159 |
| 148 Facet facet = new SedimentLoadFacet( | 160 Facet facet = new SedimentLoadFacet( |
| 149 0, | 161 0, |
| 150 SEDIMENT_LOAD_COARSE, | 162 SEDIMENT_LOAD_COARSE, |
| 151 name, | 163 name, |