Updated classes to handle new Exception thrown by the Date class.

pborissow · pborissow · commit 26af4e03a196 · 2011-10-05T00:07:06.000Z
git-svn-id: svn://192.168.0.80/JavaXT/javaxt-exchange@145 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/exchange/CalendarEvent.java b/src/javaxt/exchange/CalendarEvent.java
@@ -52,12 +52,16 @@ private void parseCalendarItem(){
                     location = javaxt.xml.DOM.getNodeValue(outerNode);
                 }
                 else if(nodeName.equalsIgnoreCase("Start")){
-                    javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
-                    if (!date.failedToParse()) startTime = date;
+                    try{
+                        startTime = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
+                    }
+                    catch(java.text.ParseException e){}
                 }
                 else if(nodeName.equalsIgnoreCase("End")){
-                    javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
-                    if (!date.failedToParse()) endTime = date;
+                    try{
+                        endTime = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
+                    }
+                    catch(java.text.ParseException e){}
                 }
                 else if(nodeName.equalsIgnoreCase("Organizer")){
                     org.w3c.dom.Node[] mailbox = javaxt.xml.DOM.getElementsByTagName("Mailbox", outerNode);
diff --git a/src/javaxt/exchange/Contact.java b/src/javaxt/exchange/Contact.java
@@ -148,8 +148,10 @@ else if(nodeName.equalsIgnoreCase("JobTitle")){
                     title = javaxt.xml.DOM.getNodeValue(outerNode);
                 }
                 else if(nodeName.equalsIgnoreCase("Birthday")){
-                    javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
-                    if (!date.failedToParse()) birthday = date;
+                    try{
+                        birthday = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
+                    }
+                    catch(java.text.ParseException e){}
                 }
                 else if (nodeName.equalsIgnoreCase("CompleteName")){
                     org.w3c.dom.NodeList childNodes = outerNode.getChildNodes();
@@ -871,13 +873,10 @@ public void setBirthDay(javaxt.utils.Date birthday){
    */
     public void setBirthDay(String birthday){
         javaxt.utils.Date date = null;
-        if (birthday!=null){
+        try{
             date = new javaxt.utils.Date(birthday);
-            if (date.failedToParse()){
-                if (this.birthday!=null) date = this.birthday;
-                else date = null;
-            }
         }
+        catch(java.text.ParseException e){}
         setBirthDay(date);
     }
 
diff --git a/src/javaxt/exchange/FolderItem.java b/src/javaxt/exchange/FolderItem.java
@@ -159,8 +159,10 @@ else if (nodeName.equalsIgnoreCase("Categories")){
                     }
                 }
                 else if(nodeName.equalsIgnoreCase("LastModifiedTime")){
-                    javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
-                    if (!date.failedToParse()) lastModified = date;
+                    try{
+                        lastModified = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));
+                    }
+                    catch(java.text.ParseException e){}
                 }
                 else if (nodeName.equalsIgnoreCase("ExtendedProperty")){
 
@@ -189,8 +191,10 @@ else if (childNodeName.equalsIgnoreCase("Value")){
 
                       //Extract last mod date
                         if (PropertyTag.equalsIgnoreCase("0x3008")){
-                            javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(Value));
-                            if (!date.failedToParse()) lastModified = date;
+                            try{
+                                lastModified = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(Value));
+                            }
+                            catch(java.text.ParseException e){}
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,10 @@ else if (nodeName.equalsIgnoreCase("Categories")){`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`else if(nodeName.equalsIgnoreCase("LastModifiedTime")){`
`162`		`- javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));`
`163`		`- if (!date.failedToParse()) lastModified = date;`
	`162`	`+ try{`
	`163`	`+ lastModified = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(outerNode));`
	`164`	`+ }`
	`165`	`+ catch(java.text.ParseException e){}`
`164`	`166`	`}`
`165`	`167`	`else if (nodeName.equalsIgnoreCase("ExtendedProperty")){`
`166`	`168`
`@@ -189,8 +191,10 @@ else if (childNodeName.equalsIgnoreCase("Value")){`
`189`	`191`
`190`	`192`	`//Extract last mod date`
`191`	`193`	`if (PropertyTag.equalsIgnoreCase("0x3008")){`
`192`		`- javaxt.utils.Date date = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(Value));`
`193`		`- if (!date.failedToParse()) lastModified = date;`
	`194`	`+ try{`
	`195`	`+ lastModified = new javaxt.utils.Date(javaxt.xml.DOM.getNodeValue(Value));`
	`196`	`+ }`
	`197`	`+ catch(java.text.ParseException e){}`
`194`	`198`	`}`
`195`	`199`	`}`
`196`	`200`	`}`