Changeset 551

Timestamp:

11/20/09 23:18:07 (2 years ago)

Author:

octorian

Message:

Warnings cleanup

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/message/MimeMessageContent.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/message/MimeMessagePart.java (modified) (5 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/OutboxMailboxNode.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/MailboxScreen.java (modified) (1 diff)
• LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java (modified) (2 diffs)
• LogicMailTests/src/org/logicprobe/LogicMail/model/AccountNodeTest.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessageContent.java

@@ -46 +46 @@
 public abstract class MimeMessageContent implements Serializable {
     private long uniqueId;
-        private ContentPart messagePart;
-        
-        /**
-         * Instantiates a new message content object
-         * 
-         * @param messagePart the message part
-         */
-        protected MimeMessageContent(ContentPart messagePart) {
+    private ContentPart messagePart;
+
+    /**
+     * Instantiates a new message content object
+     * 
+     * @param messagePart the message part
+     */
+    protected MimeMessageContent(ContentPart messagePart) {
         this.uniqueId = UniqueIdGenerator.getInstance().getUniqueId();
-                this.messagePart = messagePart;
-        }
-        
-        /**
-         * Gets the message part representing the placement of
-         * this content within the message structure.
-         * 
-         * @return the message part
-         */
-        public ContentPart getMessagePart() {
-                return this.messagePart;
-        }
-        
+        this.messagePart = messagePart;
+    }
+
+    /**
+     * Gets the message part representing the placement of
+     * this content within the message structure.
+     * 
+     * @return the message part
+     */
+    public ContentPart getMessagePart() {
+        return this.messagePart;
+    }
+
     /**
      * Accept a visitor on this message content.
      * @param visitor The visitor instance
      */
-        public abstract void accept(MimeMessageContentVisitor visitor);
-        
-        /**
-         * Gets the raw data representing this message content.
-         * Necessary for saving the content to a file, or
-         * transmitting it to external systems.
-         * 
-         * @return Raw data if available, or null otherwise
-         */
-        public abstract byte[] getRawData();
+    public abstract void accept(MimeMessageContentVisitor visitor);
 
-        /**
-         * Populates the message content object from raw data.
-         * Necessary for recreating the object from a serialized
-         * form.
-         * 
-         * @param rawData Raw data for the message content
-         */
-        protected abstract void putRawData(byte[] rawData);
-        
-        /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#getUniqueId()
-         */
-        public long getUniqueId() {
-                return this.uniqueId;
-        }
+    /**
+     * Gets the raw data representing this message content.
+     * Necessary for saving the content to a file, or
+     * transmitting it to external systems.
+     * 
+     * @return Raw data if available, or null otherwise
+     */
+    public abstract byte[] getRawData();
 
-        /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutput)
-         */
-        public void serialize(DataOutput output) throws IOException {
-                output.writeLong(uniqueId);
-                SerializationUtils.serializeClass(messagePart, output);
-                byte[] data = getRawData();
-                output.writeInt(data.length);
-                output.write(data);
-        }
-        
-        /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#deserialize(java.io.DataInput)
-         */
-        public void deserialize(DataInput input) throws IOException {
-                uniqueId = input.readLong();
-                messagePart = (ContentPart)SerializationUtils.deserializeClass(input);
-                int len = input.readInt();
-                byte[] data = new byte[len];
-                input.readFully(data, 0, len);
-                putRawData(data);
-        }
+    /**
+     * Populates the message content object from raw data.
+     * Necessary for recreating the object from a serialized
+     * form.
+     * 
+     * @param rawData Raw data for the message content
+     */
+    protected abstract void putRawData(byte[] rawData);
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#hashCode()
-         */
-        public int hashCode() {
-                final int prime = 31;
-                int result = 1;
-                result = prime * result + (int) (uniqueId ^ (uniqueId >>> 32));
-                return result;
-        }
+    /* (non-Javadoc)
+     * @see org.logicprobe.LogicMail.util.Serializable#getUniqueId()
+     */
+    public long getUniqueId() {
+        return this.uniqueId;
+    }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#equals(java.lang.Object)
-         */
-        public boolean equals(Object obj) {
-                if (this == obj)
-                        return true;
-                if (obj == null)
-                        return false;
-                if (getClass() != obj.getClass())
-                        return false;
-                MimeMessageContent other = (MimeMessageContent) obj;
-                if (uniqueId != other.uniqueId)
-                        return false;
-                return true;
-        }
+    /* (non-Javadoc)
+     * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutput)
+     */
+    public void serialize(DataOutput output) throws IOException {
+        output.writeLong(uniqueId);
+        SerializationUtils.serializeClass(messagePart, output);
+        byte[] data = getRawData();
+        output.writeInt(data.length);
+        output.write(data);
+    }
+
+    /* (non-Javadoc)
+     * @see org.logicprobe.LogicMail.util.Serializable#deserialize(java.io.DataInput)
+     */
+    public void deserialize(DataInput input) throws IOException {
+        uniqueId = input.readLong();
+        messagePart = (ContentPart)SerializationUtils.deserializeClass(input);
+        int len = input.readInt();
+        byte[] data = new byte[len];
+        input.readFully(data, 0, len);
+        putRawData(data);
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode() {
+        int prime = 31;
+        int result = 1;
+        result = prime * result + (int) (uniqueId ^ (uniqueId >>> 32));
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        MimeMessageContent other = (MimeMessageContent) obj;
+        if (uniqueId != other.uniqueId)
+            return false;
+        return true;
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessagePart.java

@@ -65 +65 @@
      */
     public abstract void accept(MimeMessagePartVisitor visitor);
-    
+
     /**
      * Gets the tag used to embed protocol-specific address
@@ -73 +73 @@
      */
     public String getTag() {
-        return tag;
+        return tag;
     }
-    
+
     /**
      * Get the MIME type for this part
@@ -97 +97 @@
      */
     public int getSize() {
-        return size;
+        return size;
     }
-    
+
     /**
      * Set the parent of this part
@@ -107 +107 @@
         this.parent = parent;
     }
-    
+
     /**
      * Get the parent of this part
@@ -117 +117 @@
 
     /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#getUniqueId()
-         */
-        public long getUniqueId() {
-                return this.uniqueId;
-        }
+     * @see org.logicprobe.LogicMail.util.Serializable#getUniqueId()
+     */
+    public long getUniqueId() {
+        return this.uniqueId;
+    }
 
-        /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutput)
-         */
-        public void serialize(DataOutput output) throws IOException {
-                output.writeLong(uniqueId);
-                output.writeUTF(tag);
-                output.writeUTF(mimeType);
-                output.writeUTF(mimeSubtype);
-                output.writeInt(size);
-        }
-        
-        /* (non-Javadoc)
-         * @see org.logicprobe.LogicMail.util.Serializable#deserialize(java.io.DataInput)
-         */
-        public void deserialize(DataInput input) throws IOException {
-                uniqueId = input.readLong();
-                tag = input.readUTF();
-                mimeType = input.readUTF();
-                mimeSubtype = input.readUTF();
-                size = input.readInt();
-        }
+    /* (non-Javadoc)
+     * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutput)
+     */
+    public void serialize(DataOutput output) throws IOException {
+        output.writeLong(uniqueId);
+        output.writeUTF(tag);
+        output.writeUTF(mimeType);
+        output.writeUTF(mimeSubtype);
+        output.writeInt(size);
+    }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#hashCode()
-         */
-        public int hashCode() {
-                final int prime = 31;
-                int result = 1;
-                result = prime * result + (int) (uniqueId ^ (uniqueId >>> 32));
-                return result;
-        }
+    /* (non-Javadoc)
+     * @see org.logicprobe.LogicMail.util.Serializable#deserialize(java.io.DataInput)
+     */
+    public void deserialize(DataInput input) throws IOException {
+        uniqueId = input.readLong();
+        tag = input.readUTF();
+        mimeType = input.readUTF();
+        mimeSubtype = input.readUTF();
+        size = input.readInt();
+    }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#equals(java.lang.Object)
-         */
-        public boolean equals(Object obj) {
-                if (this == obj)
-                        return true;
-                if (obj == null)
-                        return false;
-                if (getClass() != obj.getClass())
-                        return false;
-                MimeMessagePart other = (MimeMessagePart) obj;
-                if (uniqueId != other.uniqueId)
-                        return false;
-                return true;
-        }
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode() {
+        int prime = 31;
+        int result = 1;
+        result = prime * result + (int) (uniqueId ^ (uniqueId >>> 32));
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        MimeMessagePart other = (MimeMessagePart) obj;
+        if (uniqueId != other.uniqueId)
+            return false;
+        return true;
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/model/OutboxMailboxNode.java

@@ -215 +215 @@
         }
         
-        public int getMessageId() {
-                return messageId;
-        }
-        
-                public boolean containedWithin(FolderTreeItem folderTreeItem) {
-                        return folderTreeItem.getPath().equals(folderPath);
-                }
-
-                public String getMessageUid() {
-                        return Integer.toHexString(messageId).toLowerCase();
-                }
-                
-                public long getUniqueId() {
-                        // Empty because this special token is not intended to be serialized
-                        return 0;
-                }
-
-                public void serialize(DataOutput output) throws IOException {
-                        // Empty because this special token is not intended to be serialized
-                }
-        
-                public void deserialize(DataInput input) throws IOException {
-                        // Empty because this special token is not intended to be serialized
-                }
+        public boolean containedWithin(FolderTreeItem folderTreeItem) {
+            return folderTreeItem.getPath().equals(folderPath);
+        }
+    
+        public String getMessageUid() {
+            return Integer.toHexString(messageId).toLowerCase();
+        }
+                
+        public long getUniqueId() {
+            // Empty because this special token is not intended to be serialized
+            return 0;
+        }
+    
+        public void serialize(DataOutput output) throws IOException {
+            // Empty because this special token is not intended to be serialized
+        }
+                
+        public void deserialize(DataInput input) throws IOException {
+            // Empty because this special token is not intended to be serialized
+        }
     }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MailboxScreen.java

@@ -54 +54 @@
 import org.logicprobe.LogicMail.model.MessageNodeEvent;
 import org.logicprobe.LogicMail.model.MessageNodeListener;
-import org.logicprobe.LogicMail.ui.ScreenProvider.ShortcutItem;
 import org.logicprobe.LogicMail.util.EventObjectRunnable;
 

trunk/LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java

@@ -324 +324 @@
                 public FolderTreeItem activeFolder;
                 public FolderTreeItem inboxFolder;
-                public int firstIndex;
-                public int lastIndex;
                 public FolderMessage[] folderMessages;
                 public FolderTreeItem folderTree;
                 public Message message;
                 public MessageToken messageToken;
-                public MessageFlags messageFlags;
                 public int refreshedMsgCount;
                 
@@ -348 +345 @@
                 public FolderTreeItem getActiveFolder() { return activeFolder; }
                 public FolderMessage[] getFolderMessages(int firstIndex, int lastIndex, MailProgressHandler progressHandler)
-                                throws IOException, MailException { this.firstIndex = firstIndex; this.lastIndex = lastIndex; return this.folderMessages; }
+                                throws IOException, MailException { return this.folderMessages; }
                 public FolderMessage[] getFolderMessages(MessageToken[] messageTokens, MailProgressHandler progressHandler)
                                 throws IOException, MailException { return null; }

trunk/LogicMailTests/src/org/logicprobe/LogicMail/model/AccountNodeTest.java

@@ -207 +207 @@
         public FolderTreeItem rootFolder = null;
         public FolderTreeItem statusUpdatedRootFolder = null;
-        public boolean folderTreeRequested = false;
-        public boolean folderStatusRequested = false;
-        public FolderTreeItem folderStatusRequestedItem = null;
         
                 public boolean hasFlags() {
@@ -240 +237 @@
 
                 public void requestFolderTree() {
-                        folderTreeRequested = true;
                         fireFolderTreeUpdated(rootFolder);
                 }
                 
                 public void requestFolderStatus(FolderTreeItem[] folders) {
-                        folderStatusRequested = true;
-                        folderStatusRequestedItem = folders[0];
                         fireFolderStatusChanged(statusUpdatedRootFolder);
                 }