You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2014/03/15 11:30:05 UTC

svn commit: r1577820 - /james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java

Author: manolo
Date: Sat Mar 15 10:30:05 2014
New Revision: 1577820

URL: http://svn.apache.org/r1577820
Log:
add methods for getting the iso address from contacts

Modified:
    james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java

Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1577820&r1=1577819&r2=1577820&view=diff
==============================================================================
--- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java (original)
+++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java Sat Mar 15 10:30:05 2014
@@ -27,60 +27,70 @@ import com.google.gwt.user.client.rpc.Is
 
 public class ContactsResult{
 
-	public static class Contact implements IsSerializable, Serializable{
+    public static class Contact implements IsSerializable, Serializable{
         private static final long serialVersionUID = -8632580327693416473L;
-		public String mail;
-		public String realname;
+        public String mail;
+        public String realname;
 
-		public Contact() {
-		}
+        public Contact() {
+        }
 
-		public Contact(String address) {
-			mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
+        public Contact(String address) {
+            mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
 
-			realname = mail.equals(address) ? mail : address
-			        // remove the email part
-			        .replaceAll("<[^<>]+>\\s*$", "")
-			        // remove start symbols in the name
-			        .replaceAll("^[\\s\"'<]+", "")
-			        // remove end symbols in the name
-			        .replaceAll("[\\s\"'>]+$", "")
-			        ;
-
-			if (realname.isEmpty())
-				realname = mail;
-		}
-
-		public Contact(String realname, String mail) {
-			this.realname = realname;
-			this.mail = mail;
-		}
-
-		public String toString() {
-			return (realname != null ? realname : "") + "<" + mail + ">";
-		}
-
-		public String toKey() {
-			return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase();
-		}
-
-	}
-
-	private Contact[] contacts;
-
-	public ContactsResult() {
-	}
-
-	public ContactsResult(Contact... contacts) {
-		this.contacts = contacts;
-	}
-
-	public Contact[] getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(Contact[] contacts) {
-		this.contacts = contacts;
-	}
+            realname = mail.equals(address) ? mail : address
+                    // remove the email part
+                    .replaceAll("<[^<>]+>\\s*$", "")
+                    // remove start symbols in the name
+                    .replaceAll("^[\\s\"'<]+", "")
+                    // remove end symbols in the name
+                    .replaceAll("[\\s\"'>]+$", "")
+                    ;
+
+            if (realname.isEmpty())
+                realname = mail;
+        }
+
+        public Contact(String realname, String mail) {
+            this.realname = realname;
+            this.mail = mail;
+        }
+
+        public String toString() {
+            return realname != null && !realname.isEmpty() ? realname : mail;
+        }
+
+        public String toKey() {
+            return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase();
+        }
+        
+        public String getName() {
+            return realname;
+        }
+        
+        public String toIsoAddress() {
+            if (!mail.equals(realname))
+                return realname + " <" + mail + ">";
+            else
+                return mail;
+        }
+    }
+
+    private Contact[] contacts;
+
+    public ContactsResult() {
+    }
+
+    public ContactsResult(Contact... contacts) {
+        this.contacts = contacts;
+    }
+
+    public Contact[] getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(Contact[] contacts) {
+        this.contacts = contacts;
+    }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org