changeset 342:bb1afbbd93e4

Read x-axis label for timeseries charts from ressources, instead of a hard coded string in source. gnv-artifacts/trunk@409 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 11 Dec 2009 08:44:46 +0000 (2009-12-11)
parents 8937fd620e55
children 2e43542e6a11
files gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java gnv-artifacts/src/main/resources/lang/artifactMessages.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties
diffstat 6 files changed, 39 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Dec 11 08:44:46 2009 +0000
@@ -1,3 +1,17 @@
+2009-12-11  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Cleared Issue104.
+
+	* src/main/resources/lang/artifactMessages.properties,
+	  src/main/resources/lang/artifactMessages_de_DE.properties,
+	  src/main/resources/lang/artifactMessages_en.properties,
+	  src/main/resources/lang/artifactMessages_de.properties: Added axis label
+	  for timeseries charts.	
+
+	* src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java:
+	  Removed hard coded axis label of timeseries charts. Read label from 
+	  ressources.
+
 2009-12-09  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java,
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Fri Dec 11 08:44:46 2009 +0000
@@ -93,7 +93,7 @@
 
     private static List<TimeGap> timeGapDefinitions = null;
 
-    protected String domainLable = "Zeit [UTC]";
+    protected String domainLable = "chart.timeseries.title.xaxis";
 
     protected String featureValuesName = "featureid";
     protected String parameterValuesName = "parameterid";
@@ -230,7 +230,11 @@
                 ChartLabels chartLables = new ChartLabels(
                     createChartTitle(locale, uuid),
                     createChartSubtitle(locale, uuid),
-                    domainLable
+                    RessourceFactory.getInstance().getRessource(
+                        locale,
+                        domainLable,
+                        domainLable
+                    )
                 );
 
                 String exportFormat = getExportFormat(mimeType);
@@ -279,7 +283,12 @@
                     new ChartLabels(
                         createChartTitle(locale, uuid),
                         createChartSubtitle(locale, uuid),
-                        domainLable),
+                        RessourceFactory.getInstance().getRessource(
+                            locale,
+                            domainLable,
+                            domainLable
+                        )
+                    ),
                     uuid,
                     "A4",
                     true,
@@ -315,7 +324,11 @@
                     new ChartLabels(
                         createChartTitle(locale, uuid),
                         createChartSubtitle(locale, uuid),
-                        domainLable
+                        RessourceFactory.getInstance().getRessource(
+                            locale,
+                            domainLable,
+                            domainLable
+                        )
                     ),
                     uuid,
                     locale,
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Dec 11 08:44:46 2009 +0000
@@ -48,3 +48,5 @@
 subareaid=Subarea
 depth=depth
 coordinate=coordinate
+
+chart.timeseries.title.xaxis=Time [UTC]
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Dec 11 08:44:46 2009 +0000
@@ -48,3 +48,5 @@
 subareaid=Teilgebiet
 depth=Tiefe
 coordinate=Koordinate
+
+chart.timeseries.title.xaxis=Zeit [UTC]
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Dec 11 08:44:46 2009 +0000
@@ -48,3 +48,5 @@
 subareaid=Teilgebiet
 depth=Tiefe
 coordinate=Koordinate
+
+chart.timeseries.title.xaxis=Zeit [UTC]
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Wed Dec 09 10:22:49 2009 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Dec 11 08:44:46 2009 +0000
@@ -48,3 +48,5 @@
 subareaid=Subarea
 depth=depth
 coordinate=coordinate
+
+chart.timeseries.title.xaxis=Time [UTC]

http://dive4elements.wald.intevation.org