Merge commit 'cf5da99'HEADmaster

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

1 files changed, 0 insertions, 445 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java
deleted file mode 100644
index 1f73aac..0000000
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/ContactGroupYahooImpl.java
+++ /dev/null
@@ -1,445 +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.protocol.yahoo;
-
-import java.util.*;
-
-import net.java.sip.communicator.service.protocol.*;
-import ymsg.network.*;
-
-/**
- * The Yahoo implementation of the ContactGroup interface. Intances of this class
- * (contrary to <tt>RootContactGroupYahooImpl</tt>) may only contain buddies
- * and cannot have sub groups. Note that instances of this class only use the
- * corresponding smack source group for reading their names and only
- * initially fill their <tt>buddies</tt> <tt>java.util.List</tt> with
- * the ContactYahooImpl objects corresponding to those contained in the source
- * group at the moment it is being created. They would, however, never try to
- * sync or update their contents ulteriorly. This would have to be done through
- * the addContact()/removeContact() methods.
- * The content of buddies is created on creating of the group and when the smack
- * source group is changed.
- *
- * @author Damian Minkov
- * @author Emil Ivov
- */
-public class ContactGroupYahooImpl
-    extends AbstractContactGroupYahooImpl
-{
-    private final Map<String, Contact> buddies
-        = new Hashtable<String, Contact>();
-
-    private boolean isResolved = false;
-
-    /**
-     * The Yahoo Group corresponding to this contact group.
-     */
-    private YahooGroup yahooGroup = null;
-
-    /**
-     * a list that would always remain empty. We only use it so that we're able
-     * to extract empty iterators
-     */
-    private final List<ContactGroup> dummyGroupsList
-        = new LinkedList<ContactGroup>();
-
-    private String tempId = null;
-
-    private final ServerStoredContactListYahooImpl ssclCallback;
-
-    /**
-     * Creates an Yahoo group using the specified <tt>YahooGroup</tt> as
-     * a source. The newly created group will always return the name of the
-     * underlying RosterGroup and would thus automatically adapt to changes.
-     * It would, however, not receive or try to poll for modifications of the
-     * buddies it contains and would therefore have to be updated manually by
-     * ServerStoredContactListImpl update will only be done if source group
-     * is changed.
-
-     * @param yahooGroup the Yahoo Group correspoinding to the group
-     * @param groupMembers the group members that we should add to the group.
-     * @param ssclCallback a callback to the server stored contact list
-     * we're creating.
-     * @param isResolved a boolean indicating whether or not the group has been
-     * resolved against the server.
-     */
-    ContactGroupYahooImpl(
-                        YahooGroup yahooGroup,
-                        Vector<YahooUser> groupMembers,
-                        ServerStoredContactListYahooImpl ssclCallback,
-                        boolean isResolved)
-    {
-        this.yahooGroup = yahooGroup;
-        this.isResolved = isResolved;
-        this.ssclCallback = ssclCallback;
-
-        for (YahooUser yahooUser : groupMembers)
-        {
-            //only add the contact if it doesn't already exist in some other
-            //group. this would be necessary if Yahoo! one day start allowing
-            //the  same contact in more than one group, which is not quite
-            //unlikely since most of the other protocols do it.
-            if(ssclCallback.findContactByYahooUser(yahooUser) != null)
-            {
-                continue;
-            }
-
-
-            addContact(
-                new ContactYahooImpl(yahooUser,ssclCallback, true, true));
-        }
-    }
-
-    ContactGroupYahooImpl( String id,
-                           ServerStoredContactListYahooImpl ssclCallback)
-    {
-        this.tempId = id;
-        this.isResolved = false;
-        this.ssclCallback = ssclCallback;
-    }
-
-
-    /**
-     * Returns the number of <tt>Contact</tt> members of this
-     * <tt>ContactGroup</tt>
-     *
-     * @return an int indicating the number of <tt>Contact</tt>s,
-     *   members of this <tt>ContactGroup</tt>.
-     */
-    public int countContacts()
-    {
-        return buddies.size();
-    }
-
-    /**
-     * Returns a reference to the root group which in Yahoo is the parent of
-     * any other group since the protocol does not support subgroups.
-     * @return a reference to the root group.
-     */
-    public ContactGroup getParentContactGroup()
-    {
-        return ssclCallback.getRootGroup();
-    }
-
-    /**
-     * Adds the specified contact to the end of this group.
-     * @param contact the new contact to add to this group
-     */
-    void addContact(ContactYahooImpl contact)
-    {
-        buddies.put(contact.getAddress().toLowerCase(), contact);
-    }
-
-
-    /**
-     * Removes the specified contact from this contact group
-     * @param contact the contact to remove.
-     */
-    void removeContact(ContactYahooImpl contact)
-    {
-        buddies.remove(contact.getAddress().toLowerCase());
-    }
-
-    /**
-     * Returns an Iterator over all contacts, member of this
-     * <tt>ContactGroup</tt>.
-     *
-     * @return a java.util.Iterator over all contacts inside this
-     *   <tt>ContactGroup</tt>. In case the group doesn't contain any
-     * memebers it will return an empty iterator.
-     */
-    public Iterator<Contact> contacts()
-    {
-        return buddies.values().iterator();
-    }
-
-    /**
-     * Returns the <tt>Contact</tt> with the specified address or
-     * identifier.
-     * @param id the addres or identifier of the <tt>Contact</tt> we are
-     * looking for.
-     * @return the <tt>Contact</tt> with the specified id or address.
-     */
-    public Contact getContact(String id)
-    {
-        return this.findContact(id);
-    }
-
-    /**
-     * Returns the name of this group.
-     * @return a String containing the name of this group.
-     */
-    public String getGroupName()
-    {
-        if(isResolved)
-            return ServerStoredContactListYahooImpl
-                .replaceIllegalChars(yahooGroup.getName());
-        else
-            return tempId;
-    }
-
-    /**
-     * Determines whether the group may contain subgroups or not.
-     *
-     * @return always false since only the root group may contain subgroups.
-     */
-    public boolean canContainSubgroups()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the subgroup with the specified index (i.e. always null since
-     * this group may not contain subgroups).
-     *
-     * @param index the index of the <tt>ContactGroup</tt> to retrieve.
-     * @return always null
-     */
-    public ContactGroup getGroup(int index)
-    {
-        return null;
-    }
-
-    /**
-     * Returns the subgroup with the specified name.
-     * @param groupName the name of the <tt>ContactGroup</tt> to retrieve.
-     * @return the <tt>ContactGroup</tt> with the specified index.
-     */
-    public ContactGroup getGroup(String groupName)
-    {
-        return null;
-    }
-
-    /**
-     * Returns an empty iterator. Subgroups may only be present in the root
-     * group.
-     *
-     * @return an empty iterator
-     */
-    public Iterator<ContactGroup> subgroups()
-    {
-        return dummyGroupsList.iterator();
-    }
-
-    /**
-     * Returns the number of subgroups contained by this group, which is
-     * always 0 since sub groups in the protocol may only be contained
-     * by the root group - <tt>RootContactGroupImpl</tt>.
-     * @return a 0 int.
-     */
-    public int countSubgroups()
-    {
-        return 0;
-    }
-
-    /**
-     * Returns a hash code value for the object, which is actually the hashcode
-     * value of the groupname.
-     *
-     * @return  a hash code value for this ContactGroup.
-     */
-    @Override
-    public int hashCode()
-    {
-        return getGroupName().hashCode();
-    }
-
-    /**
-     * Indicates whether some other object is "equal to" this group.
-     *
-     * @param   obj   the reference object with which to compare.
-     * @return  <tt>true</tt> if this object is the same as the obj
-     *          argument; <tt>false</tt> otherwise.
-     */
-    @Override
-    public boolean equals(Object obj)
-    {
-        if(    obj == this )
-            return true;
-
-        if (obj == null
-            || !(obj instanceof ContactGroupYahooImpl) )
-               return false;
-
-        if(!((ContactGroup)obj).getGroupName().equals(getGroupName()))
-            return false;
-
-        if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider())
-            return false;
-
-        //since Yahoo does not support having two groups with the same name
-        // at this point we could bravely state that the groups are the same
-        // and not bother to compare buddies. (gotta check that though)
-        return true;
-    }
-
-    /**
-     * Returns the protocol provider that this group belongs to.
-     * @return a reference to the ProtocolProviderService instance that this
-     * ContactGroup belongs to.
-     */
-    public ProtocolProviderService getProtocolProvider()
-    {
-        return this.ssclCallback.getParentProvider();
-    }
-
-    /**
-     * Returns a string representation of this group, in the form
-     * YahooGroup.GroupName[size]{ buddy1.toString(), buddy2.toString(), ...}.
-     * @return  a String representation of the object.
-     */
-    @Override
-    public String toString()
-    {
-        StringBuffer buff = new StringBuffer("YahooGroup.");
-        buff.append(getGroupName());
-        buff.append(", childContacts="+countContacts()+":[");
-
-        Iterator<Contact> contacts = contacts();
-        while (contacts.hasNext())
-        {
-            Contact contact = contacts.next();
-            buff.append(contact.toString());
-            if(contacts.hasNext())
-                buff.append(", ");
-        }
-        return buff.append("]").toString();
-    }
-
-    /**
-     * Returns the contact encapsulating with the spcieified name or
-     * null if no such contact was found.
-     *
-     * @param id the id for the contact we're looking for.
-     * @return the <tt>ContactYahooImpl</tt> corresponding to the specified
-     * screnname or null if no such contact existed.
-     */
-    ContactYahooImpl findContact(String id)
-    {
-        if(id == null)
-            return null;
-        return (ContactYahooImpl)buddies.get(id.toLowerCase());
-    }
-
-    /**
-     * Determines whether or not this contact group is being stored by the
-     * server. Non persistent contact groups exist for the sole purpose of
-     * containing non persistent contacts.
-     * @return true if the contact group is persistent and false otherwise.
-     */
-    public boolean isPersistent()
-    {
-        return true;
-    }
-
-    /**
-     * Returns null as no persistent data is required and the contact address is
-     * sufficient for restoring the contact.
-     * <p>
-     * @return null as no such data is needed.
-     */
-    public String getPersistentData()
-    {
-        return null;
-    }
-
-    /**
-     * Determines whether or not this contact group has been resolved against
-     * the server. Unresolved group are used when initially loading a contact
-     * list that has been stored in a local file until the presence operation
-     * set has managed to retrieve all the contact list from the server and has
-     * properly mapped contacts and groups to their corresponding on-line
-     * buddies.
-     * @return true if the contact has been resolved (mapped against a buddy)
-     * and false otherwise.
-     */
-    public boolean isResolved()
-    {
-        return isResolved;
-    }
-
-    /**
-     * Resolve this contact group against the specified group
-     * @param yahooGroup the server stored group
-     */
-    @SuppressWarnings("unchecked") //jymsg legacy code
-    void setResolved(YahooGroup yahooGroup)
-    {
-        if(isResolved)
-            return;
-
-        this.isResolved = true;
-
-        this.yahooGroup = yahooGroup;
-
-        Vector<YahooUser> contacts = yahooGroup.getMembers();
-        for (YahooUser item : contacts)
-        {
-            ContactYahooImpl contact =
-                ssclCallback.findContactById(item.getId());
-            if(contact != null)
-            {
-                contact.setResolved(item);
-
-                ssclCallback.fireContactResolved(this, contact);
-            }
-            else
-            {
-                ContactYahooImpl newContact =
-                    new ContactYahooImpl(item, ssclCallback, true, true);
-                addContact(newContact);
-
-                ssclCallback.fireContactAdded(this, newContact);
-            }
-        }
-    }
-
-    /**
-     * Returns a <tt>String</tt> that uniquely represnets the group. In this we
-     * use the name of the group as an identifier. This may cause problems
-     * though, in clase the name is changed by some other application between
-     * consecutive runs of the sip-communicator.
-     *
-     * @return a String representing this group in a unique and persistent
-     * way.
-     */
-    public String getUID()
-    {
-        return getGroupName();
-    }
-
-    /**
-     * The source group we are encapsulating
-     * @return YahooGroup
-     */
-    YahooGroup getSourceGroup()
-    {
-        return yahooGroup;
-    }
-
-    /**
-     * Change the source group
-     * change the buddies
-     *
-     * @param newGroup YahooGroup
-     */
-    void setSourceGroup(YahooGroup newGroup)
-    {
-        this.yahooGroup = newGroup;
-    }
-}