Mercurial > dive4elements > river
changeset 3767:b4ad8dafe584
Created i18n descriptions for facets in bed quality calculation.
flys-artifacts/trunk@5470 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 14 Sep 2012 13:53:16 +0000 (2012-09-14) |
parents | d29cebf371ba |
children | 00aafe1fedd7 |
files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties |
diffstat | 6 files changed, 163 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/ChangeLog Fri Sep 14 13:53:16 2012 +0000 @@ -1,3 +1,14 @@ +2012-09-14 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java: + Create i18n facet descriptions. + + * src/main/resources/messages.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties, + src/main/resources/messages_de.properties: New i18n strings for facets + in bed quality calculation. + 2012-09-14 Ingo Weinzierl <ingo@intevation.de> * doc/conf/artifacts/minfo.xml: Splitted facets for diameter of bed into
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java Fri Sep 14 13:53:16 2012 +0000 @@ -1,15 +1,18 @@ package de.intevation.flys.artifacts.states.minfo; import java.util.ArrayList; +import java.util.Date; import java.util.List; import org.apache.log4j.Logger; import de.intevation.artifactdatabase.state.Facet; import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.access.BedQualityAccess; import de.intevation.flys.artifacts.model.CalculationResult; +import de.intevation.flys.artifacts.model.DateRange; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.minfo.BedBedQualityResult; import de.intevation.flys.artifacts.model.minfo.BedDensityFacet; @@ -19,6 +22,7 @@ import de.intevation.flys.artifacts.model.minfo.BedQualityCalculation; import de.intevation.flys.artifacts.model.minfo.BedQualityResult; import de.intevation.flys.artifacts.model.minfo.BedloadDiameterFacet; +import de.intevation.flys.artifacts.resources.Resources; import de.intevation.flys.artifacts.states.DefaultState; @@ -29,6 +33,17 @@ private static final Logger logger = Logger .getLogger(BedQualityState.class); + public static final String I18N_TOPLAYER = "bedquality.toplayer"; + public static final String I18N_SUBLAYER = "bedquality.sublayer"; + + public static final String I18N_FACET_BED_POROSITY_TOPLAYER = "facet.bedquality.bed.porosity.toplayer"; + public static final String I18N_FACET_BED_POROSITY_SUBLAYER = "facet.bedquality.bed.porosity.sublayer"; + public static final String I18N_FACET_BED_DENSITY_TOPLAYER = "facet.bedquality.bed.density.toplayer"; + public static final String I18N_FACET_BED_DENSITY_SUBLAYER = "facet.bedquality.bed.density.sublayer"; + public static final String I18N_FACET_BED_DIAMETER_TOPLAYER = "facet.bedquality.bed.diameter.toplayer"; + public static final String I18N_FACET_BED_DIAMETER_SUBLAYER = "facet.bedquality.bed.diameter.sublayer"; + public static final String I18N_FACET_BEDLOAD_DIAMETER = "facet.bedquality.bedload.diameter"; + @Override public Object computeAdvance(FLYSArtifact artifact, String hash, CallContext context, List<Facet> facets, Object old) { @@ -52,7 +67,7 @@ return res; } - generateFacets(newFacets, results, getID(), hash); + generateFacets(context, newFacets, results, getID(), hash); logger.debug("Created " + newFacets.size() + " new Facets."); facets.addAll(newFacets); @@ -60,53 +75,131 @@ return res; } - protected void generateFacets(List<Facet> newFacets, + protected void generateFacets(CallContext context, List<Facet> newFacets, BedQualityResult[] results, String stateId, String hash) { logger.debug("BedQualityState.generateFacets"); + CallMeta meta = context.getMeta(); + for (int idx = 0; idx < results.length; idx++) { BedQualityResult result = results[idx]; if (result instanceof BedBedQualityResult) { - // TODO I18N for Facet description + BedBedQualityResult data = (BedBedQualityResult) result; newFacets.add(new BedPorosityFacet(idx, - BED_QUALITY_POROSITY_TOPLAYER, "porosity_toplayer", - ComputeType.ADVANCE, stateId, hash)); - - // TODO I18N for Facet description - newFacets.add(new BedPorosityFacet(idx, - BED_QUALITY_POROSITY_SUBLAYER, "porosity_sublayer", + BED_QUALITY_POROSITY_TOPLAYER, + createPorosityTopLayerDescription(meta, data), ComputeType.ADVANCE, stateId, hash)); - // TODO I18N for Facet description - newFacets.add(new BedDensityFacet(idx, - BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER, "density_toplayer", + newFacets.add(new BedPorosityFacet(idx, + BED_QUALITY_POROSITY_SUBLAYER, + createPorositySubLayerDescription(meta, data), ComputeType.ADVANCE, stateId, hash)); - // TODO I18N for Facet description newFacets.add(new BedDensityFacet(idx, - BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER, "density_sublayer", + BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER, + createDensityTopLayerDescription(meta, data), ComputeType.ADVANCE, stateId, hash)); - // TODO I18N for Facet description - newFacets.add(new BedloadDiameterFacet(idx, - BED_QUALITY_BED_DIAMETER_TOPLAYER, "bed diameter_toplayer", + newFacets.add(new BedDensityFacet(idx, + BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER, + createDensitySubLayerDescription(meta, data), ComputeType.ADVANCE, stateId, hash)); - - // TODO I18N for Facet description + newFacets.add(new BedloadDiameterFacet(idx, - BED_QUALITY_BED_DIAMETER_SUBLAYER, "bed diameter_sublayer", + BED_QUALITY_BED_DIAMETER_TOPLAYER, + createDiameterTopLayerDescription(meta, data), + ComputeType.ADVANCE, stateId, hash)); + + newFacets.add(new BedloadDiameterFacet(idx, + BED_QUALITY_BED_DIAMETER_SUBLAYER, + createDiameterSubLayerDescription(meta, data), ComputeType.ADVANCE, stateId, hash)); } else if (result instanceof BedLoadBedQualityResult) { - // TODO I18N for Facet description - newFacets.add(new BedDiameterFacet(idx, BED_QUALITY_BEDLOAD_DIAMETER, - "bedload diameter", ComputeType.ADVANCE, stateId, hash)); + newFacets.add(new BedDiameterFacet(idx, + BED_QUALITY_BEDLOAD_DIAMETER, createDiameterDescription( + meta, result), ComputeType.ADVANCE, stateId, hash)); } else { logger.warn("unknown result object: " + result.getClass()); } } } + + protected String createPorosityTopLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String toplayer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER); + return Resources.getMsg(meta, I18N_FACET_BED_POROSITY_TOPLAYER, + I18N_FACET_BED_POROSITY_TOPLAYER, new Object[] { from, to, toplayer }); + } + + protected String createPorositySubLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER); + return Resources.getMsg(meta, I18N_FACET_BED_POROSITY_SUBLAYER, + I18N_FACET_BED_POROSITY_SUBLAYER, new Object[] { from, to, sublayer }); + } + + protected String createDensityTopLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String toplayer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER); + return Resources.getMsg(meta, I18N_FACET_BED_DENSITY_TOPLAYER, + I18N_FACET_BED_DENSITY_TOPLAYER, new Object[] { from, to, toplayer }); + } + + protected String createDensitySubLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER); + return Resources.getMsg(meta, I18N_FACET_BED_DENSITY_SUBLAYER, + I18N_FACET_BED_DENSITY_SUBLAYER, new Object[] { from, to, sublayer }); + } + + protected String createDiameterTopLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String toplayer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER); + + return Resources.getMsg(meta, I18N_FACET_BED_DIAMETER_TOPLAYER, + I18N_FACET_BED_DIAMETER_TOPLAYER, new Object[] { result.getType(), + from, to, toplayer }); + } + + protected String createDiameterSubLayerDescription(CallMeta meta, + BedBedQualityResult result) { + DateRange range = result.getDateRange(); + Date from = range != null ? range.getFrom() : new Date(); + Date to = range != null ? range.getTo() : new Date(); + + String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER); + return Resources.getMsg(meta, I18N_FACET_BED_DIAMETER_SUBLAYER, + I18N_FACET_BED_DIAMETER_SUBLAYER, new Object[] { result.getType(), + from, to, sublayer }); + } + + protected String createDiameterDescription(CallMeta meta, + BedQualityResult result) { + return Resources.getMsg(meta, I18N_FACET_BEDLOAD_DIAMETER, + I18N_FACET_BEDLOAD_DIAMETER, new Object[] { result.getType() }); + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/resources/messages.properties Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages.properties Fri Sep 14 13:53:16 2012 +0000 @@ -204,6 +204,15 @@ facet.flow_velocity.tauchannel = TAU Mainchannel at {0} facet.bedheight_middle.single = Bed Height {0,number,####} facet.bedheight_middle.epoch = Bed Height Epoch {0,number,####} - {1,number,####} +facet.bedquality.bed.porosity.toplayer = Porosity ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.porosity.sublayer = Porosity ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.toplayer = Density ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.sublayer = Density ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.diameter.toplayer = {0}_Bed ({1,date} - {2,date}) ({3}) +facet.bedquality.bed.diameter.sublayer = {0}_Bed ({1,date} - {2,date}) ({3}) +facet.bedquality.bedload.diameter = {0}_Bedload +bedquality.toplayer = 0.0m - 0.3m +bedquality.sublayer = 0.1m - 0.5m export.waterlevel.csv.header.km = River-Km export.waterlevel.csv.header.w = W [NN + m]
--- a/flys-artifacts/src/main/resources/messages_de.properties Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_de.properties Fri Sep 14 13:53:16 2012 +0000 @@ -204,6 +204,15 @@ facet.flow_velocity.tauchannel = TAU Hauptgerinne bei {0} facet.bedheight_middle.single = Sohlh\u00f6he {0,number,####} facet.bedheight_middle.epoch = Sohlh\u00f6he Epoche {0,number,####} - {1,number,####} +facet.bedquality.bed.porosity.toplayer = Porosit\u00e4t ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.porosity.sublayer = Porosit\u00e4t ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.toplayer = Dichte ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.sublayer = Dichte ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.diameter.toplayer = {0}_Sohle ({1,date} - {2,date}) ({3}) +facet.bedquality.bed.diameter.sublayer = {0}_Sohle ({1,date} - {2,date}) ({3}) +facet.bedquality.bedload.diameter = {0}_Geschiebe +bedquality.toplayer = 0,0m - 0,3m +bedquality.sublayer = 0,1m - 0,5m export.waterlevel.csv.header.km = Fluss-Km export.waterlevel.csv.header.w = W [NN + m]
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Sep 14 13:53:16 2012 +0000 @@ -202,6 +202,15 @@ facet.flow_velocity.tauchannel = TAU Hauptgerinne bei {0} facet.bedheight_middle.single = Sohlh\u00f6he {0,number,####} facet.bedheight_middle.epoch = Sohlh\u00f6he Epoche {0,number,####} - {1,number,####} +facet.bedquality.bed.porosity.toplayer = Porosit\u00e4t ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.porosity.sublayer = Porosit\u00e4t ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.toplayer = Dichte ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.sublayer = Dichte ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.diameter.toplayer = {0}_Sohle ({1,date} - {2,date}) ({3}) +facet.bedquality.bed.diameter.sublayer = {0}_Sohle ({1,date} - {2,date}) ({3}) +facet.bedquality.bedload.diameter = {0}_Geschiebe +bedquality.toplayer = 0,0m - 0,3m +bedquality.sublayer = 0,1m - 0,5m export.waterlevel.csv.header.km = Fluss-Km export.waterlevel.csv.header.w = W [NN + m]
--- a/flys-artifacts/src/main/resources/messages_en.properties Fri Sep 14 12:20:57 2012 +0000 +++ b/flys-artifacts/src/main/resources/messages_en.properties Fri Sep 14 13:53:16 2012 +0000 @@ -206,6 +206,15 @@ facet.flow_velocity.tauchannel = TAU Mainchannel at {0} facet.bedheight_middle.single = Bed Height {0,number,####} facet.bedheight_middle.epoch = Bed Height Epoch {0,number,####} - {1,number,####} +facet.bedquality.bed.porosity.toplayer = Porosity ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.porosity.sublayer = Porosity ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.toplayer = Density ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.density.sublayer = Density ({0,date} - {1,date}) ({2}) +facet.bedquality.bed.diameter.toplayer = {0}_Bed ({1,date} - {2,date}) ({3}) +facet.bedquality.bed.diameter.sublayer = {0}_Bed ({1,date} - {2,date}) ({3}) +facet.bedquality.bedload.diameter = {0}_Bedload +bedquality.toplayer = 0.0m - 0.3m +bedquality.sublayer = 0.1m - 0.5m export.waterlevel.csv.header.km = River-Km export.waterlevel.csv.header.w = W [NN + m]