Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

5 files changed, 238 insertions, 233 deletions

diff --git a/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java b/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
index 402f549..85ccd76 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
@@ -25,6 +25,7 @@ import javax.swing.*;
 import net.java.sip.communicator.plugin.addrbook.macosx.*;
 import net.java.sip.communicator.plugin.addrbook.msoutlook.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
+import net.java.sip.communicator.service.calendar.CalendarService;
 
 import org.jitsi.util.*;
 
@@ -67,13 +68,16 @@ public class AdvancedConfigForm
         if (OSUtils.IS_MAC)
             propertiesPanel.add(createEnableCheckBox(
                 AddrBookActivator.PNAME_ENABLE_MACOSX_ADDRESS_BOOK_SEARCH,
-                "plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK"));
+                "plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK", true));
 
         if (OSUtils.IS_WINDOWS)
         {
             propertiesPanel.add(createEnableCheckBox(
                 AddrBookActivator.PNAME_ENABLE_MICROSOFT_OUTLOOK_SEARCH,
-                "plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK"));
+                "plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK", true));
+            propertiesPanel.add(createEnableCheckBox(
+                CalendarService.PNAME_FREE_BUSY_STATUS_DISABLED,
+                "plugin.addrbook.ENABLE_OUTLOOK_CALENDAR", false));
             if(AddrBookActivator.getConfigService().getBoolean(
                 AddrBookActivator.PNAME_ENABLE_DEFAULT_IM_APPLICATION_CHANGE, 
                 true))
@@ -95,13 +99,14 @@ public class AdvancedConfigForm
      * @return the created enable check box
      */
     private Component createEnableCheckBox(final String configPropName,
-                                                 String labelNameKey)
+                                                 String labelNameKey,
+                                                 boolean defaultValue)
     {
         final JCheckBox checkBox = new SIPCommCheckBox(AddrBookActivator
             .getResources().getI18NString(
                 labelNameKey),
                 AddrBookActivator.getConfigService().getBoolean(configPropName,
-                                                                true));
+                    defaultValue));
         checkBox.setAlignmentX(Component.LEFT_ALIGNMENT);
 
         checkBox.addActionListener(new ActionListener()
@@ -113,9 +118,15 @@ public class AdvancedConfigForm
                     new Boolean(checkBox.isSelected()).toString());
 
                 if (checkBox.isSelected())
+                {
                     AddrBookActivator.startService();
+                    AddrBookActivator.startCalendarService();
+                }
                 else
+                {
                     AddrBookActivator.stopService();
+                    AddrBookActivator.stopCalendarService();
+                }
             }
         });
         return checkBox;
diff --git a/src/net/java/sip/communicator/plugin/addrbook/PtrCallback.java b/src/net/java/sip/communicator/plugin/addrbook/PtrCallback.java
index a06c778..674f261 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/PtrCallback.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/PtrCallback.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,23 +15,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.plugin.addrbook;

-

-/**

- * Defines the interface for a callback function which is called by the native

- * counterpart of the support for the OS-specific Address Book with a pointer as

- * its argument.

- *

- * @author Lyubomir Marinov

- */

-public interface PtrCallback

-{

-    /**

-     * Notifies this <tt>PtrCallback</tt> about a specific pointer.

-     *

-     * @param ptr the pointer to notify this <tt>PtrCallback</tt> about

-     * @return <tt>true</tt> if this <tt>PtrCallback</tt> is to continue being

-     * called; otherwise, <tt>false</tt>

-     */

-    boolean callback(long ptr);

-}

+package net.java.sip.communicator.plugin.addrbook;
+
+/**
+ * Defines the interface for a callback function which is called by the native
+ * counterpart of the support for the OS-specific Address Book with a pointer as
+ * its argument.
+ *
+ * @author Lyubomir Marinov
+ */
+public interface PtrCallback
+{
+    /**
+     * Notifies this <tt>PtrCallback</tt> about a specific pointer.
+     *
+     * @param ptr the pointer to notify this <tt>PtrCallback</tt> about
+     * @return <tt>true</tt> if this <tt>PtrCallback</tt> is to continue being
+     * called; otherwise, <tt>false</tt>
+     */
+    boolean callback(long ptr);
+}
diff --git a/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java b/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java
index 0658d59..81a4aad 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java
@@ -419,7 +419,7 @@ public class MacOSXAddrBookContactQuery
             c = Category.InstantMessaging;
             break;
         case kABMSNInstantProperty:
-            sc = SubCategory.MSN;
+            sc = SubCategory.Skype;
             c = Category.InstantMessaging;
             break;
         case kABYahooInstantProperty:
@@ -1240,12 +1240,6 @@ public class MacOSXAddrBookContactQuery
         case kABPhoneProperty:
             supportedOpSets.add(OperationSetBasicTelephony.class);
             break;
-        case kABYahooInstantProperty:
-            supportedOpSets.add(OperationSetBasicInstantMessaging.class);
-            preferredProtocols.put(
-                    OperationSetBasicInstantMessaging.class,
-                    ProtocolNames.YAHOO);
-            break;
         default:
             break;
         }
@@ -1339,7 +1333,7 @@ public class MacOSXAddrBookContactQuery
                     return kABAIMInstantProperty;
                 else if(subCategories.contains(SubCategory.ICQ))
                     return kABICQInstantProperty;
-                else if(subCategories.contains(SubCategory.MSN))
+                else if(subCategories.contains(SubCategory.Skype))
                     return kABMSNInstantProperty;
                 else if(subCategories.contains(SubCategory.Jabber))
                     return kABJabberInstantProperty;
diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/DefaultMailClientMessageDialog.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/DefaultMailClientMessageDialog.java
index 84d9525..afec158 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/DefaultMailClientMessageDialog.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/DefaultMailClientMessageDialog.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,94 +15,94 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.plugin.addrbook.msoutlook;

-

-import java.awt.event.*;

-

-import javax.swing.*;

-

-import org.jitsi.service.resources.*;

-

-import net.java.sip.communicator.plugin.addrbook.*;

-import net.java.sip.communicator.plugin.desktoputil.*;

-

-/**

- * A dialog with warning message that Outlook is not the default mail client

- * shown when the contact source is started.

- * 

- * @author Hristo Terezov

- */

-public class DefaultMailClientMessageDialog

-    extends MessageDialog

-{

-    

-    /**

-     * Serial ID.

-     */

-    private static final long serialVersionUID = -6321186451307613417L;

-    

-    /**

-     * The <tt>ResourceManagementService</tt>

-     */

-    private static ResourceManagementService resources 

-        = AddrBookActivator.getResources();

-    

-    /**

-     * Make Outlook default mail client check box.

-     */

-    private JCheckBox defaultMailClientCheckBox = new SIPCommCheckBox(

-        resources

-            .getI18NString("plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT")); 

-    

-    public static int DONT_ASK_SELECTED_MASK = 1;

-    

-    public static int DEFAULT_MAIL_CLIENT_SELECTED_MASK = 2;

-    

-    /**

-     * Creates an instance of <tt>DefaultMailClientMessageDialog</tt>. 

-     */

-    public DefaultMailClientMessageDialog()

-    {

-        super(null, 

-            AddrBookActivator.getResources().getI18NString(

-            "plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE"), 

-            resources.getI18NString(

-                "plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT",

-                new String[]{

-                    resources.getSettingsString(

-                        "service.gui.APPLICATION_NAME")}), false);

-        checkBoxPanel.setLayout(new BoxLayout(checkBoxPanel, BoxLayout.Y_AXIS));

-        checkBoxPanel.add(defaultMailClientCheckBox);

-    }

-    

-    

-    /**

-     * Handles the <tt>ActionEvent</tt>. Depending on the user choice sets

-     * the return code to the appropriate value.

-     *

-     * @param e the <tt>ActionEvent</tt> that notified us

-     */

-    public void actionPerformed(ActionEvent e)

-    {

-        JButton button = (JButton)e.getSource();

-

-        if(!button.equals(okButton))

-            return;

-        

-        this.returnCode = 0;

-        

-        if (doNotAskAgain.isSelected())

-        {

-            this.returnCode = this.returnCode | DONT_ASK_SELECTED_MASK;

-        }

-        

-        if (defaultMailClientCheckBox.isSelected())

-        {

-            this.returnCode 

-                = this.returnCode | DEFAULT_MAIL_CLIENT_SELECTED_MASK;

-        }

-

-        this.dispose();

-    }

-

-}

+package net.java.sip.communicator.plugin.addrbook.msoutlook;
+
+import java.awt.event.*;
+
+import javax.swing.*;
+
+import org.jitsi.service.resources.*;
+
+import net.java.sip.communicator.plugin.addrbook.*;
+import net.java.sip.communicator.plugin.desktoputil.*;
+
+/**
+ * A dialog with warning message that Outlook is not the default mail client
+ * shown when the contact source is started.
+ * 
+ * @author Hristo Terezov
+ */
+public class DefaultMailClientMessageDialog
+    extends MessageDialog
+{
+    
+    /**
+     * Serial ID.
+     */
+    private static final long serialVersionUID = -6321186451307613417L;
+    
+    /**
+     * The <tt>ResourceManagementService</tt>
+     */
+    private static ResourceManagementService resources 
+        = AddrBookActivator.getResources();
+    
+    /**
+     * Make Outlook default mail client check box.
+     */
+    private JCheckBox defaultMailClientCheckBox = new SIPCommCheckBox(
+        resources
+            .getI18NString("plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT")); 
+    
+    public static int DONT_ASK_SELECTED_MASK = 1;
+    
+    public static int DEFAULT_MAIL_CLIENT_SELECTED_MASK = 2;
+    
+    /**
+     * Creates an instance of <tt>DefaultMailClientMessageDialog</tt>. 
+     */
+    public DefaultMailClientMessageDialog()
+    {
+        super(null, 
+            AddrBookActivator.getResources().getI18NString(
+            "plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE"), 
+            resources.getI18NString(
+                "plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT",
+                new String[]{
+                    resources.getSettingsString(
+                        "service.gui.APPLICATION_NAME")}), false);
+        checkBoxPanel.setLayout(new BoxLayout(checkBoxPanel, BoxLayout.Y_AXIS));
+        checkBoxPanel.add(defaultMailClientCheckBox);
+    }
+    
+    
+    /**
+     * Handles the <tt>ActionEvent</tt>. Depending on the user choice sets
+     * the return code to the appropriate value.
+     *
+     * @param e the <tt>ActionEvent</tt> that notified us
+     */
+    public void actionPerformed(ActionEvent e)
+    {
+        JButton button = (JButton)e.getSource();
+
+        if(!button.equals(okButton))
+            return;
+        
+        this.returnCode = 0;
+        
+        if (doNotAskAgain.isSelected())
+        {
+            this.returnCode = this.returnCode | DONT_ASK_SELECTED_MASK;
+        }
+        
+        if (defaultMailClientCheckBox.isSelected())
+        {
+            this.returnCode 
+                = this.returnCode | DEFAULT_MAIL_CLIENT_SELECTED_MASK;
+        }
+
+        this.dispose();
+    }
+
+}
diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookMAPIHResultException.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookMAPIHResultException.java
index ff4a614..f27b77d 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookMAPIHResultException.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookMAPIHResultException.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,110 +15,110 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.plugin.addrbook.msoutlook;

-

-/**

- * Represents a specific Microsoft Outlook MAPI <tt>HRESULT</tt> as an

- * <tt>Exception</tt>.

- *

- * @author Lyubomir Marinov

- */

-public class MsOutlookMAPIHResultException

-        extends Exception

-{

-    /**

-     * Serial version UID.

-     */

-    private static final long serialVersionUID = 0L;

-

-    /**

-     * The <tt>HRESULT</tt> which is represented by this <tt>Exception</tt>.

-     */

-    private final long hResult;

-

-    /**

-     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance which

-     * is to represent a specific <tt>HRESULT</tt>.

-     *

-     * @param hResult the <tt>HRESULT</tt> to be represented by the new instance

-     */

-    public MsOutlookMAPIHResultException(long hResult)

-    {

-        this(hResult, toString(hResult));

-    }

-

-    /**

-     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance which

-     * is to represent a specific <tt>HRESULT</tt> and to provide a specific

-     * <tt>String</tt> message.

-     *

-     * @param hResult the <tt>HRESULT</tt> to be represented by the new instance

-     * @param message the <tt>String</tt> message to be provided by the new

-     * instance

-     */

-    public MsOutlookMAPIHResultException(long hResult, String message)

-    {

-        super(message);

-

-        this.hResult = hResult;

-    }

-

-    /**

-     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance with a

-     * specific <tt>String</tt> message.

-     *

-     * @param message the <tt>String</tt> message to be provided by the new

-     * instance

-     */

-    public MsOutlookMAPIHResultException(String message)

-    {

-        this(0, message);

-    }

-

-    /**

-     * Gets the <tt>HRESULT</tt> which is represented by this

-     * <tt>Exception</tt>.

-     *

-     * @return the <tt>HRESULT</tt> which is represented by this

-     * <tt>Exception</tt>

-     */

-    public long getHResult()

-    {

-        return hResult;

-    }

-

-    /**

-     * Converts a specific <tt>HRESULT</tt> to a touch more readable

-     * <tt>String</tt> in accord with the rule of constructing MAPI

-     * <tt>HRESULT</tt> values.

-     *

-     * @param hResult the <tt>HRESULT</tt> to convert

-     * @return a <tt>String</tt> which represents the specified <tt>hResult</tt>

-     * in a touch more readable form

-     */

-    private static String toString(long hResult)

-    {

-        if (hResult == 0)

-            return "S_OK";

-        else

-        {

-            StringBuilder s = new StringBuilder("MAPI_");

-

-            s.append(((hResult & 0x80000000L) == 0) ? 'W' : 'E');

-            s.append("_0x");

-            s.append(Long.toHexString(hResult & 0xFFFL));

-            s.append(" (" + Long.toHexString(hResult) + ")");

-            return s.toString();

-        }

-    }

-

-    /**

-     * Returns the string representation for the current hResult code.

-     *

-     * @return The string representation for the current hResult code.

-     */

-    public String getHresultString()

-    {

-        return MsOutlookMAPIHResultException.toString(this.getHResult());

-    }

-}

+package net.java.sip.communicator.plugin.addrbook.msoutlook;
+
+/**
+ * Represents a specific Microsoft Outlook MAPI <tt>HRESULT</tt> as an
+ * <tt>Exception</tt>.
+ *
+ * @author Lyubomir Marinov
+ */
+public class MsOutlookMAPIHResultException
+        extends Exception
+{
+    /**
+     * Serial version UID.
+     */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * The <tt>HRESULT</tt> which is represented by this <tt>Exception</tt>.
+     */
+    private final long hResult;
+
+    /**
+     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance which
+     * is to represent a specific <tt>HRESULT</tt>.
+     *
+     * @param hResult the <tt>HRESULT</tt> to be represented by the new instance
+     */
+    public MsOutlookMAPIHResultException(long hResult)
+    {
+        this(hResult, toString(hResult));
+    }
+
+    /**
+     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance which
+     * is to represent a specific <tt>HRESULT</tt> and to provide a specific
+     * <tt>String</tt> message.
+     *
+     * @param hResult the <tt>HRESULT</tt> to be represented by the new instance
+     * @param message the <tt>String</tt> message to be provided by the new
+     * instance
+     */
+    public MsOutlookMAPIHResultException(long hResult, String message)
+    {
+        super(message);
+
+        this.hResult = hResult;
+    }
+
+    /**
+     * Initializes a new <tt>MsOutlookMAPIHResultException</tt> instance with a
+     * specific <tt>String</tt> message.
+     *
+     * @param message the <tt>String</tt> message to be provided by the new
+     * instance
+     */
+    public MsOutlookMAPIHResultException(String message)
+    {
+        this(0, message);
+    }
+
+    /**
+     * Gets the <tt>HRESULT</tt> which is represented by this
+     * <tt>Exception</tt>.
+     *
+     * @return the <tt>HRESULT</tt> which is represented by this
+     * <tt>Exception</tt>
+     */
+    public long getHResult()
+    {
+        return hResult;
+    }
+
+    /**
+     * Converts a specific <tt>HRESULT</tt> to a touch more readable
+     * <tt>String</tt> in accord with the rule of constructing MAPI
+     * <tt>HRESULT</tt> values.
+     *
+     * @param hResult the <tt>HRESULT</tt> to convert
+     * @return a <tt>String</tt> which represents the specified <tt>hResult</tt>
+     * in a touch more readable form
+     */
+    private static String toString(long hResult)
+    {
+        if (hResult == 0)
+            return "S_OK";
+        else
+        {
+            StringBuilder s = new StringBuilder("MAPI_");
+
+            s.append(((hResult & 0x80000000L) == 0) ? 'W' : 'E');
+            s.append("_0x");
+            s.append(Long.toHexString(hResult & 0xFFFL));
+            s.append(" (" + Long.toHexString(hResult) + ")");
+            return s.toString();
+        }
+    }
+
+    /**
+     * Returns the string representation for the current hResult code.
+     *
+     * @return The string representation for the current hResult code.
+     */
+    public String getHresultString()
+    {
+        return MsOutlookMAPIHResultException.toString(this.getHResult());
+    }
+}