Merge commit 'cf5da99'HEADmaster

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

1 files changed, 0 insertions, 147 deletions

diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java
deleted file mode 100644
index 352796b..0000000
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccRegWizzActivator.java
+++ /dev/null
@@ -1,147 +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.plugin.zeroconfaccregwizz;
-
-import java.util.*;
-
-import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
-
-import org.osgi.framework.*;
-
-/**
- * Registers the <tt>ZeroconfAccountRegistrationWizard</tt> in the UI Service.
- *
- * @author Christian Vincenot
- * @author Maxime Catelin
- */
-public class ZeroconfAccRegWizzActivator
-    implements BundleActivator
-{
-    private static final Logger logger =
-        Logger.getLogger(ZeroconfAccRegWizzActivator.class);
-
-    /**
-     * A currently valid bundle context.
-     */
-    public static BundleContext bundleContext;
-
-    private static UIService uiService;
-
-    /**
-     * Starts this bundle.
-     * @param bc the currently valid <tt>BundleContext</tt>.
-     */
-    public void start(BundleContext bc)
-    {
-        if (logger.isInfoEnabled())
-            logger.info("Loading zeroconf account wizard.");
-
-        bundleContext = bc;
-
-        ServiceReference uiServiceRef = bundleContext
-            .getServiceReference(UIService.class.getName());
-
-        uiService = (UIService) bundleContext.getService(uiServiceRef);
-
-        WizardContainer wizardContainer
-            = uiService.getAccountRegWizardContainer();
-
-        ZeroconfAccountRegistrationWizard zeroconfWizard
-            = new ZeroconfAccountRegistrationWizard(wizardContainer);
-
-        Hashtable<String, String> containerFilter
-            = new Hashtable<String, String>();
-
-        containerFilter.put(
-                ProtocolProviderFactory.PROTOCOL,
-                ProtocolNames.ZEROCONF);
-
-        bundleContext.registerService(
-            AccountRegistrationWizard.class.getName(),
-            zeroconfWizard,
-            containerFilter);
-
-        if (logger.isInfoEnabled())
-            logger.info("Zeroconf account registration wizard [STARTED].");
-    }
-
-    /**
-     * Called when this bundle is stopped so the Framework can perform the
-     * bundle-specific activities necessary to stop the bundle.
-     *
-     * @param context The execution context of the bundle being stopped.
-     */
-    public void stop(BundleContext context)
-    {
-
-    }
-
-    /**
-     * Returns the <tt>ProtocolProviderFactory</tt> for the Zeroconf protocol.
-     * @return the <tt>ProtocolProviderFactory</tt> for the Zeroconf protocol
-     */
-    public static ProtocolProviderFactory getZeroconfProtocolProviderFactory()
-    {
-        ServiceReference[] serRefs = null;
-        String osgiFilter
-            = "("
-                + ProtocolProviderFactory.PROTOCOL
-                + "="
-                + ProtocolNames.ZEROCONF
-                + ")";
-
-        try
-        {
-            serRefs
-                = bundleContext.getServiceReferences(
-                        ProtocolProviderFactory.class.getName(),
-                        osgiFilter);
-        }
-        catch (InvalidSyntaxException ex)
-        {
-            logger.error(ex);
-        }
-
-        return
-            (serRefs == null)
-                ? null
-                : (ProtocolProviderFactory)
-                    bundleContext.getService(serRefs[0]);
-    }
-
-    /**
-     * Returns the bundleContext that we received when we were started.
-     * @return a currently valid instance of a bundleContext.
-     */
-    public BundleContext getBundleContext()
-    {
-        return bundleContext;
-    }
-
-    /**
-     * Returns the <tt>UIService</tt>.
-     *
-     * @return the <tt>UIService</tt>
-     */
-    public static UIService getUIService()
-    {
-        return uiService;
-    }
-}