Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/entities/User.java	Sat May 16 11:37:57 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/entities/User.java	Sat May 16 13:29:44 2020 +0200
     1.3 @@ -34,18 +34,18 @@
     1.4  
     1.5      public static final int ANONYMOUS_USERID = -1;
     1.6  
     1.7 -    private final int userID;
     1.8 +    private final int id;
     1.9      private String username;
    1.10      private String mail;
    1.11      private String givenname;
    1.12      private String lastname;
    1.13  
    1.14 -    public User(int userID) {
    1.15 -        this.userID = userID;
    1.16 +    public User(int id) {
    1.17 +        this.id = id;
    1.18      }
    1.19  
    1.20 -    public int getUserID() {
    1.21 -        return userID;
    1.22 +    public int getId() {
    1.23 +        return id;
    1.24      }
    1.25  
    1.26      public String getUsername() {
    1.27 @@ -82,9 +82,11 @@
    1.28  
    1.29      public String getDisplayname() {
    1.30          StringBuilder dn = new StringBuilder();
    1.31 -        dn.append(givenname);
    1.32 +        if (givenname != null)
    1.33 +            dn.append(givenname);
    1.34          dn.append(' ');
    1.35 -        dn.append(lastname);
    1.36 +        if (lastname != null)
    1.37 +            dn.append(lastname);
    1.38          dn.append(' ');
    1.39          if (mail != null && !mail.isBlank()) {
    1.40              dn.append("<"+mail+">");
    1.41 @@ -98,11 +100,11 @@
    1.42          if (this == o) return true;
    1.43          if (o == null || getClass() != o.getClass()) return false;
    1.44          User user = (User) o;
    1.45 -        return userID == user.userID;
    1.46 +        return id == user.id;
    1.47      }
    1.48  
    1.49      @Override
    1.50      public int hashCode() {
    1.51 -        return Objects.hash(userID);
    1.52 +        return Objects.hash(id);
    1.53      }
    1.54  }