X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2FdbObjects%2FName.java;h=d5bff5cbd8b52e9d5620dc065468afe574ed8ab0;hp=4034371894ca5b75915a303545fe2a3d66a0f416;hb=b62c00db0226d58e5908b55463bbd9fda31b3fb4;hpb=08c941629aea14473e5c42ab6f5d590be4af4bf8
diff --git a/src/club/wpia/gigi/dbObjects/Name.java b/src/club/wpia/gigi/dbObjects/Name.java
index 40343718..d5bff5cb 100644
--- a/src/club/wpia/gigi/dbObjects/Name.java
+++ b/src/club/wpia/gigi/dbObjects/Name.java
@@ -79,7 +79,7 @@ public class Name implements Outputable, IdCachable {
public void output(PrintWriter out) {
out.print("");
out.print(HTMLEncoder.encodeHTML(singlePart.getValue()));
- out.println("");
+ out.print("");
}
}
@@ -187,20 +187,23 @@ 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("");
out.print(HTMLEncoder.encodeHTML(res.toString()));
- out.println("");
+ out.print("");
}
}
@@ -351,7 +354,7 @@ public class Name implements Outputable, IdCachable {
public void output(PrintWriter out, Language l, Map vars) {
out.print("");
scheme.output(out);
- out.print(" ");
+ out.print("");
}
/**