From b62c00db0226d58e5908b55463bbd9fda31b3fb4 Mon Sep 17 00:00:00 2001
From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Tue, 28 Mar 2017 12:20:13 +0200
Subject: [PATCH] fix: put blanks between name components
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The previous commit attempted to fix

     Welcome back, Felix Dörre !

but instead produced

     Welcome back, FelixDörre!

Clearly, while we don’t want spaces around the full name, there should
be spaces in between the individual name parts.

Change-Id: I498ea9a0fdaf0f5b3191a3fc3cc47d0a3187b4f5
---
 src/club/wpia/gigi/dbObjects/Name.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/club/wpia/gigi/dbObjects/Name.java b/src/club/wpia/gigi/dbObjects/Name.java
index da7e7190..d5bff5cb 100644
--- a/src/club/wpia/gigi/dbObjects/Name.java
+++ b/src/club/wpia/gigi/dbObjects/Name.java
@@ -187,17 +187,20 @@ public class Name implements Outputable, IdCachable {
 
         @Override
         public void output(PrintWriter out) {
-            outputNameParts(out, "fname", firstNames);
-            outputNameParts(out, "lname", lastNames);
-            outputNameParts(out, "suffix", suffixes);
+            outputNameParts(out, "fname", firstNames, false);
+            outputNameParts(out, "lname", lastNames, true);
+            outputNameParts(out, "suffix", suffixes, true);
         }
 
-        private void outputNameParts(PrintWriter out, String type, NamePart[] input) {
+        private void outputNameParts(PrintWriter out, String type, NamePart[] input, boolean leadingSpace) {
             StringBuilder res;
             res = new StringBuilder();
             appendArray(res, input);
             if (res.length() > 0) {
                 res.deleteCharAt(res.length() - 1);
+                if (leadingSpace) {
+                    out.print(" ");
+                }
                 out.print("<span class='" + type + "'>");
                 out.print(HTMLEncoder.encodeHTML(res.toString()));
                 out.print("</span>");
-- 
2.39.2