Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7877:43f18dc56c5a
Fixed subtitle handling and added flowvelocity subtitle.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 16 May 2014 10:55:59 +0200 |
| parents | 8c20f16ab650 |
| children | 5eb8cd9201d8 |
comparison
equal
deleted
inserted
replaced
| 7876:5951d6430ade | 7877:43f18dc56c5a |
|---|---|
| 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 if (subTitle == null) { | |
| 690 return getDefaultChartSubtitle(); | |
| 691 } | |
| 689 String defSubTitle = getDefaultChartSubtitle(); | 692 String defSubTitle = getDefaultChartSubtitle(); |
| 690 if (defSubTitle != null && | 693 if (defSubTitle != null && |
| 691 !defSubTitle.isEmpty() && | 694 !defSubTitle.isEmpty() && |
| 692 !subTitle.equals(defSubTitle)) { | 695 !subTitle.equals(defSubTitle)) { |
| 693 return defSubTitle; | 696 return defSubTitle; |