diff artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java @ 8267:99912f51468d

A bit less chaos in i18n for bed heights.
author "Tom Gottfried <tom@intevation.de>"
date Fri, 12 Sep 2014 19:00:45 +0200
parents e4606eae8ea5
children 5dea205ea3e7
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java	Fri Sep 12 14:56:49 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java	Fri Sep 12 19:00:45 2014 +0200
@@ -15,6 +15,9 @@
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.artifacts.CallMeta;
+
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.model.FacetTypes;
@@ -29,10 +32,8 @@
     private final static Logger log =
             Logger.getLogger(BedHeightProcessor.class);
 
-    public static final String I18N_AXIS_LABEL_DEFAULT
-        = "Sohlhoehe [m]";
     public static final String I18N_AXIS_LABEL =
-        "chart.bedheight.height.yaxis.label";
+        "chart.bedheight_middle.section.yaxis.label";
 
     protected static final double GAP_TOLERANCE = 0.101d;
 
@@ -108,19 +109,19 @@
     @Override
     public String getAxisLabel(DiagramGenerator generator) {
         D4EArtifact flys = (D4EArtifact) generator.getMaster();
+        String unit = new RiverAccess(flys).getRiver().getWstUnit().getName();
 
-        RiverAccess access = new RiverAccess(flys);
-        String unit = access.getRiver().getWstUnit().getName();
+        CallMeta meta = generator.getCallContext().getMeta();
 
         if (yAxisLabel != null && !yAxisLabel.isEmpty()) {
-            return generator.msg(
+            return Resources.getMsg(
+                meta,
                 yAxisLabel,
-                I18N_AXIS_LABEL_DEFAULT,
                 new Object[] {unit});
         }
-        return generator.msg(
+        return Resources.getMsg(
+                meta,
                 I18N_AXIS_LABEL,
-                I18N_AXIS_LABEL_DEFAULT,
                 new Object[] { unit });
     }
 }

http://dive4elements.wald.intevation.org