diff artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7981:45cced06490c facet-metadata

merged with default.
author Raimund Renkert <rrenkert@intevation.de>
date Mon, 30 Jun 2014 11:29:45 +0200
parents 5eb8cd9201d8
children bd0dfa57b1fe
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java	Wed May 21 11:43:10 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java	Mon Jun 30 11:29:45 2014 +0200
@@ -686,11 +686,8 @@
 
         if (chartSettings != null) {
             String subTitle = getChartSubtitle(chartSettings);
-            String defSubTitle = getDefaultChartSubtitle();
-            if (defSubTitle != null &&
-                !defSubTitle.isEmpty() &&
-                !subTitle.equals(defSubTitle)) {
-                return defSubTitle;
+            if (subTitle == null) {
+                return getDefaultChartSubtitle();
             }
             else {
                 return subTitle;

http://dive4elements.wald.intevation.org