Delete XMPP Parser (moving to parsers repo).

parser_xmpp/build.gradle

@@ -1,4 +1,3 @@
 dependencies {
-  bundle group: 'org.igniterealtime.smack', name: 'smack', version: '3.2.1'
-  bundle group: 'org.igniterealtime.smack', name: 'smackx', version: '3.2.1'
+    bundle group: 'com.dmdirc.parser', name: 'xmpp', version: '+', changing: true, transitive: false
 }

parser_xmpp/plugin.config

@@ -12,7 +12,7 @@ keysections:
 
 metadata:
   author=Chris <chris@dmdirc.com>
-  mainclass=com.dmdirc.addons.parser_xmpp.XmppPlugin
+  mainclass=XmppPlugin
   description=Provides XMPP access for DMDirc.
   name=xmpp
   nicename=XMPP Plugin
@@ -30,5 +30,5 @@ provides:
 
 
 exports:
-  getParser in com.dmdirc.addons.parser_xmpp.XmppPlugin as getParser
-  getDescription in com.dmdirc.addons.parser_xmpp.XmppPlugin as getProtocolDescription
+  getParser in XmppPlugin as getParser
+  getDescription in XmppPlugin as getProtocolDescription

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/FixedXmppConnection.java

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jivesoftware.smack.Connection;
-import org.jivesoftware.smack.ConnectionConfiguration;
-import org.jivesoftware.smack.ConnectionCreationListener;
-import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.ServiceDiscoveryManager;
-
-/**
- * An extension of XMPPConnection that hacks around the problems caused by Smack's ridiculous use of
- * static initialisers (and the dependencies between them). See
- * http://issues.igniterealtime.org/browse/SMACK-315 for info.
- */
-public class FixedXmppConnection extends XMPPConnection
-        implements ConnectionCreationListener {
-
-    /** A set of listeners that were registered with the XMPP Parser. */
-    private final Set<ConnectionCreationListener> oldListeners = new HashSet<>();
-
-    /**
-     * Creates a new fixed XMPP connection with the specified config.
-     *
-     * @param config The config to pass on to the underlying connection
-     *
-     * @see XMPPConnection#XMPPConnection(org.jivesoftware.smack.ConnectionConfiguration)
-     */
-    public FixedXmppConnection(final ConnectionConfiguration config) {
-        super(config);
-    }
-
-    @Override
-    public void connect() throws XMPPException {
-        // We're fiddling with a static array
-        synchronized (FixedXmppConnection.class) {
-            final Set<ConnectionCreationListener> rawListeners = getListeners();
-
-            // Copy them so we can clear and restore later
-            oldListeners.addAll(rawListeners);
-
-            // Get rid of everything and add ourselves.
-            rawListeners.clear();
-            rawListeners.add(this);
-
-            try {
-                super.connect();
-            } finally {
-                // Restore to the previous state
-                rawListeners.remove(this);
-                rawListeners.addAll(oldListeners);
-                oldListeners.clear();
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    public void connectionCreated(final Connection xmppc) {
-        // Creating this shoves itself into a static map. Other listeners
-        // depend on this entry existing in the map before they're called.
-        new ServiceDiscoveryManager(xmppc);
-
-        // Now execute our real listeners
-        // We've already created a discovery manager, don't make another...
-        oldListeners.stream()
-                .filter(listener -> !ServiceDiscoveryManager.class
-                        .equals(listener.getClass().getEnclosingClass()))
-                .forEach(listener -> listener.connectionCreated(xmppc));
-    }
-
-    /**
-     * Retrieves the set of listeners that have been registered statically with the XMPPConnection
-     * class.
-     *
-     * @return The raw listener set.
-     */
-    @SuppressWarnings("unchecked")
-    private Set<ConnectionCreationListener> getListeners() {
-        try {
-            final Field field = XMPPConnection.class.getDeclaredField(
-                    "connectionEstablishedListeners");
-            field.setAccessible(true);
-            return (Set<ConnectionCreationListener>) field.get(null);
-        } catch (ReflectiveOperationException ex) {
-            // Throws a bunch of exceptions... Try to carry on anyway, the
-            // horrible concurrency bugs might not bite.
-            return new HashSet<>();
-        }
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppChannelClientInfo.java

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.common.BaseChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-
-import java.util.Comparator;
-
-import javax.annotation.Nonnull;
-
-/**
- * An XMPP-specific channel client info object.
- */
-public class XmppChannelClientInfo extends BaseChannelClientInfo {
-
-    /**
-     * Creates a new client info object for the specified channel and client.
-     *
-     * @param channel The channel the association is with
-     * @param client  The user that holds the association
-     */
-    public XmppChannelClientInfo(final ChannelInfo channel, final ClientInfo client) {
-        super(channel, client);
-    }
-
-    @Override
-    public String getImportantModePrefix() {
-        return ""; // TODO: Implement
-    }
-
-    @Override
-    public String getImportantMode() {
-        return ""; // TODO: Implement
-    }
-
-    @Override
-    public String getAllModes() {
-        return ""; // TODO: Implement
-    }
-
-    @Override
-    public String getAllModesPrefix() {
-        return ""; // TODO: Implement
-    }
-
-    @Override
-    public void kick(final String message) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Comparator<String> getImportantModeComparator() {
-        return Comparator.naturalOrder();
-    }
-
-    @Override
-    public int compareTo(@Nonnull final ChannelClientInfo o) {
-        return 0; // TODO: Implement
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppClientInfo.java

@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.common.AwayState;
-import com.dmdirc.parser.common.BaseClientInfo;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import com.google.common.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jivesoftware.smack.RosterEntry;
-import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smack.packet.Presence.Mode;
-import org.jivesoftware.smack.packet.Presence.Type;
-
-/**
- * An XMPP-specific client info object.
- */
-public class XmppClientInfo extends BaseClientInfo {
-
-    /** A map of known endpoints for this client. */
-    private final Map<String, XmppEndpoint> endpoints = new HashMap<>();
-
-    /**
-     * Creates a new XMPP Client Info object with the specified details.
-     *
-     * @param parser The parser that owns this client info object
-     * @param nick   The nickname of the user this object represents
-     * @param user   The username of the user this object represents
-     * @param host   The hostname of the user this object represents
-     */
-    public XmppClientInfo(final XmppParser parser, final String nick, final String user,
-            final String host) {
-        super(parser, nick, user, host);
-    }
-
-    @Override
-    public int getChannelCount() {
-        return 0;
-    }
-
-    @Override
-    public List<ChannelClientInfo> getChannelClients() {
-        return Lists.newArrayList();
-    }
-
-    /**
-     * Retrieves the map of known endpoints for this client.
-     *
-     * @return A map of endpoint names to presence states.
-     */
-    public Map<String, XmppEndpoint> getEndpoints() {
-        return Collections.unmodifiableMap(endpoints);
-    }
-
-    /**
-     * Sets the presence of one endpoint of this client.
-     *
-     * @param packet The presence packet received
-     */
-    public void setPresence(final Presence packet) {
-        final String[] parts = getParser().parseHostmask(packet.getFrom());
-        final boolean wasAway = isAway();
-
-        if (packet.getType() == Type.unavailable) {
-            endpoints.remove(parts[1]);
-        } else {
-            if (!endpoints.containsKey(parts[1])) {
-                endpoints.put(parts[1], new XmppEndpoint());
-            }
-
-            final XmppEndpoint endpoint = endpoints.get(parts[1]);
-            endpoint.setPriority(packet.getPriority());
-            endpoint.setMode(packet.getMode());
-            endpoint.setType(packet.getType());
-            endpoint.setStatus(packet.getStatus());
-        }
-
-        final boolean isAway = isAway();
-
-        if (wasAway != isAway) {
-            // Their away status has changed
-            getParser().handleAwayStateChange(this, wasAway);
-        }
-    }
-
-    /**
-     * Determines whether or not this contact is "away" - that is, their aggregate presence state is
-     * "Unavailable", "Away", "DND" or "XA".
-     *
-     * @return True if the client is away, false otherwise
-     */
-    public boolean isAway() {
-        final Mode presence = getAggregatePresence();
-
-        return presence == null || presence.compareTo(Mode.away) >= 0;
-    }
-
-    @Override
-    public AwayState getAwayState() {
-        return isAway() ? AwayState.AWAY : AwayState.HERE;
-    }
-
-    /**
-     * Gets the aggregate presence of this contact.
-     *
-     * @return The highest available state of the contact's highest priority endpoints, * or
-     *         <code>null</code> if no endpoints are available.
-     */
-    public Mode getAggregatePresence() {
-        final List<XmppEndpoint> sortedEndpoints = new ArrayList<>(endpoints.values());
-        Collections.sort(sortedEndpoints);
-
-        // Get the set of the highest priority endpoints
-        final Set<XmppEndpoint> bestEndpoints = new HashSet<>(sortedEndpoints.size());
-        int best = 0;
-        for (XmppEndpoint endpoint : sortedEndpoints) {
-            if (endpoint.getType() != Type.available) {
-                continue;
-            }
-
-            if (bestEndpoints.isEmpty()) {
-                best = endpoint.getPriority();
-            }
-
-            if (endpoint.getPriority() == best && best >= 0) {
-                bestEndpoints.add(endpoint);
-            }
-        }
-
-        // Find the best presence
-        Mode bestPresence = null;
-        for (XmppEndpoint endpoint : bestEndpoints) {
-            final Mode targetMode = endpoint.getMode() == null ? Mode.available : endpoint.getMode();
-            if (bestPresence == null || bestPresence.compareTo(targetMode) > 0) {
-                bestPresence = targetMode;
-            }
-        }
-
-        return bestPresence;
-    }
-
-    /**
-     * Updates this client with information from the roster.
-     *
-     * @param entry The roster entry to update this client with
-     */
-    public void setRosterEntry(final RosterEntry entry) {
-        setRealname(entry.getName());
-    }
-
-    @Override
-    public XmppParser getParser() {
-        return (XmppParser) super.getParser();
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppEndpoint.java

@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import javax.annotation.Nonnull;
-
-import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smack.packet.Presence.Mode;
-import org.jivesoftware.smack.packet.Presence.Type;
-
-/**
- * Represents a single endpoint of one contact.
- */
-public class XmppEndpoint implements Comparable<XmppEndpoint> {
-
-    /** The mode of the last presence update. */
-    private Presence.Mode mode;
-    /** The type of the last presence update. */
-    private Presence.Type type;
-    /** The status from the last presence update. */
-    private String status;
-    /** The priority of this endpoint. */
-    private int priority;
-
-    /**
-     * Gets the mode of this endpoint.
-     *
-     * @return The last seen presence mode
-     */
-    public Mode getMode() {
-        return mode;
-    }
-
-    /**
-     * Sets the mode of this endpoint.
-     *
-     * @param mode The most recently received presence mode
-     */
-    public void setMode(final Mode mode) {
-        this.mode = mode;
-    }
-
-    /**
-     * Gets the status of this endpoint.
-     *
-     * @return The last seen presence status
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the status of this endpoint.
-     *
-     * @param status The most recently received presence status
-     */
-    public void setStatus(final String status) {
-        this.status = status;
-    }
-
-    /**
-     * Gets the type of this endpoint.
-     *
-     * @return The last seen presence type
-     */
-    public Type getType() {
-        return type;
-    }
-
-    /**
-     * Sets the type of this endpoint.
-     *
-     * @param type The most recently received presence type
-     */
-    public void setType(final Type type) {
-        this.type = type;
-    }
-
-    /**
-     * Gets the priority of this endpoint.
-     *
-     * @return The priority of this endpoint
-     */
-    public int getPriority() {
-        return priority;
-    }
-
-    /**
-     * Sets the priority of this endpoint.
-     *
-     * @param priority The new priority for this endpoint
-     */
-    public void setPriority(final int priority) {
-        this.priority = priority;
-    }
-
-    /**
-     * Gets a user-friendly string describing this endpoint's presence.
-     *
-     * @return The presence of this endpoint in a user-friendly format
-     */
-    public String getPresence() {
-        final String statusText = (status == null || status.isEmpty()) ? "" : " (" + status + ")";
-
-        if (type == Type.unavailable) {
-            return "Unavailable" + statusText;
-        } else if (mode == null) {
-            return "Available" + statusText;
-        } else {
-            return getFriendlyMode(mode) + statusText;
-        }
-    }
-
-    /**
-     * Returns a friendly representation of the specified presence mode.
-     *
-     * @param mode The mode being represented
-     *
-     * @return A user-friendly string corresponding to the mode
-     */
-    private static String getFriendlyMode(final Mode mode) {
-        switch (mode) {
-            case available:
-                return "Available";
-            case away:
-                return "Away";
-            case chat:
-                return "Chatty";
-            case dnd:
-                return "Do not disturb";
-            case xa:
-                return "Extended Away";
-            default:
-                return mode.toString();
-        }
-    }
-
-    @Override
-    public int compareTo(@Nonnull final XmppEndpoint o) {
-        return o.getPriority() - priority;
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppFakeChannel.java

@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.common.BaseChannelInfo;
-import com.dmdirc.parser.common.ChannelListModeItem;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
-
-import java.util.Collection;
-import java.util.Date;
-
-/**
- * A 'fake' local channel used to display buddy lists.
- */
-public class XmppFakeChannel extends BaseChannelInfo {
-
-    /**
-     * Creates a new fake channel belonging to the specified parser and with the given name.
-     *
-     * @param parser The XMPP parser that owns this channel
-     * @param name   The name of the channel
-     */
-    public XmppFakeChannel(final Parser parser, final String name) {
-        super(parser, name);
-    }
-
-    @Override
-    public void setTopic(final String topic) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public String getTopic() {
-        return "No topic yet!";
-    }
-
-    @Override
-    public long getTopicTime() {
-        return System.currentTimeMillis(); // TODO
-    }
-
-    @Override
-    public String getTopicSetter() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getMode(final char mode) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<ChannelListModeItem> getListMode(final char mode) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void part(final String reason) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void sendWho() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void alterMode(final boolean add, final Character mode, final String parameter) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void flushModes() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void requestListModes() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ChannelClientInfo getChannelClient(final ClientInfo client) {
-        return getClient(client.getNickname());
-    }
-
-    @Override
-    public ChannelClientInfo getChannelClient(final String client, final boolean create) {
-        final String[] parts = getParser().parseHostmask(client);
-
-        if (create && getClient(parts[0]) == null) {
-            return new XmppChannelClientInfo(this, getParser().getClient(client));
-        }
-
-        return getClient(parts[0]);
-    }
-
-    /**
-     * Updates this channel with the specified contacts.
-     *
-     * @param clients The contacts to be added
-     */
-    public void updateContacts(final Collection<XmppClientInfo> clients) {
-        for (XmppClientInfo client : clients) {
-            addClient(client.getNickname(), new XmppChannelClientInfo(this, client));
-        }
-
-        // TODO: Delete old contacts, don't needlessly create new objects
-        getParser().getCallbackManager().getCallback(ChannelNamesListener.class)
-                .onChannelGotNames(getParser(), new Date(), this);
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppLocalClientInfo.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-
-/**
- * A representation of the local XMPP client.
- */
-public class XmppLocalClientInfo extends XmppClientInfo implements LocalClientInfo {
-
-    /**
-     * Creates a new XMPP Client Info object with the specified details.
-     *
-     * @param parser The parser that owns this client info object
-     * @param nick   The nickname of the user this object represents
-     * @param user   The username of the user this object represents
-     * @param host   The hostname of the user this object represents
-     */
-    public XmppLocalClientInfo(final XmppParser parser, final String nick,
-            final String user, final String host) {
-        super(parser, nick, user, host);
-    }
-
-    @Override
-    public void setNickname(final String name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public String getModes() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void setAway(final String reason) {
-        getParser().setAway(reason);
-    }
-
-    @Override
-    public void setBack() {
-        getParser().setBack();
-    }
-
-    @Override
-    public void alterMode(final boolean add, final Character mode) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void flushModes() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppParser.java

@@ -1,718 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.common.AwayState;
-import com.dmdirc.parser.common.BaseSocketAwareParser;
-import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.parser.common.ChildImplementations;
-import com.dmdirc.parser.common.CompositionState;
-import com.dmdirc.parser.common.DefaultStringConverter;
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.common.QueuePriority;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.StringConverter;
-import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
-import com.dmdirc.parser.interfaces.callbacks.CompositionStateChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
-import com.dmdirc.parser.interfaces.callbacks.DataInListener;
-import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
-import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
-import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
-import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jivesoftware.smack.Chat;
-import org.jivesoftware.smack.ChatManagerListener;
-import org.jivesoftware.smack.ConnectionConfiguration;
-import org.jivesoftware.smack.ConnectionListener;
-import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.RosterEntry;
-import org.jivesoftware.smack.RosterListener;
-import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.filter.PacketFilter;
-import org.jivesoftware.smack.packet.Message;
-import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smack.packet.Presence;
-import org.jivesoftware.smackx.ChatState;
-import org.jivesoftware.smackx.ChatStateListener;
-import org.jivesoftware.smackx.ChatStateManager;
-import org.jivesoftware.smackx.muc.MultiUserChat;
-import org.slf4j.LoggerFactory;
-
-/**
- * A parser which can understand the XMPP protocol.
- */
-@ChildImplementations({
-    XmppClientInfo.class, XmppLocalClientInfo.class, XmppFakeChannel.class,
-    XmppChannelClientInfo.class
-})
-public class XmppParser extends BaseSocketAwareParser {
-
-    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(XmppParser.class);
-    /** Pattern to use to extract priority. */
-    private static final Pattern PRIORITY_PATTERN = Pattern.compile(
-            "(?i)(?:^|&)priority=([0-9]+)(?:$|&)");
-    /** The connection to use. */
-    private XMPPConnection connection;
-    /** The state manager for the current connection. */
-    private ChatStateManager stateManager;
-    /** A cache of known chats. */
-    private final Map<String, Chat> chats = new HashMap<>();
-    /** A cache of known clients. */
-    private final Map<String, XmppClientInfo> contacts = new HashMap<>();
-    /** Whether or not to use a fake local channel for a buddy list replacement. */
-    private final boolean useFakeChannel;
-    /** The priority of this endpoint. */
-    private final int priority;
-    /** The fake channel to use is useFakeChannel is enabled. */
-    private XmppFakeChannel fakeChannel;
-
-    /**
-     * Creates a new XMPP parser for the specified address.
-     *
-     * @param address The address to connect to
-     */
-    public XmppParser(final URI address) {
-        super(address);
-
-        if (address.getQuery() == null) {
-            useFakeChannel = false;
-            priority = 0;
-        } else {
-            final Matcher matcher = PRIORITY_PATTERN.matcher(address.getQuery());
-
-            useFakeChannel = address.getQuery().matches("(?i).*(^|&)showchannel($|&).*");
-            priority = matcher.find() ? Integer.parseInt(matcher.group(1)) : 0;
-        }
-
-        LOG.debug(
-                "XMPP parser created with query string {}, parsed fake channel = {}, priority = {}",
-                address.getQuery(), useFakeChannel, priority);
-    }
-
-    @Override
-    public void disconnect(final String message) {
-        super.disconnect(message);
-        // TODO: Pass quit message on as presence?
-        connection.disconnect();
-    }
-
-    @Override
-    public void joinChannels(final ChannelJoinRequest... channels) {
-        for (ChannelJoinRequest request : channels) {
-            final MultiUserChat muc = new MultiUserChat(connection, request.getName().substring(1));
-
-            try {
-                if (request.getPassword() == null) {
-                    muc.join(getLocalClient().getNickname());
-                } else {
-                    muc.join(getLocalClient().getNickname(), request.getPassword());
-                }
-
-                // TODO: Send callbacks etc
-            } catch (XMPPException ex) {
-                // TODO: handle
-            }
-        }
-    }
-
-    @Override
-    public ChannelInfo getChannel(final String channel) {
-        // TODO: Implement
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<? extends ChannelInfo> getChannels() {
-        return Collections.<ChannelInfo>emptyList();
-    }
-
-    @Override
-    public int getMaxLength(final String type, final String target) {
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public int getMaxLength() {
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public LocalClientInfo getLocalClient() {
-        final String[] parts = parseHostmask(connection.getUser());
-
-        // TODO: Cache this
-        return new XmppLocalClientInfo(this, parts[0], parts[2], parts[1]);
-    }
-
-    @Override
-    public XmppClientInfo getClient(final String details) {
-        final String[] parts = parseHostmask(details);
-
-        if (!contacts.containsKey(parts[0])) {
-            contacts.put(parts[0], new XmppClientInfo(this, parts[0], parts[2], parts[1]));
-        }
-
-        return contacts.get(parts[0]);
-    }
-
-    @Override
-    public void sendRawMessage(final String message) {
-        // Urgh, hacky horrible rubbish. These commands should call methods.
-        if (message.toUpperCase().startsWith("WHOIS ")) {
-            handleWhois(message.split(" ")[1]);
-        } else if (!message.isEmpty() && message.charAt(0) == '<') {
-            // Looks vaguely like XML, let's send it.
-            connection.sendPacket(new Packet() {
-
-                @Override
-                public String toXML() {
-                    return message;
-                }
-            });
-        }
-    }
-
-    /**
-     * Handles a whois request for the specified target.
-     *
-     * @param target The user being WHOIS'd
-     */
-    private void handleWhois(final String target) {
-        // Urgh, hacky horrible rubbish. This should be abstracted.
-        if (contacts.containsKey(target)) {
-            final XmppClientInfo client = contacts.get(target);
-            final String[] userParts = client.getNickname().split("@", 2);
-
-            callNumericCallback(311, target, userParts[0], userParts[1], "*", client.getRealname());
-
-            for (Map.Entry<String, XmppEndpoint> endpoint : client.getEndpoints().entrySet()) {
-                callNumericCallback(399, target, endpoint.getKey(),
-                        "(" + endpoint.getValue().getPresence() + ")", "has endpoint");
-            }
-        } else {
-            callNumericCallback(401, target, "No such contact found");
-        }
-
-        callNumericCallback(318, target, "End of /WHOIS.");
-    }
-
-    private void callNumericCallback(final int numeric, final String... args) {
-        final String[] newArgs = new String[args.length + 3];
-        newArgs[0] = ":xmpp.server";
-        newArgs[1] = (numeric < 100 ? "0" : "") + (numeric < 10 ? "0" : "") + numeric;
-        newArgs[2] = getLocalClient().getNickname();
-        System.arraycopy(args, 0, newArgs, 3, args.length);
-
-        getCallback(NumericListener.class).onNumeric(this, new Date(), numeric, newArgs);
-    }
-
-    @Override
-    public void sendRawMessage(final String message, final QueuePriority priority) {
-        sendRawMessage(message);
-    }
-
-    @Override
-    public StringConverter getStringConverter() {
-        return new DefaultStringConverter();
-    }
-
-    @Override
-    public boolean isValidChannelName(final String name) {
-        return false; // TODO: Implement
-    }
-
-    @Override
-    public boolean compareURI(final URI uri) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Collection<? extends ChannelJoinRequest> extractChannels(final URI uri) {
-        return Collections.<ChannelJoinRequest>emptyList();
-    }
-
-    @Override
-    public String getNetworkName() {
-        return "XMPP"; // TODO
-    }
-
-    @Override
-    public String getServerSoftware() {
-        return "Unknown"; // TODO
-    }
-
-    @Override
-    public String getServerSoftwareType() {
-        return "XMPP"; // TODO
-    }
-
-    @Override
-    public List<String> getServerInformationLines() {
-        return Collections.emptyList(); // TODO
-    }
-
-    @Override
-    public int getMaxTopicLength() {
-        return 0; // TODO
-    }
-
-    @Override
-    public String getBooleanChannelModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getListChannelModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public int getMaxListModes(final char mode) {
-        return 0; // TODO
-    }
-
-    @Override
-    public boolean isUserSettable(final char mode) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public String getParameterChannelModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getDoubleParameterChannelModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getUserModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getChannelUserModes() {
-        return ""; // TODO
-    }
-
-    @Override
-    public String getChannelPrefixes() {
-        return "#";
-    }
-
-    @Override
-    public long getServerLatency() {
-        return 1000L; // TODO
-    }
-
-    @Override
-    public void sendCTCP(final String target, final String type, final String message) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void sendCTCPReply(final String target, final String type, final String message) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void sendMessage(final String target, final String message) {
-        if (!chats.containsKey(target)) {
-            LOG.debug("Creating new chat for {}", target);
-            chats.put(target, connection.getChatManager().createChat(target,
-                    new MessageListenerImpl()));
-        }
-
-        try {
-            chats.get(target).sendMessage(message);
-        } catch (XMPPException ex) {
-            // TODO: Handle this
-        }
-    }
-
-    @Override
-    public void sendNotice(final String target, final String message) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void sendAction(final String target, final String message) {
-        sendMessage(target, "/me " + message);
-    }
-
-    @Override
-    public void sendInvite(final String channel, final String user) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void sendWhois(final String nickname) {
-        // TODO: Implement this
-    }
-
-    @Override
-    public String getLastLine() {
-        return "TODO: Implement me";
-    }
-
-    @Override
-    public String[] parseHostmask(final String hostmask) {
-        return new XmppProtocolDescription().parseHostmask(hostmask);
-    }
-
-    @Override
-    public long getPingTime() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void run() {
-        if (getURI().getUserInfo() == null || !getURI().getUserInfo().contains(":")) {
-            getCallback(ConnectErrorListener.class).onConnectError(this,
-                    new Date(), new ParserError(ParserError.ERROR_USER,
-                            "User name and password must be specified in URI", ""));
-            return;
-        }
-        final String[] userInfoParts = getURI().getUserInfo().split(":", 2);
-        final String[] userParts = userInfoParts[0].split("@", 2);
-
-        final ConnectionConfiguration config = new ConnectionConfiguration(getURI().getHost(),
-                getURI().getPort(), userParts[0]);
-        config.setSecurityMode(getURI().getScheme().equalsIgnoreCase("xmpps")
-                ? ConnectionConfiguration.SecurityMode.required
-                : ConnectionConfiguration.SecurityMode.disabled);
-        config.setSASLAuthenticationEnabled(true);
-        config.setReconnectionAllowed(false);
-        config.setRosterLoadedAtLogin(true);
-        config.setSocketFactory(getSocketFactory());
-        connection = new FixedXmppConnection(config);
-
-        try {
-            connection.connect();
-
-            connection.addConnectionListener(new ConnectionListenerImpl());
-            connection.addPacketListener(new PacketListenerImpl(DataInListener.class),
-                    new AcceptAllPacketFilter());
-            connection.addPacketSendingListener(new PacketListenerImpl(DataOutListener.class),
-                    new AcceptAllPacketFilter());
-            connection.getChatManager().addChatListener(new ChatManagerListenerImpl());
-
-            try {
-                connection.login(userInfoParts[0], userInfoParts[1], "DMDirc.");
-            } catch (XMPPException ex) {
-                getCallback(ConnectErrorListener.class).onConnectError(this,
-                        new Date(), new ParserError(ParserError.ERROR_USER,
-                                ex.getMessage(), ""));
-                return;
-            }
-
-            connection.sendPacket(new Presence(Presence.Type.available, null, priority,
-                    Presence.Mode.available));
-            connection.getRoster().addRosterListener(new RosterListenerImpl());
-
-            stateManager = ChatStateManager.getInstance(connection);
-
-            setServerName(connection.getServiceName());
-
-            getCallback(ServerReadyListener.class).onServerReady(this, new Date());
-
-            for (RosterEntry contact : connection.getRoster().getEntries()) {
-                getClient(contact.getUser()).setRosterEntry(contact);
-            }
-
-            if (useFakeChannel) {
-                fakeChannel = new XmppFakeChannel(this, "&contacts");
-                getCallback(ChannelSelfJoinListener.class).
-                        onChannelSelfJoin(null, null, fakeChannel);
-                fakeChannel.updateContacts(contacts.values());
-
-                contacts.values().stream().filter(XmppClientInfo::isAway).forEach(client ->
-                        getCallback(OtherAwayStateListener.class).onAwayStateOther(this, new Date(),
-                                client, AwayState.UNKNOWN, AwayState.AWAY));
-            }
-        } catch (XMPPException ex) {
-            LOG.debug("Go an XMPP exception", ex);
-
-            connection = null;
-
-            final ParserError error = new ParserError(ParserError.ERROR_ERROR, "Unable to connect",
-                    "");
-
-            if (ex.getWrappedThrowable() instanceof Exception) {
-                // Pass along the underlying exception instead of an XMPP
-                // specific one
-                error.setException((Exception) ex.getWrappedThrowable());
-            } else {
-                error.setException(ex);
-            }
-
-            getCallback(ConnectErrorListener.class).onConnectError(this, new Date(), error);
-        }
-    }
-
-    /**
-     * Handles a client's away state changing.
-     *
-     * @param client The client whose state is changing
-     * @param isBack True if the client is coming back, false if they're going away
-     */
-    public void handleAwayStateChange(final ClientInfo client, final boolean isBack) {
-        LOG.debug("Handling away state change for {} to {}", client.getNickname(), isBack);
-
-        if (useFakeChannel) {
-            getCallback(OtherAwayStateListener.class)
-                    .onAwayStateOther(null, null, client,
-                            isBack ? AwayState.AWAY : AwayState.HERE,
-                            isBack ? AwayState.HERE : AwayState.AWAY);
-        }
-    }
-
-    /**
-     * Marks the local user as away with the specified reason.
-     *
-     * @param reason The away reason
-     */
-    public void setAway(final String reason) {
-        connection.sendPacket(new Presence(Presence.Type.available, reason,
-                priority, Presence.Mode.away));
-
-        getCallback(AwayStateListener.class).onAwayState(this, new Date(),
-                AwayState.HERE, AwayState.AWAY, reason);
-    }
-
-    /**
-     * Marks the local user as back.
-     */
-    public void setBack() {
-        connection.sendPacket(new Presence(Presence.Type.available, null,
-                priority, Presence.Mode.available));
-
-        getCallback(AwayStateListener.class).onAwayState(this, new Date(),
-                AwayState.AWAY, AwayState.HERE, null);
-    }
-
-    @Override
-    public void setCompositionState(final String host, final CompositionState state) {
-        LOG.debug("Setting composition state for {} to {}", host, state);
-
-        final Chat chat = chats.get(parseHostmask(host)[0]);
-
-        final ChatState newState;
-
-        switch (state) {
-            case ENTERED_TEXT:
-                newState = ChatState.paused;
-                break;
-            case TYPING:
-                newState = ChatState.composing;
-                break;
-            case IDLE:
-            default:
-                newState = ChatState.active;
-                break;
-        }
-
-        if (chat != null && stateManager != null) {
-            try {
-                stateManager.setCurrentState(newState, chat);
-            } catch (XMPPException ex) {
-                // Can't set chat state... Oh well?
-                LOG.info("Couldn't set composition state", ex);
-            }
-        }
-    }
-
-    @Override
-    public void requestGroupList(final String searchTerms) {
-        // Do nothing
-    }
-
-    private class ConnectionListenerImpl implements ConnectionListener {
-
-        @Override
-        public void connectionClosed() {
-            getCallback(SocketCloseListener.class).onSocketClosed(XmppParser.this, new Date());
-        }
-
-        @Override
-        public void connectionClosedOnError(final Exception excptn) {
-            // TODO: Handle exception
-            getCallback(SocketCloseListener.class).onSocketClosed(XmppParser.this, new Date());
-        }
-
-        @Override
-        public void reconnectingIn(final int i) {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-        @Override
-        public void reconnectionSuccessful() {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-        @Override
-        public void reconnectionFailed(final Exception excptn) {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-    }
-
-    private class RosterListenerImpl implements RosterListener {
-
-        @Override
-        public void entriesAdded(final Collection<String> clctn) {
-            // Do nothing, yet
-        }
-
-        @Override
-        public void entriesUpdated(final Collection<String> clctn) {
-            // Do nothing, yet
-        }
-
-        @Override
-        public void entriesDeleted(final Collection<String> clctn) {
-            // Do nothing, yet
-        }
-
-        @Override
-        public void presenceChanged(final Presence prsnc) {
-            getClient(prsnc.getFrom()).setPresence(prsnc);
-        }
-
-    }
-
-    private class ChatManagerListenerImpl implements ChatManagerListener {
-
-        @Override
-        public void chatCreated(final Chat chat, final boolean bln) {
-            if (!bln) {
-                // Only add chats that weren't created locally
-                chats.put(parseHostmask(chat.getParticipant())[0], chat);
-                chat.addMessageListener(new MessageListenerImpl());
-            }
-        }
-
-    }
-
-    private class MessageListenerImpl implements ChatStateListener {
-
-        @Override
-        public void processMessage(final Chat chat, final Message msg) {
-            if (msg.getType() == Message.Type.error) {
-                getCallback(NumericListener.class).onNumeric(XmppParser.this, new Date(),
-                        404, new String[]{
-                            ":xmpp", "404", getLocalClient().getNickname(),
-                            msg.getFrom(),
-                            "Cannot send message: " + msg.getError().toString()
-                        });
-                return;
-            }
-
-            if (msg.getBody() != null) {
-                if (msg.getBody().startsWith("/me ")) {
-                    getCallback(PrivateActionListener.class).onPrivateAction(XmppParser.this,
-                            new Date(), msg.getBody().substring(4), msg.getFrom());
-                } else {
-                    getCallback(PrivateMessageListener.class).onPrivateMessage(XmppParser.this,
-                            new Date(), msg.getBody(), msg.getFrom());
-                }
-            }
-        }
-
-        @Override
-        public void stateChanged(final Chat chat, final ChatState cs) {
-            final CompositionState state;
-
-            switch (cs) {
-                case paused:
-                    state = CompositionState.ENTERED_TEXT;
-                    break;
-                case composing:
-                    state = CompositionState.TYPING;
-                    break;
-                case active:
-                case gone:
-                case inactive:
-                default:
-                    state = CompositionState.IDLE;
-                    break;
-            }
-
-            getCallback(CompositionStateChangeListener.class)
-                    .onCompositionStateChanged(XmppParser.this, new Date(), state,
-                            chat.getParticipant());
-        }
-
-    }
-
-    private class PacketListenerImpl implements PacketListener {
-
-        private final Class<? extends CallbackInterface> callback;
-
-        public PacketListenerImpl(final Class<? extends CallbackInterface> callback) {
-            this.callback = callback;
-        }
-
-        @Override
-        public void processPacket(final Packet packet) {
-            if (callback.equals(DataOutListener.class)) {
-                getCallback(DataOutListener.class).onDataOut(XmppParser.this, new Date(),
-                        packet.toXML(), true);
-            } else {
-                getCallback(DataInListener.class).onDataIn(XmppParser.this, new Date(),
-                        packet.toXML());
-            }
-        }
-
-    }
-
-    private static class AcceptAllPacketFilter implements PacketFilter {
-
-        @Override
-        public boolean accept(final Packet packet) {
-            return true;
-        }
-
-    }
-
-}

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppPlugin.java

@@ -25,6 +25,8 @@ package com.dmdirc.addons.parser_xmpp;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
+import com.dmdirc.parser.xmpp.XmppParser;
+import com.dmdirc.parser.xmpp.XmppProtocolDescription;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.implementations.BasePlugin;
 

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppProtocolDescription.java

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.parser_xmpp;
-
-import com.dmdirc.parser.interfaces.ProtocolDescription;
-
-import java.net.URI;
-
-/**
- * A description of the XMPP protocol.
- */
-public class XmppProtocolDescription implements ProtocolDescription {
-
-    @Override
-    public int getDefaultPort() {
-        return 5222;
-    }
-
-    @Override
-    public String[] parseHostmask(final String hostmask) {
-        final String[] parts = hostmask.split("/");
-        return new String[]{parts[0], parts.length > 1 ? parts[1] : "unknown", ""};
-    }
-
-    @Override
-    public boolean isSecure(final URI uri) {
-        return uri.getScheme().endsWith("s");
-    }
-
-}