Adds a property to hide the domain part of the addresses shown inside the tooltip in contactlist/callhistory.

3 files changed, 44 insertions, 3 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactImpl.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactImpl.java
index 351c0f4..17af81e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/UIContactImpl.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.gui.*;
 
 /**
@@ -20,6 +21,14 @@ public abstract class UIContactImpl
     extends UIContact
 {
     /**
+     * Whether we should filter all addresses shown in tooltips
+     * and to remove the domain part.
+     */
+    private static final String FILTER_DOMAIN_IN_TIP_ADDRESSES
+        = "net.java.sip.communicator.impl.gui.main.contactlist" +
+            ".FILTER_DOMAIN_IN_TIP_ADDRESSES";
+
+    /**
      * Returns the corresponding <tt>ContactNode</tt>. The <tt>ContactNode</tt>
      * is the real node that is stored in the contact list component data model.
      *
@@ -75,4 +84,34 @@ public abstract class UIContactImpl
      */
     @Override
     public abstract String getDisplayName();
+
+    /**
+     * Filter address display if enabled will remove domain part of the
+     * addresses to show.
+     *
+     * @param addressToDisplay the address to change
+     * @return if enabled the address with removed domain part
+     */
+    protected String filterAddressDisplay(String addressToDisplay)
+    {
+        if(!GuiActivator.getConfigurationService()
+            .getBoolean(FILTER_DOMAIN_IN_TIP_ADDRESSES, false))
+            return addressToDisplay;
+
+        int ix = addressToDisplay.indexOf("@");
+        int typeIx = addressToDisplay.indexOf("(");
+
+        if(ix != -1)
+        {
+            if(typeIx != -1)
+                addressToDisplay =
+                    addressToDisplay.substring(0, ix)
+                    + " "
+                    + addressToDisplay.substring(
+                            typeIx, addressToDisplay.length());
+            else
+                addressToDisplay = addressToDisplay.substring(0, ix);
+        }
+        return addressToDisplay;
+    }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
index ee4c329..158a0b5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/MetaUIContact.java
@@ -496,7 +496,9 @@ public class MetaUIContact
             String contactAddress = protocolContact.getAddress();
             //String statusMessage = protocolContact.getStatusMessage();
 
-            tip.addLine(protocolStatusIcon, contactAddress);
+            tip.addLine(
+                protocolStatusIcon,
+                filterAddressDisplay(contactAddress));
 
             addContactResourceTooltipLines(tip, protocolContact);
 
@@ -619,7 +621,7 @@ public class MetaUIContact
     {
         while(phones.hasNext())
         {
-            tip.addSubLine(null, phones.next(), 27);
+            tip.addSubLine(null, filterAddressDisplay(phones.next()), 27);
         }
 
         tip.revalidate();
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/SourceUIContact.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/SourceUIContact.java
index dc934a7..bdd734f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/SourceUIContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/contactsource/SourceUIContact.java
@@ -565,7 +565,7 @@ public class SourceUIContact
                 labelText = contactDetail.getDetail();
             }
 
-            jLabels[i] = new JLabel(labelText);
+            jLabels[i] = new JLabel(filterAddressDisplay(labelText));
 
             toolTip.addLine(jLabels);
         }