WebSVN – general – Path Comparison – / – /hostadmiral/trunk/src/ak/hostadmiral/core/model/ Rev 1055 and /hostadmiral/trunk/src/ak/hostadmiral/core/model/ Rev 1056

Ignore whitespace Rev 1055 → Rev 1056

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/GeneralModelObject.java
 ,4 → 121,26
         {
                 this.modUser = modUser;
         }
+        public String toString()
+        {
+                return getClass().getName() + " [" + getId() + "]";
+        }
+        public boolean equals(Object o)
+        {
+                if(o == null)                 return false;
+                if(!getClass().isInstance(o)) return false;
+                ModelObject u = (ModelObject)o;
+                return (getId() != null) && (u.getId() != null) && (getId().equals(u.getId()));
+        }
+        public int hashCode()
+        {
+                if(getId() == null)
+                        return 0;
+                else
+                        return getId().hashCode();
+        }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/InetDomain.java
 ,4 → 131,9
                 d.setName(origin.getName());
                 return d;
         }
+        public String toString()
+        {
+                return "InetDomain id=[" + getId() + "] name=[" + name + "]";
+        }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasDestination.java
 ,5 → 128,14
         {
                 return true;
         }
+        public String toString()
+        {
+                return "MailAliasDestination id=[" + getId() + "] alias=["
+                        + (alias == null ? "_none_" : alias.getAddress() + "@"
+                                + (alias.getDomain() == null ? "_none_" : alias.getDomain().getName()))
+                        + "] mailbox=[" + (mailbox == null ? "_none_" : mailbox.getLogin() + "@"
+                                + (mailbox.getDomain() == null ? "_none_" : mailbox.getDomain().getName())) + "]"
+                        + "] email=[" + (email == null ? "_none_" : email) + "]";
+        }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/User.java
 ,14 → 295,6
                 this.loginHistory = loginHistory;
         }
-        public boolean equals(Object o)
-        {
-                if(o == null || !(o instanceof User)) return false;
-                User u = (User)o;
-                return (getId() != null) && (u.getId() != null) && (getId().equals(u.getId()));
-        }
         protected void update(User origin)
         {
                 this.login     = origin.login;
 ,14 → 303,6
                 this.locale    = origin.locale;
         }
-        public int hashCode()
-        {
-                if(getId() == null)
-                        return 0;
-                else
-                        return getId().hashCode();
-        }
         public String getTypeKey()
         {
                 return ak.hostadmiral.core.resources.CoreResources.TYPE_USER;
 ,6 → 371,6
         public String toString()
         {
-                return getClass().getName() + " [" + getId() + "] [" + getLogin() + "]";
+                return "User id=[" + getId() + "] login=[" + login + "]";
         }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUser.java
 ,4 → 156,9
                 u.setName(origin.getName());
                 return u;
         }
+        public String toString()
+        {
+                return "SystemUser id=[" + getId() + "] uid=[" + uid + "] name=[" + name + "]";
+        }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/Mailbox.java
 ,4 → 292,10
                 m.setOwner(origin.getOwner());
                 return m;
         }
+        public String toString()
+        {
+                return "Mailbox id=[" + getId() + "] login=[" + login + "@"
+                        + (domain == null ? "_none_" : domain.getName()) + "]";
+        }
 }

 /hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAlias.java
 ,4 → 201,10
                 m.setOwner(origin.getOwner());
                 return m;
         }
+        public String toString()
+        {
+                return "MailAlias id=[" + getId() + "] address=[" + address + "@"
+                        + (domain == null ? "_none_" : domain.getName()) + "]";
+        }
 }

/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserManager.java
30,6 → 30,7
private Collection deletingListeners = new ArrayList();
private Collection deletedListeners = new ArrayList();

// FIMXE: check that it works
private Map loggedinUsers = new WeakHashMap();

public UserManager()