(maven-doxia-sitetools) 01/01: [DOXIASITETOOLS-340] Rearrange title order in Velocity context

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch DOXIASITETOOLS-340
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit 7bf7a0ff95e4e2f092f7f4e15cea3f8cc57bf745
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat May 18 13:30:06 2024 +0200

    [DOXIASITETOOLS-340] Rearrange title order in Velocity context
    
    This closes #157
---
 .../doxia/siterenderer/DefaultSiteRenderer.java    | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index 544b6b9..7e41c4a 100644
--- 
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ 
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -547,22 +547,27 @@ public class DefaultSiteRenderer implements Renderer {
         // 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);