Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.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 | 7ac103a49e35 |
| children | 45cced06490c |
comparison
equal
deleted
inserted
replaced
| 7876:5951d6430ade | 7877:43f18dc56c5a |
|---|---|
| 1044 } | 1044 } |
| 1045 | 1045 |
| 1046 @Override | 1046 @Override |
| 1047 public String getDefaultChartSubtitle() { | 1047 public String getDefaultChartSubtitle() { |
| 1048 String parts = ""; | 1048 String parts = ""; |
| 1049 if (subTitleParts != null && !subTitleParts.isEmpty()) { | |
| 1050 for (String p : subTitleParts) { | |
| 1051 parts += ", " + p; | |
| 1052 } | |
| 1053 } | |
| 1054 DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); | 1049 DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); |
| 1055 if (dTitle == null) { | 1050 if (dTitle == null && |
| 1051 (subTitleParts == null || subTitleParts.isEmpty())) { | |
| 1056 /* Subtitle is optional */ | 1052 /* Subtitle is optional */ |
| 1057 return null; | 1053 return null; |
| 1054 } | |
| 1055 if (subTitleParts != null && !subTitleParts.isEmpty()) { | |
| 1056 boolean first = true; | |
| 1057 if (dTitle != null) { | |
| 1058 first = false; | |
| 1059 } | |
| 1060 for (String p : subTitleParts) { | |
| 1061 if (!first) { | |
| 1062 parts += ", "; | |
| 1063 } | |
| 1064 parts += p; | |
| 1065 first = false; | |
| 1066 } | |
| 1067 } | |
| 1068 if (dTitle == null && parts.length() > 0) { | |
| 1069 return parts; | |
| 1058 } | 1070 } |
| 1059 return dTitle.evaluate((D4EArtifact)getMaster(), context) + parts; | 1071 return dTitle.evaluate((D4EArtifact)getMaster(), context) + parts; |
| 1060 } | 1072 } |
| 1061 | 1073 |
| 1062 /** | 1074 /** |