Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7805:8c20f16ab650 minfo-opt
Use the updated default subtitle or the 'old' one from chart settings.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 07 Mar 2014 11:09:46 +0100 |
| parents | 41567bf1e131 |
| children | 43f18dc56c5a |
comparison
equal
deleted
inserted
replaced
| 7796:842f3a5a89b0 | 7805:8c20f16ab650 |
|---|---|
| 683 */ | 683 */ |
| 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 return getChartSubtitle(chartSettings); | 688 String subTitle = getChartSubtitle(chartSettings); |
| 689 String defSubTitle = getDefaultChartSubtitle(); | |
| 690 if (defSubTitle != null && | |
| 691 !defSubTitle.isEmpty() && | |
| 692 !subTitle.equals(defSubTitle)) { | |
| 693 return defSubTitle; | |
| 694 } | |
| 695 else { | |
| 696 return subTitle; | |
| 697 } | |
| 689 } | 698 } |
| 690 | 699 |
| 691 return getDefaultChartSubtitle(); | 700 return getDefaultChartSubtitle(); |
| 692 } | 701 } |
| 693 | 702 |