changeset 856:c9996913ff4b

Adjusted the subtitle creation for charts in 'Horizontalen Schnittprofilen' (see issue138). gnv-artifacts/trunk@974 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 23 Apr 2010 12:26:31 +0000 (2010-04-23)
parents e26935963871
children 482317922c8b
files gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshOutputState.java
diffstat 3 files changed, 12 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Fri Apr 23 12:11:18 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Apr 23 12:26:31 2010 +0000
@@ -1,3 +1,12 @@
+2010-04-23  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java:
+	  Inherit from HorizontalProfileMeshOutputState - both are used on meshes.
+	  Subtitle creation for charts is the same here
+
+	* src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshOutputState.java:
+	  Add newline strings after each point in the chart subtitle.
+
 2010-04-23  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue138
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java	Fri Apr 23 12:11:18 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java	Fri Apr 23 12:26:31 2010 +0000
@@ -54,7 +54,7 @@
  * @author <a href="mailto:sascha.teichmann@intevation.de">Sascha L. Teichmann</a>
  */
 public class HorizontalProfileMeshCrossOutputState
-extends      HorizontalProfileOutputState
+extends      HorizontalProfileMeshOutputState
 {
 
     public static final boolean USE_INDEX_BUFFER =
@@ -231,22 +231,6 @@
 
 
     /**
-     * The chart subtitle created by this method is build up of the timeperiod.
-     *
-     * @param locale The Locale used to adjust the language of the subtitle.
-     * @param uuid The UUID of the current artifact.
-     * @return a timeperiod as string.
-     */
-    @Override
-    protected String createChartSubtitle(Locale locale, String uuid) {
-        log.debug("create chart subtitle for horizontal crossprofile charts.");
-        String subtitle = createTimePeriod(locale, uuid);
-
-        return subtitle;
-    }
-
-
-    /**
      * Prepares the input data for chart creation.
      *
      * @param path The coordinates describing the path the data is processed
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshOutputState.java	Fri Apr 23 12:11:18 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshOutputState.java	Fri Apr 23 12:26:31 2010 +0000
@@ -35,17 +35,13 @@
 
         String coordinate = getData(locale, "mesh_point");
         if (coordinate != null) {
-            if (time != null)
-                sb.append("\n");
-
+            sb.append("\n");
             sb.append(coordinate);
         }
 
         String depth = getData(locale, "depthid");
         if (depth != null) {
-            if (coordinate != null)
-                sb.append("\n");
-
+            sb.append("\n");
             sb.append(depth);
         }
 

http://dive4elements.wald.intevation.org