From 0d7d0062dd1079cbf957f8c8d52545142beef2f0 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Tue, 11 Jul 2006 15:44:43 +0000
Subject: [PATCH] fix build and some comments

Changed method signiture and come comments
---
 .../impl/protocol/icq/ContactIcqImpl.java     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
index 9e7f1bd67..c4611e5c2 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ContactIcqImpl.java
@@ -178,25 +178,29 @@ public PresenceStatus getPresenceStatus()
      */
     public String getDisplayName()
     {
-        if(nickName != null)
-        {
+        String alias = joustSimBuddy.getAlias();
+
+        if(alias != null)
+            return nickName = alias;
+        else if (nickName != null)
             return nickName;
-        }
         else
         {
-            String alias = joustSimBuddy.getAlias();
-
             // if there is no alias we put this contact
             // for future update, as we may be not registered yet
-            if(alias == null)
-                ssclCallback.addContactForUpdate(this);
+            ssclCallback.addContactForUpdate(this);
 
-            nickName = alias == null ? getUIN() : alias;
-            return nickName;
+            return getUIN();
         }
     }
 
-    protected void setDisplayName(String nickname)
+    /**
+     * Used to set the nickname of the contact if it is update
+     * in the ContactList
+     *
+     * @param nickname String the value
+     */
+    protected void setNickname(String nickname)
     {
         this.nickName = nickname;
     }
@@ -268,10 +272,10 @@ void setResolved(boolean resolved)
     }
 
     /**
-     * Returns null as no persistent data is required and the contact address is
-     * sufficient for restoring the contact.
+     * Returns the persistent data - for now only the nickname is needed
+     * for restoring the contact data. Fields are properties separated by ;
      * <p>
-     * @return null as no such data is needed.
+     * @return the persistent data
      */
     public String getPersistentData()
     {
@@ -305,7 +309,6 @@ public void setPersistentData(String persistentData)
             String data[] = dataToks.nextToken().split("=");
             if(data[0].equals("nickname"))
             {
-                // here we must inform that nick has changed
                 nickName = data[1];
             }
         }