Remove username attribute

wise-webapp/src/main/java/com/wisemapping/model/MindMap.java

@@ -40,7 +40,7 @@ public class MindMap {
 
     private boolean isPublic;
     private Calendar lastModificationTime;
-    private String lastModifierUser;
+    private User lastEditor;
 
     private Set<Collaboration> collaborations = new HashSet<Collaboration>();
 
@@ -144,12 +144,13 @@ public class MindMap {
         this.lastModificationTime = lastModificationTime;
     }
 
-    public String getLastModifierUser() {
-        return lastModifierUser;
+    @Nullable
+    public User getLastEditor() {
+        return lastEditor;
     }
 
-    public void setLastModifierUser(String lastModifierUser) {
-        this.lastModifierUser = lastModifierUser;
+    public void setLastEditor(@Nullable User lastEditor) {
+        this.lastEditor = lastEditor;
     }
 
     public int getId() {

wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java

@@ -18,21 +18,19 @@
 
 package com.wisemapping.model;
 
-import com.wisemapping.util.ZipUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Calendar;
-import java.io.IOException;
 
 public class MindMapHistory {
 
     private int id;
     private Calendar creationTime;
-    private String creator;
+    private User editor;
     private byte[] xml;
     private int mindmapId;
 
-    public MindMapHistory()
-    {
+    public MindMapHistory() {
 
     }
 
@@ -60,12 +58,13 @@ public class MindMapHistory {
         this.creationTime = creationTime;
     }
 
-    public String getCreator() {
-        return creator;
+    @Nullable
+    public User getEditor() {
+        return editor;
     }
 
-    public void setCreator(String creator) {
-        this.creator = creator;
+    public void setEditor(@Nullable User editor) {
+        this.editor = editor;
     }
 
     public byte[] getXml() {

wise-webapp/src/main/java/com/wisemapping/model/User.java

@@ -32,7 +32,6 @@ public class User
     private String password;
     private long activationCode;
     private Calendar activationDate;
-    private String username;
     private Set<String> tags = new HashSet<String>();
     private boolean allowSendEmail = false;
     private String locale;
@@ -118,9 +117,7 @@ public class User
         final String email = getEmail();
         if (email != null ? !email.equals(user.getEmail()) : user.getEmail() != null) return false;
         if (firstname != null ? !firstname.equals(user.firstname) : user.firstname != null) return false;
-        if (lastname != null ? !lastname.equals(user.lastname) : user.lastname != null) return false;
-        return !(username != null ? !username.equals(user.username) : user.username != null);
-
+        return !(lastname != null ? !lastname.equals(user.lastname) : user.lastname != null);
     }
 
 
@@ -133,14 +130,6 @@ public class User
         return result;
     }
 
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
     @Nullable
     public String getLocale() {
         return locale;