Merge commit 'cf5da99'HEADmaster

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

1 files changed, 52 insertions, 52 deletions

diff --git a/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java b/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
index 10a89bc..0cc63a8 100644
--- a/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
+++ b/test/net/java/sip/communicator/slick/popupmessagehandler/PopupMessageHandlerSLick.java
@@ -1,4 +1,4 @@
-/*

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

-

-import java.util.*;

-

-import junit.framework.*;

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

-import net.java.sip.communicator.util.*;

-

-import org.osgi.framework.*;

-

-/**

- *

- * @author Symphorien Wanko

- */

-public class PopupMessageHandlerSLick extends TestSuite implements BundleActivator

-{

-    /** Logger for this class */

-    private static Logger logger =

-            Logger.getLogger(PopupMessageHandlerSLick.class);

-

-    /** our bundle context */

-    protected static BundleContext bundleContext = null;

-

-    /** implements BundleActivator.start() */

-    public void start(BundleContext bc) throws Exception

-    {

-        logger.info("starting popup message test ");

-

-        bundleContext = bc;

-

-        setName("PopupMessageHandlerSLick");

-

-        Hashtable<String, String> properties = new Hashtable<String, String>();

-

-        properties.put("service.pid", getName());

-

-        // we maybe are running on machine without WM and systray

-        // (test server machine), skip tests

-        if(ServiceUtils.getService(bc, SystrayService.class) != null)

-        {

-            addTest(TestPopupMessageHandler.suite());

-        }

-

-        bundleContext.registerService(getClass().getName(), this, properties);

-    }

-

-    /** implements BundleActivator.stop() */

-    public void stop(BundleContext bc) throws Exception

-    {}

-

-}

+package net.java.sip.communicator.slick.popupmessagehandler;
+
+import java.util.*;
+
+import junit.framework.*;
+import net.java.sip.communicator.service.systray.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
+
+/**
+ *
+ * @author Symphorien Wanko
+ */
+public class PopupMessageHandlerSLick extends TestSuite implements BundleActivator
+{
+    /** Logger for this class */
+    private static Logger logger =
+            Logger.getLogger(PopupMessageHandlerSLick.class);
+
+    /** our bundle context */
+    protected static BundleContext bundleContext = null;
+
+    /** implements BundleActivator.start() */
+    public void start(BundleContext bc) throws Exception
+    {
+        logger.info("starting popup message test ");
+
+        bundleContext = bc;
+
+        setName("PopupMessageHandlerSLick");
+
+        Hashtable<String, String> properties = new Hashtable<String, String>();
+
+        properties.put("service.pid", getName());
+
+        // we maybe are running on machine without WM and systray
+        // (test server machine), skip tests
+        if(ServiceUtils.getService(bc, SystrayService.class) != null)
+        {
+            addTest(TestPopupMessageHandler.suite());
+        }
+
+        bundleContext.registerService(getClass().getName(), this, properties);
+    }
+
+    /** implements BundleActivator.stop() */
+    public void stop(BundleContext bc) throws Exception
+    {}
+
+}