- Added hashCode to the PhysicalAddress. In the process, added a new method to normalize addresses to a string.

pborissow · pborissow · commit 04f81fb8a92c · 2011-10-11T16:11:53.000Z
- Minor code clean up in the FolderItem class.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-exchange@158 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/exchange/FolderItem.java b/src/javaxt/exchange/FolderItem.java
@@ -75,6 +75,10 @@ protected FolderItem(){}
   /** Creates a new instance of this class
    */
     protected FolderItem(String exchangeID, Connection conn) throws ExchangeException{
+
+        if (exchangeID==null) throw new ExchangeException("Exchange ID is required.");
+        if (conn==null) throw new ExchangeException("Exchange Web Services Connection is required.");
+
         String msg =
         "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
         + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" "
@@ -273,7 +277,7 @@ public javaxt.utils.Date getLastModifiedTime(){
   /** Returns the timestamp for when this item was last modified.
    */
     protected javaxt.utils.Date getLastModifiedTime(Connection conn) throws ExchangeException {
-        lastModified = new FolderItem(id, conn).lastModified;
+        this.lastModified = new FolderItem(id, conn).getLastModifiedTime();
         return lastModified;
     }
 
diff --git a/src/javaxt/exchange/PhysicalAddress.java b/src/javaxt/exchange/PhysicalAddress.java
@@ -365,12 +365,8 @@ public boolean equals(Object obj){
         if (obj!=null){
 
           //Normalize the addresses
-            String str1 = obj.toString().replace("\r", "").replace("\n", " ").replace(",", " ");
-            String str2 = this.toString().replace("\r", "").replace("\n", " ").replace(",", " ");
-            while (str1.contains("  ")) str1 = str1.replace("  ", " ");
-            while (str2.contains("  ")) str2 = str2.replace("  ", " ");
-            str1 = str1.trim();
-            str2 = str2.trim();
+            String str1 = normalizeAddress(obj);
+            String str2 = normalizeAddress(this);
 
             /*
             System.out.println("str1: |" + str1 + "|");
@@ -383,9 +379,20 @@ public boolean equals(Object obj){
                 }
             }
             */
-            
+      
             return str1.equalsIgnoreCase(str2);
         }
         else return false;
     }
+    
+    
+    private String normalizeAddress(Object obj){
+        String str1 = obj.toString().replace("\r", "").replace("\n", " ").replace(",", " ");
+        while (str1.contains("  ")) str1 = str1.replace("  ", " ");
+        return str1.trim();
+    }
+    
+    public int hashCode(){
+        return normalizeAddress(this).toLowerCase().hashCode();
+    }
 }
