Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java @ 7981:45cced06490c facet-metadata
merged with default.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Mon, 30 Jun 2014 11:29:45 +0200 |
| parents | e844be34a606 43f18dc56c5a |
| children | 8ad0b7bc3e73 |
comparison
equal
deleted
inserted
replaced
| 7894:42076d94977e | 7981:45cced06490c |
|---|---|
| 1045 } | 1045 } |
| 1046 | 1046 |
| 1047 @Override | 1047 @Override |
| 1048 public String getDefaultChartSubtitle() { | 1048 public String getDefaultChartSubtitle() { |
| 1049 String parts = ""; | 1049 String parts = ""; |
| 1050 if (subTitleParts != null && !subTitleParts.isEmpty()) { | |
| 1051 for (String p : subTitleParts) { | |
| 1052 parts += ", " + p; | |
| 1053 } | |
| 1054 } | |
| 1055 DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); | 1050 DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); |
| 1056 if (dTitle == null) { | 1051 if (dTitle == null && |
| 1052 (subTitleParts == null || subTitleParts.isEmpty())) { | |
| 1057 /* Subtitle is optional */ | 1053 /* Subtitle is optional */ |
| 1058 return null; | 1054 return null; |
| 1055 } | |
| 1056 if (subTitleParts != null && !subTitleParts.isEmpty()) { | |
| 1057 boolean first = true; | |
| 1058 if (dTitle != null) { | |
| 1059 first = false; | |
| 1060 } | |
| 1061 for (String p : subTitleParts) { | |
| 1062 if (!first) { | |
| 1063 parts += ", "; | |
| 1064 } | |
| 1065 parts += p; | |
| 1066 first = false; | |
| 1067 } | |
| 1068 } | |
| 1069 if (dTitle == null && parts.length() > 0) { | |
| 1070 return parts; | |
| 1059 } | 1071 } |
| 1060 return dTitle.evaluate((D4EArtifact)getMaster(), context) + parts; | 1072 return dTitle.evaluate((D4EArtifact)getMaster(), context) + parts; |
| 1061 } | 1073 } |
| 1062 | 1074 |
| 1063 /** | 1075 /** |