Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java @ 7807:ad4a3980092f minfo-opt
Concatenate the subtitle parts and add them to the default subtitle.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 07 Mar 2014 11:12:59 +0100 |
| parents | 81416a62fa57 |
| children | 43f18dc56c5a |
comparison
equal
deleted
inserted
replaced
| 7806:7ac103a49e35 | 7807:ad4a3980092f |
|---|---|
| 24 "chart.longitudinal.section.locsubtitle"; | 24 "chart.longitudinal.section.locsubtitle"; |
| 25 | 25 |
| 26 @Override | 26 @Override |
| 27 public String getDefaultChartSubtitle() { | 27 public String getDefaultChartSubtitle() { |
| 28 double[] dist = getRange(); | 28 double[] dist = getRange(); |
| 29 | 29 String parts = ""; |
| 30 if (subTitleParts != null && !subTitleParts.isEmpty()) { | |
| 31 for (String p : subTitleParts) { | |
| 32 parts += ", " + p; | |
| 33 } | |
| 34 } | |
| 30 if (dist == null || dist.length != 2 || | 35 if (dist == null || dist.length != 2 || |
| 31 Double.isNaN(dist[0]) || Double.isNaN(dist[1])) { | 36 Double.isNaN(dist[0]) || Double.isNaN(dist[1])) { |
| 32 Object [] args = new Object[] {getRiverName()}; | 37 Object [] args = new Object[] {getRiverName()}; |
| 33 return msg(I18N_CHART_SHORT_SUBTITLE, "", args); | 38 return msg(I18N_CHART_SHORT_SUBTITLE, "", args) + parts; |
| 34 } | 39 } |
| 35 | 40 |
| 36 if (Math.abs(dist[0] - dist[1]) < 1E-5) { | 41 if (Math.abs(dist[0] - dist[1]) < 1E-5) { |
| 37 Object [] args = new Object[] {getRiverName(), dist[1]}; | 42 Object [] args = new Object[] {getRiverName(), dist[1]}; |
| 38 return msg(I18N_CHART_LOCATION_SUBTITLE, "", args); | 43 return msg(I18N_CHART_LOCATION_SUBTITLE, "", args) + parts; |
| 39 } | 44 } |
| 40 | 45 |
| 41 return super.getDefaultChartSubtitle(); | 46 return super.getDefaultChartSubtitle(); |
| 42 } | 47 } |
| 43 | 48 |