- Minor bug fixes

pborissow · pborissow · commit 65866244625e · 2024-09-14T13:54:06.000Z
git-svn-id: svn://192.168.0.80/JavaXT/javaxt-exchange@1601 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/exchange/CalendarEvent.java b/src/javaxt/exchange/CalendarEvent.java
@@ -155,7 +155,7 @@ else if (nodeName.equalsIgnoreCase("End")){
                     }
                     catch(java.text.ParseException e){}
                 }
-                else if (nodeName.equalsIgnoreCase("TimeZone")){                    
+                else if (nodeName.equalsIgnoreCase("TimeZone")){
                     timezone = javaxt.xml.DOM.getNodeValue(outerNode);
                 }
                 else if(nodeName.equalsIgnoreCase("IsAllDayEvent")){
@@ -184,7 +184,7 @@ else if(nodeName.equalsIgnoreCase("OptionalAttendees")){
         setTimeZone(timezone);
     }
 
-    
+
   //**************************************************************************
   //** getMailbox
   //**************************************************************************
@@ -203,7 +203,7 @@ private Mailbox getMailbox(org.w3c.dom.Node node, Connection conn){
             catch(Exception ex){
                 ex.printStackTrace();
             }
-            
+
             return null;
         }
     }
@@ -629,7 +629,7 @@ public boolean isAllDayEvent(){
     public void setAllDayEvent(javaxt.utils.Date date){
         try{
             String d1 = date.toString("MM/dd/yyyy");
-            java.util.Date d2 = new javaxt.utils.Date(d1).add(1, "day");
+            javaxt.utils.Date d2 = new javaxt.utils.Date(d1).add(1, "day");
             this.setStartTime(d1);
             this.setEndTime(d2);
             //IsAllDayEvent
@@ -699,8 +699,8 @@ public void setReminder(Integer reminder){
 
 
 
-    
-    
+
+
     private String create(Connection conn) throws ExchangeException {
 
         StringBuffer msg = new StringBuffer();
@@ -746,14 +746,14 @@ private String create(Connection conn) throws ExchangeException {
       */
 
         if (getSubject()!=null) msg.append("<t:Subject>" + subject + "</t:Subject>");
-        
+
       //Add body
         if (getBody()!=null){
             msg.append("<t:Body BodyType=\"" + getBodyType() + "\">");
             msg.append(wrap(body));
             msg.append("</t:Body>");
         };
-        
+
 
       //Add categories
         if (!categories.isEmpty()){
@@ -807,7 +807,7 @@ private String create(Connection conn) throws ExchangeException {
             }
             msg.append("</t:RequiredAttendees>");
         }
-        
+
 
         if (attendees.values().contains(false)){
             msg.append("<t:OptionalAttendees>");
@@ -841,7 +841,7 @@ private String create(Connection conn) throws ExchangeException {
         return id;
     }
 
-    
+
   //**************************************************************************
   //** save
   //**************************************************************************
@@ -858,11 +858,11 @@ public String save(Connection conn) throws ExchangeException {
 
       //Update last modified date
         this.lastModified = new CalendarEvent(id, conn).getLastModifiedTime();
-        
+
         return id;
     }
 
-    
+
   //**************************************************************************
   //** delete
   //**************************************************************************
diff --git a/src/javaxt/exchange/ExtendedFieldURI.java b/src/javaxt/exchange/ExtendedFieldURI.java
@@ -20,7 +20,7 @@ public class ExtendedFieldURI extends FieldURI {
   /** Creates a new instance of this class.
    *  @param id A unique id in the form of a Microsoft GUID.
    *  @param name Property name.
-   *  @param name Property type (e.g. "String", "Integer", "Boolean",
+   *  @param type Property type (e.g. "String", "Integer", "Boolean",
    *  "SystemTime", etc).
    */
     public ExtendedFieldURI(String id, String name, String type){
@@ -67,7 +67,7 @@ else if (childNodeName.equalsIgnoreCase("Value")){
 
       //TODO: Convert the value to a proper type before instantiating the Value class
         javaxt.utils.Value val = new javaxt.utils.Value(value);
-        
+
 
         return new Object[]{new ExtendedFieldURI(id, name, type), val};
     }
@@ -130,7 +130,7 @@ protected String toXML(String namespace, String operation, javaxt.utils.Value va
         }
 
         StringBuffer xml = new StringBuffer();
-        if (operation.equalsIgnoreCase("create")){            
+        if (operation.equalsIgnoreCase("create")){
             xml.append("<" + namespace + "ExtendedProperty>");
             xml.append("<" + namespace + "ExtendedFieldURI PropertySetId=\"" + id + "\" PropertyName=\"" + name + "\" PropertyType=\"" + type + "\" />");
             xml.append("<" + namespace + "Value>" + value + "</" + namespace + "Value>");
@@ -156,20 +156,20 @@ else if(operation.equalsIgnoreCase("delete")){
         return xml.toString();
     }
 
-    
+
     public String toXML(String namespace){
         String idAttr = (id==null ? "" : "PropertySetId=\"" + id + "\"");
         String nameAttr = (name.startsWith("0x") ? "PropertyTag=\"" + name + "\"" : "PropertyName=\"" + name + "\"");
         String typeAttr = "PropertyType=\"" + type + "\"";
         return "<" + namespace + ":ExtendedFieldURI " + nameAttr + " " + idAttr + " " + typeAttr + "/>";
     }
 
-    
+
     public String toString(){
         return name;
     }
 
-    public int hashCode(){ 
+    public int hashCode(){
         return name.startsWith("0x") ? name.hashCode() : id.toUpperCase().hashCode();
     }
 
diff --git a/src/javaxt/exchange/FolderItem.java b/src/javaxt/exchange/FolderItem.java
@@ -74,7 +74,7 @@ public class FolderItem {
 
     private org.w3c.dom.Node node;
 
-    
+
     protected FolderItem(){}
 
 
@@ -343,7 +343,7 @@ public void setLastModifiedTime(javaxt.utils.Date lastModified){
         this.lastModified = lastModified;
     }
 
-    
+
   //**************************************************************************
   //** getChangeKey
   //**************************************************************************
@@ -499,11 +499,11 @@ public Attachment[] getAttachments(){
         if (attachments.isEmpty()) return null;
         else return attachments.toArray(new Attachment[attachments.size()]);
     }
-    
+
     public void removeAttachment(Attachment attachment){
         attachments.remove(attachment);
     }
-    
+
     public void addAttachment(Attachment attachment){
         attachments.add(attachment);
     }
@@ -627,9 +627,8 @@ public void removeCategories(){
    *  @param name The name of the ExtendedFieldURI associated with the ExtendedProperty
    */
     public Value getExtendedProperty(String name){
-        java.util.Iterator<ExtendedFieldURI> it = extendedProperties.keySet().iterator();
-        while (it.hasNext()){
-            ExtendedFieldURI key = it.next();
+        for (ExtendedFieldURI key : extendedProperties.keySet()){
+            if (key==null) continue;
             if (key.getName().equalsIgnoreCase(name))
                 return extendedProperties.get(key);
         }
@@ -774,7 +773,7 @@ private String getExtendedPropertyUpdates(){
 
             java.util.Iterator<ExtendedFieldURI> it = extendedProperties.keySet().iterator();
             while (it.hasNext()){
-                
+
                 ExtendedFieldURI property = it.next();
                 Value value = extendedProperties.get(property);
 
