Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7894:42076d94977e | 7981:45cced06490c |
|---|---|
| 684 protected String getChartSubtitle() { | 684 protected String getChartSubtitle() { |
| 685 ChartSettings chartSettings = getChartSettings(); | 685 ChartSettings chartSettings = getChartSettings(); |
| 686 | 686 |
| 687 if (chartSettings != null) { | 687 if (chartSettings != null) { |
| 688 String subTitle = getChartSubtitle(chartSettings); | 688 String subTitle = getChartSubtitle(chartSettings); |
| 689 String defSubTitle = getDefaultChartSubtitle(); | 689 if (subTitle == null) { |
| 690 if (defSubTitle != null && | 690 return getDefaultChartSubtitle(); |
| 691 !defSubTitle.isEmpty() && | |
| 692 !subTitle.equals(defSubTitle)) { | |
| 693 return defSubTitle; | |
| 694 } | 691 } |
| 695 else { | 692 else { |
| 696 return subTitle; | 693 return subTitle; |
| 697 } | 694 } |
| 698 } | 695 } |