[DOXIASITETOOLS-340] Rearrange title order in Velocity context

This closes #157
apache · May 22, 2024 · 7bf7a0f · 7bf7a0f
1 parent c54e6b1
commit 7bf7a0f
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/...-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -547,22 +547,27 @@ protected Context createSiteTemplateVelocityContext(
         // Add infos from document
         context.put("authors", content.getAuthors());
 
-        context.put("shortTitle", content.getTitle());
+        String shortTitle = content.getTitle();
+        context.put("shortTitle", shortTitle);
 
-        // DOXIASITETOOLS-70: Prepend the project name to the title, if any
-        StringBuilder title = new StringBuilder();
-        if (siteRenderingContext.getSiteModel() != null
-                && StringUtils.isNotEmpty(siteRenderingContext.getSiteModel().getName())) {
-            title.append(siteRenderingContext.getSiteModel().getName());
+        String projectTitle = null;
+        if (StringUtils.isNotEmpty(siteRenderingContext.getSiteModel().getName())) {
+            projectTitle = siteRenderingContext.getSiteModel().getName();
         } else if (StringUtils.isNotEmpty(siteRenderingContext.getDefaultTitle())) {
-            title.append(siteRenderingContext.getDefaultTitle());
+            projectTitle = siteRenderingContext.getDefaultTitle();
         }
 
-        if (title.length() > 0 && StringUtils.isNotEmpty(content.getTitle())) {
+        StringBuilder title = new StringBuilder();
+        if (StringUtils.isNotEmpty(shortTitle)) {
+            title.append(shortTitle);
+        }
+
+        if (title.length() > 0 && StringUtils.isNotEmpty(projectTitle)) {
             title.append(" \u2013 "); // Symbol Name: En Dash
         }
-        if (StringUtils.isNotEmpty(content.getTitle())) {
-            title.append(content.getTitle());
+
+        if (StringUtils.isNotEmpty(projectTitle)) {
+            title.append(projectTitle);
         }
 
         context.put("title", title.length() > 0 ? title.toString() : null);