comparison: src/main/java/de/uapcore/lightpit/entities/User.java
src/main/java/de/uapcore/lightpit/entities/User.java
- changeset 75
- 33b6843fdf8a
- parent 72
- 0646c14e36fb
equal
deleted
inserted
replaced
| 74:91d1fc2a3a14 | 75:33b6843fdf8a |
|---|---|
| 78 | 78 |
| 79 public void setLastname(String lastname) { | 79 public void setLastname(String lastname) { |
| 80 this.lastname = lastname; | 80 this.lastname = lastname; |
| 81 } | 81 } |
| 82 | 82 |
| 83 public String getDisplayname() { | 83 public String getShortDisplayname() { |
| 84 StringBuilder dn = new StringBuilder(); | 84 StringBuilder dn = new StringBuilder(); |
| 85 if (givenname != null) | 85 if (givenname != null) |
| 86 dn.append(givenname); | 86 dn.append(givenname); |
| 87 dn.append(' '); | 87 dn.append(' '); |
| 88 if (lastname != null) | 88 if (lastname != null) |
| 89 dn.append(lastname); | 89 dn.append(lastname); |
| 90 dn.append(' '); | |
| 91 if (mail != null && !mail.isBlank()) { | |
| 92 dn.append("<" + mail + ">"); | |
| 93 } | |
| 94 final var str = dn.toString().trim(); | 90 final var str = dn.toString().trim(); |
| 95 return str.isBlank() ? username : str; | 91 return str.isBlank() ? username : str; |
| 92 } | |
| 93 | |
| 94 public String getDisplayname() { | |
| 95 final String sdn = getShortDisplayname(); | |
| 96 if (mail != null && !mail.isBlank()) { | |
| 97 return sdn + " <" + mail + ">"; | |
| 98 } else { | |
| 99 return sdn; | |
| 100 } | |
| 96 } | 101 } |
| 97 | 102 |
| 98 @Override | 103 @Override |
| 99 public boolean equals(Object o) { | 104 public boolean equals(Object o) { |
| 100 if (this == o) return true; | 105 if (this == o) return true; |
