Merge commit 'cf5da99'HEADmaster

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

1 files changed, 0 insertions, 392 deletions

diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
deleted file mode 100644
index 79f085f..0000000
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ /dev/null
@@ -1,392 +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.awt.*;
-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.*;
-
-/**
- * The <tt>ZeroconfAccountRegistrationWizard</tt> is an implementation of the
- * <tt>AccountRegistrationWizard</tt> for the Zeroconf protocol. It allows
- * the user to create and configure a new Zeroconf account.
- *
- * @author Christian Vincenot
- * @author Maxime Catelin
- */
-public class ZeroconfAccountRegistrationWizard
-    extends DesktopAccountRegistrationWizard
-{
-    private Logger logger
-        = Logger.getLogger(ZeroconfAccountRegistrationWizard.class);
-
-    /**
-     * The first page of the zeroconf account registration wizard.
-     */
-    private FirstWizardPage firstWizardPage;
-
-    /**
-     * The object that we use to store details on an account that we will be
-     * creating.
-     */
-    private ZeroconfAccountRegistration registration
-        = new ZeroconfAccountRegistration();
-
-    private ProtocolProviderService protocolProvider;
-
-    /**
-     * Creates an instance of <tt>ZeroconfAccountRegistrationWizard</tt>.
-     * @param wizardContainer the wizard container, where this wizard
-     * is added
-     */
-    public ZeroconfAccountRegistrationWizard(WizardContainer wizardContainer)
-    {
-        setWizardContainer(wizardContainer);
-
-        wizardContainer
-            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getIcon</code> method.
-     * Returns the icon to be used for this wizard.
-     * @return byte[]
-     */
-    @Override
-    public byte[] getIcon()
-    {
-        return Resources.getImage(Resources.ZEROCONF_LOGO);
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
-     * Returns the image used to decorate the wizard page
-     *
-     * @return byte[] the image used to decorate the wizard page
-     */
-    @Override
-    public byte[] getPageImage()
-    {
-        return Resources.getImage(Resources.PAGE_IMAGE);
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
-     * method. Returns the protocol name for this wizard.
-     * @return String
-     */
-    @Override
-    public String getProtocolName()
-    {
-        return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_NAME");
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getProtocolDescription
-     * </code> method. Returns the description of the protocol for this wizard.
-     * @return String
-     */
-    @Override
-    public String getProtocolDescription()
-    {
-        return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION");
-    }
-
-    /**
-     * Returns the set of pages contained in this wizard.
-     * @return Iterator
-     */
-    @Override
-    public Iterator<WizardPage> getPages()
-    {
-        java.util.List<WizardPage> pages = new ArrayList<WizardPage>();
-
-        // create new registration, our container needs the pages
-        // this means this is a new wizard and we must reset all data
-        // it will be invoked and when the wizard cleans and unregister
-        // our pages, but this fix don't hurt in this situation.
-        this.registration = new ZeroconfAccountRegistration();
-
-        firstWizardPage = new FirstWizardPage(this);
-
-        pages.add(firstWizardPage);
-
-        return pages.iterator();
-    }
-
-    /**
-     * Returns the set of data that user has entered through this wizard.
-     * @return Iterator
-     */
-    @Override
-    public Iterator<Map.Entry<String, String>> getSummary()
-    {
-        Hashtable<String, String> summaryTable = new Hashtable<String, String>();
-
-        summaryTable.put("User ID", registration.getUserID());
-        summaryTable.put("First Name", registration.getFirst());
-        summaryTable.put("Last Name", registration.getLast());
-        summaryTable.put("Mail Address", registration.getMail());
-        summaryTable.put("Remember Bonjour contacts?",
-                Boolean.toString(registration.isRememberContacts()));
-
-        return summaryTable.entrySet().iterator();
-    }
-
-    /**
-     * Defines the operations that will be executed when the user clicks on
-     * the wizard "Signin" button.
-     *
-     * @return the created <tt>ProtocolProviderService</tt> corresponding to the
-     * new account
-     * @throws OperationFailedException if the operation didn't succeed
-     */
-    @Override
-    public ProtocolProviderService signin()
-        throws OperationFailedException
-    {
-        firstWizardPage.commitPage();
-
-        return signin(registration.getUserID(), null);
-    }
-
-    /**
-     * Defines the operations that will be executed when the user clicks on
-     * the wizard "Signin" button.
-     *
-     * @param userName the user name to sign in with
-     * @param password the password to sign in with
-     * @return the created <tt>ProtocolProviderService</tt> corresponding to the
-     * new account
-     * @throws OperationFailedException if the operation didn't succeed
-     */
-    @Override
-    public ProtocolProviderService signin(String userName, String password)
-        throws OperationFailedException
-    {
-        ProtocolProviderFactory factory
-            = ZeroconfAccRegWizzActivator.getZeroconfProtocolProviderFactory();
-
-        return this.installAccount(factory,
-                                   userName);
-    }
-
-    /**
-     * Creates an account for the given user and password.
-     *
-     * @return the <tt>ProtocolProviderService</tt> for the new account.
-     * @param providerFactory the ProtocolProviderFactory which will create
-     * the account
-     * @param user the user identifier
-     */
-    public ProtocolProviderService installAccount(
-        ProtocolProviderFactory providerFactory,
-        String user)
-        throws OperationFailedException
-    {
-        Hashtable<String, String> accountProperties
-            = new Hashtable<String, String>();
-
-        accountProperties.put(ProtocolProviderFactory.ACCOUNT_ICON_PATH,
-            "resources/images/protocol/zeroconf/zeroconf32x32.png");
-
-        accountProperties.put("first", registration.getFirst());
-        accountProperties.put("last", registration.getLast());
-        accountProperties.put("mail", registration.getMail());
-
-        accountProperties.put(
-            ProtocolProviderFactory.NO_PASSWORD_REQUIRED,
-            new Boolean(true).toString());
-
-        accountProperties.put("rememberContacts",
-            new Boolean(registration.isRememberContacts()).toString());
-
-        if (isModification())
-        {
-            providerFactory.uninstallAccount(protocolProvider.getAccountID());
-            this.protocolProvider = null;
-            setModification(false);
-        }
-
-        try
-        {
-            AccountID accountID = providerFactory.installAccount(
-                user, accountProperties);
-
-            ServiceReference serRef = providerFactory
-                .getProviderForAccount(accountID);
-
-            protocolProvider = (ProtocolProviderService)
-                ZeroconfAccRegWizzActivator.bundleContext
-                .getService(serRef);
-        }
-        catch (IllegalStateException exc)
-        {
-            logger.warn(exc.getMessage());
-
-            throw new OperationFailedException(
-                "Account already exists.",
-                OperationFailedException.IDENTIFICATION_CONFLICT);
-        }
-        catch (Exception exc)
-        {
-            logger.warn(exc.getMessage());
-
-            throw new OperationFailedException(
-                "Failed to add account",
-                OperationFailedException.GENERAL_ERROR);
-        }
-
-
-        return protocolProvider;
-    }
-
-    /**
-     * Fills the UserID and Password fields in this panel with the data coming
-     * from the given protocolProvider.
-     * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
-     * data from.
-     */
-    @Override
-    public void loadAccount(ProtocolProviderService protocolProvider)
-    {
-        setModification(true);
-
-        this.protocolProvider = protocolProvider;
-
-        this.registration = new ZeroconfAccountRegistration();
-
-        this.firstWizardPage.loadAccount(protocolProvider);
-    }
-
-    /**
-     * Returns the registration object, which will store all the data through
-     * the wizard.
-     *
-     * @return the registration object, which will store all the data through
-     * the wizard
-     */
-    public ZeroconfAccountRegistration getRegistration()
-    {
-        return registration;
-    }
-
-    /**
-     * Returns the size of this wizard.
-     * @return the size of this wizard
-     */
-    @Override
-    public Dimension getSize()
-    {
-        return new Dimension(600, 500);
-    }
-
-    /**
-     * Returns the identifier of the page to show first in the wizard.
-     * @return the identifier of the page to show first in the wizard.
-     */
-    @Override
-    public Object getFirstPageIdentifier()
-    {
-        return firstWizardPage.getIdentifier();
-    }
-
-    /**
-     * Returns the identifier of the page to show last in the wizard.
-     * @return the identifier of the page to show last in the wizard.
-     */
-    @Override
-    public Object getLastPageIdentifier()
-    {
-        return firstWizardPage.getIdentifier();
-    }
-
-    /**
-     * Returns the password label for the simplified account registration form.
-     * @return the password label for the simplified account registration form.
-     */
-    public String getPasswordLabel()
-    {
-        return Resources.getString("service.gui.PASSWORD");
-    }
-
-    /**
-     * Returns the user name label for the simplified account registration
-     * form.
-     *
-     * @return the user name label for the simplified account registration
-     * form.
-     */
-    public String getUserNameLabel()
-    {
-        return Resources.getString("userID");
-    }
-
-    /**
-     * Returns an example string, which should indicate to the user how the
-     * user name should look like.
-     * @return an example string, which should indicate to the user how the
-     * user name should look like.
-     */
-    @Override
-    public String getUserNameExample()
-    {
-        return null;
-    }
-
-    /**
-     * Indicates whether this wizard enables the simple "sign in" form shown
-     * when the user opens the application for the first time. The simple
-     * "sign in" form allows user to configure her account in one click, just
-     * specifying her username and password and leaving any other configuration
-     * as by default.
-     * @return <code>true</code> if the simple "Sign in" form is enabled or
-     * <code>false</code> otherwise.
-     */
-    @Override
-    public boolean isSimpleFormEnabled()
-    {
-        return false;
-    }
-
-    /**
-     * Returns a simple account registration form that would be the first form
-     * shown to the user. Only if the user needs more settings she'll choose
-     * to open the advanced wizard, consisted by all pages.
-     *
-     * @param isCreateAccount indicates if the simple form should be opened as
-     * a create account form or as a login form
-     * @return a simple account registration form
-     */
-    @Override
-    public Object getSimpleForm(boolean isCreateAccount)
-    {
-        // when creating first wizard page, create and new
-        // AccountRegistration to avoid reusing old instances and
-        // data left from old registrations
-        this.registration = new ZeroconfAccountRegistration();
-
-        firstWizardPage = new FirstWizardPage(this);
-        return firstWizardPage.getSimpleForm();
-    }
-}