Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Wed May 21 11:43:10 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Mon Jun 30 11:29:45 2014 +0200 @@ -1047,15 +1047,27 @@ @Override public String getDefaultChartSubtitle() { String parts = ""; + DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); + if (dTitle == null && + (subTitleParts == null || subTitleParts.isEmpty())) { + /* Subtitle is optional */ + return null; + } if (subTitleParts != null && !subTitleParts.isEmpty()) { + boolean first = true; + if (dTitle != null) { + first = false; + } for (String p : subTitleParts) { - parts += ", " + p; + if (!first) { + parts += ", "; + } + parts += p; + first = false; } } - DiagramAttributes.Title dTitle = diagramAttributes.getSubtitle(); - if (dTitle == null) { - /* Subtitle is optional */ - return null; + if (dTitle == null && parts.length() > 0) { + return parts; } return dTitle.evaluate((D4EArtifact)getMaster(), context) + parts; }