Merge commit 'cf5da99'HEADmaster

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

1 files changed, 0 insertions, 215 deletions

diff --git a/src/net/java/sip/communicator/impl/osdependent/SystemTray.java b/src/net/java/sip/communicator/impl/osdependent/SystemTray.java
deleted file mode 100644
index 0c0a4a2..0000000
--- a/src/net/java/sip/communicator/impl/osdependent/SystemTray.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*

- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * 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.impl.osdependent;

-

-import java.awt.*;

-import java.lang.reflect.*;

-

-import javax.swing.*;

-

-import net.java.sip.communicator.impl.osdependent.TrayIcon.AWTTrayIconPeer;

-import net.java.sip.communicator.impl.osdependent.TrayIcon.TrayIconPeer;

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

-

-/**

- * @author Lubomir Marinov

- */

-public class SystemTray

-{

-    /**

-     * The <tt>Logger</tt> used by the <tt>SystemTray</tt> class and its

-     * instances for logging output.

-     */

-    private static final Logger logger = Logger.getLogger(SystemTray.class);

-

-    private static SystemTray defaultSystemTray;

-

-    public static SystemTray getDefaultSystemTray()

-        throws UnsupportedOperationException,

-        HeadlessException,

-        SecurityException

-    {

-        if (defaultSystemTray != null)

-            return defaultSystemTray;

-

-        Class<?> awtSystemTrayClass = null;

-        try

-        {

-            awtSystemTrayClass = Class.forName("java.awt.SystemTray");

-        }

-        catch (ClassNotFoundException ex)

-        {

-            // We'll try org.jdesktop.jdic.tray then.

-        }

-        SystemTrayPeer peer = null;

-        if (awtSystemTrayClass != null)

-            try

-            {

-                peer = new AWTSystemTrayPeer(awtSystemTrayClass);

-            }

-            catch (Exception ex)

-            {

-                if(!GraphicsEnvironment.isHeadless())

-                    logger.error("Failed to initialize java.awt.SystemTray",

-                        ex);

-

-                // We'll try org.jdesktop.jdic.tray then.

-            }

-        if (peer == null)

-        {

-            logger.error(

-                "Failed to initialize the desktop.tray implementation.");

-            throw new UnsupportedOperationException(

-                "Failed to initialize the desktop.tray implementation.");

-        }

-        return (defaultSystemTray = new SystemTray(peer));

-    }

-

-    private final SystemTrayPeer peer;

-

-    private SystemTray(SystemTrayPeer peer)

-    {

-        this.peer = peer;

-    }

-

-    public void addTrayIcon(TrayIcon trayIcon)

-        throws NullPointerException,

-        IllegalArgumentException

-    {

-        if (peer != null)

-            peer.addTrayIcon(trayIcon.getPeer());

-    }

-

-    SystemTrayPeer getPeer()

-    {

-        return peer;

-    }

-

-    public boolean isSwing()

-    {

-        if (peer != null)

-            return getPeer().isSwing();

-        return false;

-    }

-

-    static interface SystemTrayPeer

-    {

-        void addTrayIcon(TrayIconPeer trayIconPeer)

-            throws NullPointerException,

-            IllegalArgumentException;

-

-        TrayIconPeer createTrayIcon(ImageIcon icon,

-                                    String tooltip,

-                                    Object popup)

-            throws IllegalArgumentException,

-            UnsupportedOperationException,

-            HeadlessException,

-            SecurityException;

-

-        boolean isSwing();

-    }

-

-    private static class AWTSystemTrayPeer

-        implements SystemTrayPeer

-    {

-        private final Method addTrayIcon;

-

-        private final Object impl;

-

-        private final Class<?> trayIconClass;

-

-        public AWTSystemTrayPeer(Class<?> clazz)

-            throws UnsupportedOperationException,

-            HeadlessException,

-            SecurityException

-        {

-            Method getDefaultSystemTray;

-            try

-            {

-                getDefaultSystemTray =

-                    clazz.getMethod("getSystemTray", (Class<?>[]) null);

-                trayIconClass = Class.forName("java.awt.TrayIcon");

-                addTrayIcon = clazz.getMethod("add", new Class<?>[]

-                { trayIconClass });

-            }

-            catch (ClassNotFoundException ex)

-            {

-                throw new UnsupportedOperationException(ex);

-            }

-            catch (NoSuchMethodException ex)

-            {

-                throw new UnsupportedOperationException(ex);

-            }

-

-            try

-            {

-                impl = getDefaultSystemTray.invoke(null, (Object[]) null);

-            }

-            catch (IllegalAccessException ex)

-            {

-                throw new UnsupportedOperationException(ex);

-            }

-            catch (InvocationTargetException ex)

-            {

-                throw new UnsupportedOperationException(ex);

-            }

-        }

-

-        public void addTrayIcon(TrayIconPeer trayIconPeer)

-            throws NullPointerException,

-            IllegalArgumentException

-        {

-            try

-            {

-                addTrayIcon.invoke(impl, new Object[]

-                { ((AWTTrayIconPeer) trayIconPeer).getImpl() });

-            }

-            catch (IllegalAccessException ex)

-            {

-                throw new UndeclaredThrowableException(ex);

-            }

-            catch (InvocationTargetException ex)

-            {

-                Throwable cause = ex.getCause();

-                if (cause == null)

-                    throw new UndeclaredThrowableException(ex);

-                if (cause instanceof NullPointerException)

-                    throw (NullPointerException) cause;

-                if (cause instanceof IllegalArgumentException)

-                    throw (IllegalArgumentException) cause;

-                throw new UndeclaredThrowableException(cause);

-            }

-        }

-

-        public TrayIconPeer createTrayIcon(ImageIcon icon, String tooltip,

-            Object popup)

-            throws IllegalArgumentException,

-            UnsupportedOperationException,

-            HeadlessException,

-            SecurityException

-        {

-            return new AWTTrayIconPeer(trayIconClass, (icon == null) ? null

-                : icon.getImage(), tooltip, popup);

-        }

-

-        public boolean isSwing()

-        {

-            return false;

-        }

-    }

-}