--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Dec 23 08:57:25 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Dec 23 14:24:57 2011 +0000
@@ -125,35 +125,23 @@
 
 
     /**
-     * Returns a title for the chart from ChartSettings object
-     * if this object is not null or creates a default title.
+     * Returns the default title for this chart.
      *
-     * @return a title.
+     * @return the default title for this chart.
      */
     @Override
-    public String getChartTitle() {
-        ChartSettings chartSettings = getChartSettings();
-        if (chartSettings != null) {
-            return getChartTitle(chartSettings);
-        }
-
+    public String getDefaultChartTitle() {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
 
     /**
-     * Returns a subtitle for the chart from ChartSettings object
-     * if this object is not null or creates a default title.
+     * Returns the default subtitle for this chart.
      *
-     * @return a title.
+     * @return the default subtitle for this chart.
      */
     @Override
-    protected String getChartSubtitle() {
-        ChartSettings chartSettings = getChartSettings();
-        if (chartSettings != null) {
-            return getChartSubtitle(chartSettings);
-        }
-
+    protected String getDefaultChartSubtitle() {
         double[] dist = getRange();
 
         Object[] args = new Object[] {
@@ -184,7 +172,10 @@
     @Override
     protected void addSubtitles(JFreeChart chart) {
         String subtitle = getChartSubtitle();
-        chart.addSubtitle(new TextTitle(subtitle));
+
+        if (subtitle != null && subtitle.length() > 0) {
+            chart.addSubtitle(new TextTitle(subtitle));
+        }
     }