1 files changed, 56 insertions, 146 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/MessageZeroconfImpl.java b/src/net/java/sip/communicator/impl/protocol/zeroconf/MessageZeroconfImpl.java
index cdcce25..f17d141 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/MessageZeroconfImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/MessageZeroconfImpl.java
@@ -1,8 +1,7 @@
 /*
  * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
  */
 package net.java.sip.communicator.impl.protocol.zeroconf;
 
@@ -10,218 +9,120 @@ import net.java.sip.communicator.service.protocol.*;
 
 /**
  * Very simple message implementation for the Zeroconf protocol.
- *
+ * 
  * @author Christian Vincenot
  * @author Maxime Catelin
  * @author Jonathan Martin
+ * @author Lubomir Marinov
  */
 public class MessageZeroconfImpl
-    implements Message
+    extends AbstractMessage
 {
-    /**
-     * The actual message content.
-     */
-    private String textContent = null;
-
-    /**
-     * The content type of the message.
-     */
-    private String contentType = null;
-
-    /**
-     * The message encoding. (UTF8 if null).
-     */
-    private String contentEncoding = null;
-
-    /**
-     * A String uniquely identifying the message
-     */
-    private String messageUID = null;
 
     /**
-     * The subject of the message. (most often is null)
-     */
-    private String subject = null;
-    
-    /**
      * Message Type.
      */
     private int type;
-   
+
     /**
      * Message type indicating that a stream is being created
      */
     public static final int STREAM_OPEN = 0x1;
+
     /**
      * Normal chat message
      */
     public static final int MESSAGE = 0x2;
+
     /**
      * Typing notification
      */
     public static final int TYPING = 0x3;
+
     /**
      * Message indicating that the stream is being closed
      */
     public static final int STREAM_CLOSE = 0x4;
+
     /**
      * Message indicating that the previsous message was delivered successfully
      */
     public static final int DELIVERED = 0x5;
+
     /**
      * Undefined message
      */
     public static final int UNDEF = 0x6;
-    
-    
-    /* 
-     * The Baloon Icon color.
-     * (we probably won't ever use it)
+
+    /*
+     * The Baloon Icon color. (we probably won't ever use it)
      */
     private int baloonColor = 0x7BB5EE;
-    
-    /* 
+
+    /*
      * The Text Color.
      */
     private int textColor = 0x000000;
-    
+
     /*
      * The font of the message.
      */
     private String textFont = "Helvetica";
-    
+
     /*
      * The size of the caracters composing the message.
      */
     private int textSize = 12;
-    
+
     /*
-     * The source contact id announced in the message.
-     * TODO: Could be set & checked to identify more precisely the contact in 
-     * case several users would be sharing the same IP.
+     * The source contact id announced in the message. TODO: Could be set &
+     * checked to identify more precisely the contact in case several users
+     * would be sharing the same IP.
      */
     private String contactID;
-    
+
     /**
      * Creates a message instance according to the specified parameters.
-     * @param type Type of message
+     * 
      * @param content the message body
-     * @param contentType of the message
      * @param contentEncoding message encoding or null for UTF8
+     * @param contentType of the message
+     * @param type Type of message
      */
-    public MessageZeroconfImpl(String content,
-                               String contentEncoding,
-                               String contentType,
-                               int type)
+    public MessageZeroconfImpl(String content, String contentEncoding,
+        String contentType, int type)
     {
-        this.textContent = content;
-        this.contentEncoding = contentEncoding;
-        this.contentType = contentType;
-        this.type = type;
+        super(content, contentType, contentEncoding, null);
 
-        //generate the uid
-        this.messageUID = String.valueOf(System.currentTimeMillis())
-            + String.valueOf(hashCode());
+        this.type = type;
     }
-    
+
     /**
      * Creates a message instance according to the specified parameters.
+     * 
      * @param type Type of message
      * @param content the message body
      * @param contentEncoding message encoding or null for UTF8
      */
-    public MessageZeroconfImpl(String content,
-                               String contentEncoding,
-                               int type)
+    public MessageZeroconfImpl(String content, String contentEncoding, int type)
     {
-        this(content, 
-            contentEncoding, 
-            OperationSetBasicInstantMessaging.DEFAULT_MIME_TYPE, 
-            type);
+        this(content, contentEncoding,
+            OperationSetBasicInstantMessaging.DEFAULT_MIME_TYPE, type);
     }
 
     /**
-     * Returns the message body.
-     *
-     * @return the message content.
-     */
-    public String getContent()
-    {
-        return textContent;
-    }
-
-    /**
-     * Returns the type of the content of this message.
-     *
-     * @return the type of the content of this message.
-     */
-    public String getContentType()
-    {
-        return contentType;
-    }
-
-    /**
-     * Returns the encoding used for the message content.
-     *
-     * @return the encoding of the message body.
-     */
-    public String getEncoding()
-    {
-        return contentEncoding;
-    }
-
-    /**
-     * A string uniquely identifying the message.
-     *
-     * @return a <tt>String</tt> uniquely identifying the message.
-     */
-    public String getMessageUID()
-    {
-        return messageUID;
-    }
-
-    /**
-     * Returns the message body in a binary form.
-     *
-     * @return a <tt>byte[]</tt> representation of the message body.
-     */
-    public byte[] getRawData()
-    {
-        return getContent().getBytes();
-    }
-
-    /**
-     * Return the length of this message.
-     *
-     * @return the length of this message.
-     */
-    public int getSize()
-    {
-        return getContent().length();
-    }
-
-    /**
-     * Returns the subject of the message. ALWAYS null in Zeroconf
-     * @return null
-     */
-    public String getSubject() 
-    {
-        return subject;
-    }
-
-
-    
-    /**
      * Returns the type of message. Always text/plain for Zeroconf, so null.
+     * 
      * @return null
      */
-    public int getType() 
+    public int getType()
     {
         return type;
     }
 
     /**
      * Gets the baloon color declared in messages sent by iChat-like clients
+     * 
      * @return baloon color
      */
     public int getBaloonColor()
@@ -231,81 +132,90 @@ public class MessageZeroconfImpl
 
     /**
      * Sets the baloon color declared in messages sent by iChat-like clients
+     * 
      * @param baloonColor baloon color
      */
-    public void setBaloonColor(int baloonColor) 
+    public void setBaloonColor(int baloonColor)
     {
         this.baloonColor = baloonColor;
     }
 
     /**
      * Returns the text color
+     * 
      * @return Text color
      */
-    public int getTextColor() 
+    public int getTextColor()
     {
         return textColor;
     }
 
     /**
      * Sets the text color
+     * 
      * @param textColor Text color
      */
-    public void setTextColor(int textColor) 
+    public void setTextColor(int textColor)
     {
         this.textColor = textColor;
     }
 
     /**
      * Returns the text font
+     * 
      * @return Text font
      */
-    public String getTextFont() 
+    public String getTextFont()
     {
         return textFont;
     }
 
     /**
      * Sets the text color
+     * 
      * @param textFont Text font
      */
-    public void setTextFont(String textFont) 
+    public void setTextFont(String textFont)
     {
         this.textFont = textFont;
     }
 
     /**
      * Returns the text size
+     * 
      * @return Text size
      */
-    public int getTextSize() 
+    public int getTextSize()
     {
         return textSize;
     }
 
     /**
      * Sets the text size
+     * 
      * @param textSize Text size
      */
-    public void setTextSize(int textSize) 
+    public void setTextSize(int textSize)
     {
         this.textSize = textSize;
     }
 
     /**
      * Returns the contact's ID
+     * 
      * @return String representing the contact's ID
      */
-    public String getContactID() 
+    public String getContactID()
     {
         return contactID;
     }
 
     /**
      * Sets the contact's ID
+     * 
      * @param contactID String representing the contact's ID
      */
-    public void setContactID(String contactID) 
+    public void setContactID(String contactID)
     {
         this.contactID = contactID;
     }