Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/entities/User.java	Fri May 22 17:26:27 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/entities/User.java	Fri May 22 21:23:57 2020 +0200
     1.3 @@ -80,21 +80,26 @@
     1.4          this.lastname = lastname;
     1.5      }
     1.6  
     1.7 -    public String getDisplayname() {
     1.8 +    public String getShortDisplayname() {
     1.9          StringBuilder dn = new StringBuilder();
    1.10          if (givenname != null)
    1.11              dn.append(givenname);
    1.12          dn.append(' ');
    1.13          if (lastname != null)
    1.14              dn.append(lastname);
    1.15 -        dn.append(' ');
    1.16 -        if (mail != null && !mail.isBlank()) {
    1.17 -            dn.append("<" + mail + ">");
    1.18 -        }
    1.19          final var str = dn.toString().trim();
    1.20          return str.isBlank() ? username : str;
    1.21      }
    1.22  
    1.23 +    public String getDisplayname() {
    1.24 +        final String sdn = getShortDisplayname();
    1.25 +        if (mail != null && !mail.isBlank()) {
    1.26 +            return sdn + " <" + mail + ">";
    1.27 +        } else {
    1.28 +            return sdn;
    1.29 +        }
    1.30 +    }
    1.31 +
    1.32      @Override
    1.33      public boolean equals(Object o) {
    1.34          if (this == o) return true;