Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7974:5eb8cd9201d8
Removed code that ignores a user subtitle and sets a default subtitle.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 27 Jun 2014 13:05:34 +0200 |
| parents | 43f18dc56c5a |
| children | bd0dfa57b1fe |
comparison
equal
deleted
inserted
replaced
| 7973:02b7ef079e6f | 7974:5eb8cd9201d8 |
|---|---|
| 687 if (chartSettings != null) { | 687 if (chartSettings != null) { |
| 688 String subTitle = getChartSubtitle(chartSettings); | 688 String subTitle = getChartSubtitle(chartSettings); |
| 689 if (subTitle == null) { | 689 if (subTitle == null) { |
| 690 return getDefaultChartSubtitle(); | 690 return getDefaultChartSubtitle(); |
| 691 } | 691 } |
| 692 String defSubTitle = getDefaultChartSubtitle(); | |
| 693 if (defSubTitle != null && | |
| 694 !defSubTitle.isEmpty() && | |
| 695 !subTitle.equals(defSubTitle)) { | |
| 696 return defSubTitle; | |
| 697 } | |
| 698 else { | 692 else { |
| 699 return subTitle; | 693 return subTitle; |
| 700 } | 694 } |
| 701 } | 695 } |
| 702 | 696 |