Merge commit 'cf5da99'HEADmaster

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

4 files changed, 136 insertions, 114 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/event/AccountManagerEvent.java b/src/net/java/sip/communicator/service/protocol/event/AccountManagerEvent.java
index db594bf..ecbd971 100644
--- a/src/net/java/sip/communicator/service/protocol/event/AccountManagerEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/AccountManagerEvent.java
@@ -1,4 +1,4 @@
-/*

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

-

-import java.util.*;

-

-import net.java.sip.communicator.service.protocol.*;

-

-/**

- * Represents a notifying event fired by a specific {@link AccountManager}.

- *

- * @author Lubomir Marinov

- */

-public class AccountManagerEvent

-    extends EventObject

-{

-    /**

-     * Serial version UID.

-     */

-    private static final long serialVersionUID = 0L;

-

-    /**

-     * The type of event notifying that the loading of the stored accounts of a

-     * specific <code>ProtocolProviderFactory</code> has finished.

-     */

-    public static final int STORED_ACCOUNTS_LOADED = 1;

-

-    /**

-     * The <code>ProtocolProviderFactory</code> being worked on at the time this

-     * event has been fired.

-     */

-    private final ProtocolProviderFactory factory;

-

-    /**

-     * The (detail) type of this event which is one of

-     * {@link #STORED_ACCOUNTS_LOADED}.

-     */

-    private final int type;

-

-    /**

-     * Initializes a new <code>AccountManagerEvent</code> instance fired by a

-     * specific <code>AccountManager</code> in order to notify of an event of a

-     * specific type occurring while working on a specific

-     * <code>ProtocolProviderFactory</code>.

-     *

-     * @param accountManager the <code>AccountManager</code> issuing the

-     *            notification i.e. the source of the event

-     * @param type the type of the event which is one of

-     * {@link #STORED_ACCOUNTS_LOADED}

-     * @param factory the <code>ProtocolProviderFactory</code> being worked on

-     *            at the time this event has been fired

-     */

-    public AccountManagerEvent(AccountManager accountManager, int type,

-        ProtocolProviderFactory factory)

-    {

-        super(accountManager);

-

-        this.type = type;

-        this.factory = factory;

-    }

-

-    /**

-     * Gets the <code>ProtocolProviderFactory</code> being worked on at the time

-     * this event has been fired.

-     *

-     * @return the <code>ProtocolProviderFactory</code> being worked on at the

-     *         time this event has been fired

-     */

-    public ProtocolProviderFactory getFactory()

-    {

-        return factory;

-    }

-

-    /**

-     * Gets the (detail) type of this event which is one of

-     * <code>STORED_ACCOUNTS_LOADED</code>.

-     *

-     * @return the (detail) type of this event which is one of

-     *         <code>STORED_ACCOUNTS_LOADED</code>

-     */

-    public int getType()

-    {

-        return type;

-    }

-}

+package net.java.sip.communicator.service.protocol.event;
+
+import java.util.*;
+
+import net.java.sip.communicator.service.protocol.*;
+
+/**
+ * Represents a notifying event fired by a specific {@link AccountManager}.
+ *
+ * @author Lubomir Marinov
+ */
+public class AccountManagerEvent
+    extends EventObject
+{
+    /**
+     * Serial version UID.
+     */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * The type of event notifying that the loading of the stored accounts of a
+     * specific <code>ProtocolProviderFactory</code> has finished.
+     */
+    public static final int STORED_ACCOUNTS_LOADED = 1;
+
+    /**
+     * The <code>ProtocolProviderFactory</code> being worked on at the time this
+     * event has been fired.
+     */
+    private final ProtocolProviderFactory factory;
+
+    /**
+     * The (detail) type of this event which is one of
+     * {@link #STORED_ACCOUNTS_LOADED}.
+     */
+    private final int type;
+
+    /**
+     * Initializes a new <code>AccountManagerEvent</code> instance fired by a
+     * specific <code>AccountManager</code> in order to notify of an event of a
+     * specific type occurring while working on a specific
+     * <code>ProtocolProviderFactory</code>.
+     *
+     * @param accountManager the <code>AccountManager</code> issuing the
+     *            notification i.e. the source of the event
+     * @param type the type of the event which is one of
+     * {@link #STORED_ACCOUNTS_LOADED}
+     * @param factory the <code>ProtocolProviderFactory</code> being worked on
+     *            at the time this event has been fired
+     */
+    public AccountManagerEvent(AccountManager accountManager, int type,
+        ProtocolProviderFactory factory)
+    {
+        super(accountManager);
+
+        this.type = type;
+        this.factory = factory;
+    }
+
+    /**
+     * Gets the <code>ProtocolProviderFactory</code> being worked on at the time
+     * this event has been fired.
+     *
+     * @return the <code>ProtocolProviderFactory</code> being worked on at the
+     *         time this event has been fired
+     */
+    public ProtocolProviderFactory getFactory()
+    {
+        return factory;
+    }
+
+    /**
+     * Gets the (detail) type of this event which is one of
+     * <code>STORED_ACCOUNTS_LOADED</code>.
+     *
+     * @return the (detail) type of this event which is one of
+     *         <code>STORED_ACCOUNTS_LOADED</code>
+     */
+    public int getType()
+    {
+        return type;
+    }
+}
diff --git a/src/net/java/sip/communicator/service/protocol/event/AccountManagerListener.java b/src/net/java/sip/communicator/service/protocol/event/AccountManagerListener.java
index 607caea..6bcf4e0 100644
--- a/src/net/java/sip/communicator/service/protocol/event/AccountManagerListener.java
+++ b/src/net/java/sip/communicator/service/protocol/event/AccountManagerListener.java
@@ -1,4 +1,4 @@
-/*

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

-

-import java.util.*;

-

-import net.java.sip.communicator.service.protocol.*;

-

-/**

- * Represents a listener receiving notifications from {@link AccountManager}.

- *

- * @author Lubomir Marinov

- */

-public interface AccountManagerListener

-    extends EventListener

-{

-

-    /**

-     * Notifies this listener about an event fired by a specific

-     * <code>AccountManager</code>.

-     *

-     * @param event the <code>AccountManagerEvent</code> describing the

-     *            <code>AccountManager</code> firing the notification and the

-     *            other details of the specific notification.

-     */

-    void handleAccountManagerEvent(AccountManagerEvent event);

-}

+package net.java.sip.communicator.service.protocol.event;
+
+import java.util.*;
+
+import net.java.sip.communicator.service.protocol.*;
+
+/**
+ * Represents a listener receiving notifications from {@link AccountManager}.
+ *
+ * @author Lubomir Marinov
+ */
+public interface AccountManagerListener
+    extends EventListener
+{
+
+    /**
+     * Notifies this listener about an event fired by a specific
+     * <code>AccountManager</code>.
+     *
+     * @param event the <code>AccountManagerEvent</code> describing the
+     *            <code>AccountManager</code> firing the notification and the
+     *            other details of the specific notification.
+     */
+    void handleAccountManagerEvent(AccountManagerEvent event);
+}
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java
index bcbb66a..92a3f31 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java
@@ -1,8 +1,19 @@
 /*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
+ * Copyright @ 2015 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package net.java.sip.communicator.service.protocol.event;
 
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java
index 6720f4b..931998b 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java
@@ -1,8 +1,19 @@
 /*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
+ * Copyright @ 2015 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package net.java.sip.communicator.service.protocol.event;