Add serverlist plugin

Change-Id: I759dc8f56920362567778af366a34288fbf2a75d
Reviewed-on: http://gerrit.dmdirc.com/1444
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/serverlists/ServerEntry.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import com.dmdirc.Server;
+
+import java.net.URI;
+
+/**
+ * Describes an entry for a server within a {@link ServerGroup}.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerEntry extends ServerGroupItemBase {
+
+    /** The address of the server in question. */
+    private URI address;
+
+    /** The group that owns this entry. */
+    private final ServerGroup group;
+
+    /**
+     * Creates a new server entry.
+     *
+     * @param group The group that owns this entry
+     * @param name The name of this server
+     * @param address The address of this server
+     * @param profile The name of the profile to be used by this server
+     */
+    public ServerEntry(final ServerGroup group, final String name,
+            final URI address, final String profile) {
+        setName(name);
+        setProfile(profile);
+        this.address = address;
+        this.group = group;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ServerGroup getGroup() {
+        return group;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected ServerGroup getParent() {
+        return getGroup();
+    }
+
+    /**
+     * Retrieves the address used by this server.
+     *
+     * @return This server's address
+     */
+    @Override
+    public URI getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the address for this server entry.
+     *
+     * @param address The new address for this entry
+     */
+    public void setAddress(final URI address) {
+        setModified(true);
+        this.address = address;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void connect() {
+        final Server server = new Server(address, getProfileIdentity());
+        server.connect();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return "[" + getName() + ": address: " + getAddress() + "]";
+    }
+
+}

src/com/dmdirc/addons/serverlists/ServerGroup.java

@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A server group contains an ordered collection of server entries or other
+ * server groups.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerGroup extends ServerGroupItemBase {
+
+    /** The name of the network for the group. */
+    private String network;
+
+    /** A description of this group. */
+    private String description = "";
+
+    /** This group's parent. */
+    private final ServerGroup parent;
+
+    /** A set of links relevant to this group (e.g. homepages). */
+    private final Map<String, URI> links = new HashMap<String, URI>();
+    
+    /** The items contained within the group. */
+    private final List<ServerGroupItem> entries = new ArrayList<ServerGroupItem>();
+
+    /**
+     * Creates a new server group with the specified name and no parent.
+     *
+     * @param name The name to be used for this group
+     */
+    public ServerGroup(final String name) {
+        this(null, name);
+    }
+
+    /**
+     * Creates a new server group with the specified name.
+     *
+     * @param parent The parent of this group, or <code>null</code> for roots.
+     * @param name The name to be used for this group
+     */
+    public ServerGroup(final ServerGroup parent, final String name) {
+        this.parent = parent;
+        setName(name);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ServerGroup getGroup() {
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected ServerGroup getParent() {
+        return parent;
+    }
+
+    /**
+     * Sets the network name of this group.
+     *
+     * @param network The new network name for the group
+     */
+    public void setNetwork(final String network) {
+        setModified(true);
+        this.network = network;
+    }
+
+    /**
+     * Adds a new item to this server group.
+     *
+     * @param item The item to be added
+     */
+    public void addItem(final ServerGroupItem item) {
+        setModified(true);
+        item.setModified(true);
+        entries.add(item);
+    }
+
+    /**
+     * Retrieves a list of items belonging to this group.
+     *
+     * @return An immutable list of items contained within this group
+     */
+    public List<ServerGroupItem> getItems() {
+        return Collections.unmodifiableList(entries);
+    }
+
+    /**
+     * Retrieves a ServerGroupItem with the specified name, if one exists. This
+     * method ignores the case of item's name when comparing.
+     *
+     * @param name The name of the item to be retrieved
+     * @return A correspondingly named item, or null if none exists
+     */
+    public ServerGroupItem getItemByName(final String name) {
+        for (ServerGroupItem item : getItems()) {
+            if (item.getName().equalsIgnoreCase(name)) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieves the description of this group.
+     * 
+     * @return This group's description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Retrieves the network that this group represents, if any.
+     *
+     * @return This group's network name, or null if the group does not
+     * correspond to a known network.
+     */
+    public String getNetwork() {
+        return network;
+    }
+
+    /**
+     * Sets the description of this group.
+     *
+     * @param description The new description for this group.
+     */
+    public void setDescription(final String description) {
+        setModified(true);
+        this.description = description;
+    }
+
+    /**
+     * Retrieves a map of link titles to {@link URI}s which are associated
+     * with this server group. Links will typically include network homepages,
+     * forums, or support channels.
+     * 
+     * @return An immutable map of links
+     */
+    public Map<String, URI> getLinks() {
+        return Collections.unmodifiableMap(links);
+    }
+
+    /**
+     * Adds a new link with the specified title and address. If a link with the
+     * same title existed previously, it will be replaced.
+     *
+     * @param title The title of the new link
+     * @param address The address of the link
+     */
+    public void addLink(final String title, final URI address) {
+        setModified(true);
+        links.put(title, address);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Current implementation just selects the first item in this group and
+     * asks for its URI.
+     */
+    @Override
+    public URI getAddress() {
+        if (!entries.isEmpty()) {
+            return entries.get(0).getAddress();
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Current implementation just selects the first item in this group and
+     * asks it to connect.
+     */
+    @Override
+    public void connect() {
+        if (!entries.isEmpty()) {
+            entries.get(0).connect();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return "[" + getName() + ": links: " + getLinks() + "; desc: "
+                + getDescription() + "; content: " + getItems() + "]";
+    }
+}

src/com/dmdirc/addons/serverlists/ServerGroupItem.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import java.net.URI;
+
+/**
+ * An item which is included in a server group.
+ *
+ * @author chris
+ * @since 0.6.4
+ */
+public interface ServerGroupItem {
+
+    /**
+     * Retrieves a group that is either the same as this item, or contains this
+     * item.
+     *
+     * @return A group containing or equal to this item
+     */
+    ServerGroup getGroup();
+
+    /**
+     * Retrieves the name of this item.
+     *
+     * @return A string containing this item's name
+     */
+    String getName();
+
+    /**
+     * Sets the name of this group.
+     *
+     * @param name The new name for the group
+     */
+    void setName(final String name);
+
+    /**
+     * Retrieves the path and name of this item in textual format.
+     *
+     * @return A string containing the items path and name
+     */
+    String getPath();
+
+    /**
+     * Initiates a connection attempt for this item.
+     */
+    void connect();
+
+    /**
+     * Retrieves a URI for this item.
+     *
+     * @return A URI that represents this item or one of its children, or null
+     * if the item has no URIs associated with it.
+     */
+    URI getAddress();
+
+    /**
+     * Determines whether this item has been modified since the last time
+     * {@link #setModified(boolean)} was called with a <code>false</code>
+     * argument (or since this item was created).
+     *
+     * @return True if the item has been modified, false otherwise
+     */
+    boolean isModified();
+
+    /**
+     * Sets the modified status of this item.
+     *
+     * @param isModified The new status of the 'modified' property of this item
+     */
+    void setModified(final boolean isModified);
+
+    /**
+     * Retrieves the name of the profile which should be used when connecting
+     * to this item.
+     *
+     * @return The profile name used by this entry, or <code>null</code> if the
+     * default or parent group's profile should be used
+     */
+    String getProfile();
+
+    /**
+     * Sets the profile to be used for this server entry.
+     *
+     * @param profile The new profile name for this entry, or <code>null</code>
+     * if the default or parent group's profile should be used
+     */
+    void setProfile(final String profile);
+
+}

src/com/dmdirc/addons/serverlists/ServerGroupItemBase.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import com.dmdirc.config.Identity;
+import com.dmdirc.config.IdentityManager;
+
+/**
+ * Abstract base class for {@link ServerGroupItem}s.
+ *
+ * @author chris
+ * @since 0.6.4
+ */
+public abstract class ServerGroupItemBase implements ServerGroupItem {
+
+    /** Whether or not this item has been modified. */
+    private boolean modified;
+
+    /** The name of the item. */
+    private String name;
+
+    /** The name of the profile to use. */
+    private String profile;
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isModified() {
+        return modified;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setModified(final boolean isModified) {
+        this.modified = isModified;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setName(final String name) {
+        setModified(true);
+        this.name = name;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getPath() {
+        if (getParent() != null) {
+            return getParent().getPath() + " → " + getName();
+        }
+        return getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getProfile() {
+        return profile;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setProfile(final String profile) {
+        setModified(true);
+        this.profile = profile;
+    }
+
+    /**
+     * Returns the parent group of this item, or <code>null</code> if the
+     * item is a root group.
+     *
+     * @return This item's parent group
+     */
+    protected abstract ServerGroup getParent();
+
+    /**
+     * Returns the {@link Identity} which corresponds to this server's desired
+     * profile.
+     *
+     * @return This server's profile identity
+     */
+    protected Identity getProfileIdentity() {
+        if (profile != null) {
+            for (Identity identity : IdentityManager.getCustomIdentities("profile")) {
+                if (profile.equals(identity.getName())) {
+                    return identity;
+                }
+            }
+        }
+
+        if (getParent() == null) {
+            return IdentityManager.getCustomIdentities("profile").get(0);
+        } else {
+            return getParent().getProfileIdentity();
+        }
+    }
+
+}

src/com/dmdirc/addons/serverlists/ServerList.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import com.dmdirc.Precondition;
+import com.dmdirc.config.Identity;
+import com.dmdirc.config.IdentityListener;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.addons.serverlists.io.ServerGroupReader;
+import com.dmdirc.addons.serverlists.io.ServerGroupWriter;
+import com.dmdirc.addons.serverlists.service.ServerListServiceProvider;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Maintains a list of top level {@link ServerGroup}s and handles reading and
+ * writing of the lists to disk.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerList implements IdentityListener {
+
+    /** A list of all known groups. */
+    private final Map<ServerGroup, ServerGroupWriter> groups
+            = new HashMap<ServerGroup, ServerGroupWriter>();
+
+    /**
+     * Creates a new ServerList and loads groups and servers.
+     */
+    public ServerList() {
+        IdentityManager.addIdentityListener("servergroup", this);
+
+        for (Identity identity : IdentityManager.getCustomIdentities("servergroup")) {
+            identityAdded(identity);
+        }
+
+        new ServerListServiceProvider(this).register();
+    }
+
+    /**
+     * Adds a server group to the master server list.
+     *
+     * @param group The group to be added
+     * @param writer The writer to use to write the group to disk
+     */
+    public void addServerGroup(final ServerGroup group, final ServerGroupWriter writer) {
+        groups.put(group, writer);
+    }
+
+    /**
+     * Adds a server group to the master server list, and creates a new
+     * writer which will write the group to an identity.
+     *
+     * @param group The group to be added
+     * @throws IOException if the new identity cannot be written
+     */
+    public void addServerGroup(final ServerGroup group) throws IOException {
+        final ServerGroupWriter writer = new ServerGroupWriter(
+                Identity.buildIdentity(group.getName(), "servergroup"));
+        group.setModified(true);
+        addServerGroup(group, writer);
+    }
+
+    /**
+     * Saves all entries in this list.
+     */
+    public void save() {
+        for (Map.Entry<ServerGroup, ServerGroupWriter> pair : groups.entrySet()) {
+            if (pair.getKey().isModified()) {
+                pair.getValue().write(pair.getKey());
+            }
+        }
+    }
+
+    /**
+     * Saves the specified group.
+     *
+     * @param group The group to be saved
+     */
+    @Precondition("Specified group is a known top-level group in this list")
+    public void save(final ServerGroup group) {
+        groups.get(group).write(group);
+    }
+
+    /**
+     * Retrieves a list of all known server groups.
+     *
+     * @return An immutable list of server groups.
+     */
+    public Collection<ServerGroup> getServerGroups() {
+        return Collections.unmodifiableCollection(groups.keySet());
+    }
+
+    /**
+     * Retrieves a ServerGroup with the specified name, if one exists. This
+     * method ignores the case of group's name when comparing.
+     *
+     * @param name The name of the group to be retrieved
+     * @return A correspondingly named server group, or null if none exists
+     */
+    public ServerGroup getGroupByName(final String name) {
+        for (ServerGroup group : getServerGroups()) {
+            if (group.getName().equalsIgnoreCase(name)) {
+                return group;
+            }
+        }
+
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void identityAdded(final Identity identity) {
+        try {
+            final ServerGroupReader reader = new ServerGroupReader(identity);
+            addServerGroup(reader.read(), reader.getWriter());
+        } catch (IllegalArgumentException ex) {
+            // Silently ignore
+            // TODO: Raise error if the identity isn't a server group being
+            //       currently added by addServerGroup()
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void identityRemoved(final Identity identity) {
+        // TODO: Remove server group
+    }
+
+}

src/com/dmdirc/addons/serverlists/ServerListPlugin.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists;
+
+import com.dmdirc.plugins.Plugin;
+
+
+/**
+ * Dummy plugin for server lists.
+ *
+ * @author chris
+ */
+public class ServerListPlugin extends Plugin {
+
+    /** {@inheritDoc} */
+    @Override
+    public void onLoad() {
+        // Do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onUnload() {
+        // Do nothing
+    }
+
+}

src/com/dmdirc/addons/serverlists/io/ServerEntryReader.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists.io;
+
+import com.dmdirc.config.Identity;
+import com.dmdirc.addons.serverlists.ServerEntry;
+import com.dmdirc.addons.serverlists.ServerGroup;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * Facilitates loading of a {@link ServerEntry} from a DMDirc {@link Identity}.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerEntryReader {
+
+    /** The identity to read entries from. */
+    private final Identity identity;
+
+    /**
+     * Creates a new Server Entry Reader which will read from the specified
+     * identity.
+     *
+     * @param identity The identity which defines our server entries
+     */
+    public ServerEntryReader(final Identity identity) {
+        this.identity = identity;
+    }
+
+    /**
+     * Attempts to read the details of the specified server from this reader's
+     * identity.
+     *
+     * @param group The group that owns this server
+     * @param name The name of the server to be read
+     * @return A corresponding ServerEntry
+     * @throws URISyntaxException If the server doesn't specify a valid URI
+     * @throws IllegalArgumentException If the server doesn't define a name or address
+     */
+    public ServerEntry read(final ServerGroup group, final String name) throws URISyntaxException,
+            IllegalArgumentException {
+        if (!identity.hasOptionString(name, "name")
+                || !identity.hasOptionString(name, "address")) {
+            throw new IllegalArgumentException("Server does not specify name or address: "
+                    + name);
+        }
+
+        final String serverName = identity.getOption(name, "name");
+        final URI serverURI = new URI(identity.getOption(name, "address"));
+
+        return new ServerEntry(group, serverName, serverURI, null);
+    }
+
+}

src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists.io;
+
+import com.dmdirc.config.Identity;
+import com.dmdirc.addons.serverlists.ServerGroup;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+
+/**
+ * Facilitates loading of a {@link ServerGroup} from a DMDirc {@link Identity}.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerGroupReader {
+
+    /** The identity this reader should read from. */
+    private final Identity identity;
+
+    /** The reader we'll use for individual servers. */
+    private final ServerEntryReader entryReader;
+
+    /**
+     * Creates a new ServerGroupReader that will read from the specified
+     * identity.
+     *
+     * @param identity The identity describing the server group
+     */
+    public ServerGroupReader(final Identity identity) {
+        this.identity = identity;
+        this.entryReader = new ServerEntryReader(identity);
+    }
+
+    /**
+     * Reads the default server group from this reader's identity.
+     *
+     * @see #read(java.lang.String)
+     * @return A ServerGroup corresponding to the identity's default group
+     * @throws IllegalArgumentException If the identity doesn't define a group
+     */
+    public ServerGroup read() {
+        if (identity.hasOptionString("identity", "name")) {
+            return read(null, identity.getOption("identity", "name"));
+        }
+
+        throw new IllegalArgumentException("Identity has no name");
+    }
+
+    /**
+     * Reads a named server group from this reader's identity.
+     *
+     * @param parent The parent of the group being read
+     * @param name The name of the server group to read
+     * @return A corresponding ServerGroup
+     * @throws IllegalArgumentException If the server group doesn't define a name
+     */
+    public ServerGroup read(final ServerGroup parent, final String name)
+            throws IllegalArgumentException {
+        if (!identity.hasOptionString(name, "name")) {
+            throw new IllegalArgumentException("ServerGroup '" + name + "' not defined");
+        }
+
+        final ServerGroup group = new ServerGroup(parent,
+                identity.getOption(name, "name"));
+
+        if (identity.hasOptionString(name, "description")) {
+            group.setDescription(identity.getOption(name, "description"));
+        }
+
+        if (identity.hasOptionString(name, "links")) {
+            readLinks(group, identity.getOption(name, "links"));
+        }
+
+        for (String item : identity.getOptionList(name, "contents", true)) {
+            if (item.endsWith(" servergroup")) {
+                try {
+                    group.addItem(read(group, item));
+                } catch (IllegalArgumentException ex) {
+                    // TODO: Raise an error about malformed group
+                }
+            } else if (item.endsWith(" server")) {
+                try {
+                    group.addItem(entryReader.read(group, item));
+                } catch (URISyntaxException ex) {
+                    // TODO: Raise an error about malformed server
+                } catch (IllegalArgumentException ex) {
+                    // TODO: Raise an error about malformed server
+                }
+            }
+
+            // TODO: Raise an error about unknown content?
+        }
+
+        return group;
+    }
+
+    /**
+     * Reads a set of links from the named domain and adds them to the specified
+     * group.
+     *
+     * @param group The group to add links to
+     * @param domain The domain in the identity containing links
+     */
+    private void readLinks(final ServerGroup group, final String domain) {
+        for (Map.Entry<String, String> entry : identity.getOptions(domain).entrySet()) {
+            try {
+                group.addLink(entry.getKey(), new URI(entry.getValue()));
+            } catch (URISyntaxException ex) {
+                // TODO: Raise an error about illegal URI?
+            }
+        }
+    }
+
+    /**
+     * Returns a writer which may be used to write updated data.
+     *
+     * @return An appropriately configured {@link ServerGroupWriter}
+     */
+    public ServerGroupWriter getWriter() {
+        return new ServerGroupWriter(identity);
+    }
+
+}

src/com/dmdirc/addons/serverlists/io/ServerGroupWriter.java

@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists.io;
+
+import com.dmdirc.config.Identity;
+import com.dmdirc.addons.serverlists.ServerEntry;
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Provides methods to instantiate a writer for a server group or entry.
+ *
+ * @since 0.6.4
+ * @author chris
+ */
+public class ServerGroupWriter {
+
+    /** The identity which will be written to. */
+    private final Identity identity;
+
+    /**
+     * Creates a new writer which will write to the specified identity.
+     *
+     * @param identity The identity to write the server group to
+     */
+    public ServerGroupWriter(final Identity identity) {
+        this.identity = identity;
+    }
+
+    /**
+     * Writes the specified server group and all of its children to this
+     * writer's identity.
+     *
+     * @param group The group to be written
+     */
+    public void write(final ServerGroup group) {
+        final Set<String> sections = identity.getDomains();
+
+        identity.setOption("identity", "name", group.getName() + " servergroup");
+
+        writeGroup(group, sections);
+
+        for (String missing : sections) {
+            for (String setting : identity.getOptions(missing).keySet()) {
+                identity.unsetOption(missing, setting);
+            }
+        }
+    }
+
+    /**
+     * Appends the specified group to this writer's identity. Any keysections
+     * that are used will be removed from the sections set, so callers can
+     * track which sections in the identity have not been used.
+     *
+     * @param group The group to be written
+     * @param sections A set of sections from which any new keysections
+     * should be removed
+     */
+    protected void writeGroup(final ServerGroup group, final Set<String> sections) {
+        final String domain = group.getName() + " servergroup";
+
+        final List<String> children = new ArrayList<String>();
+
+        for (ServerGroupItem item : group.getItems()) {
+            if (item instanceof ServerGroup) {
+                writeGroup((ServerGroup) item, sections);
+                children.add(item.getName() + " servergroup");
+            } else if (item instanceof ServerEntry) {
+                writeEntry((ServerEntry) item, sections);
+                children.add(item.getName() + " server");
+            }
+        }
+
+        final boolean needsUpdating = group.isModified();
+        sections.remove(domain);
+        group.setModified(false);
+
+        if (!needsUpdating) {
+            return;
+        }
+
+        if (!group.getLinks().isEmpty()) {
+            writeLinks(group.getName(), group.getLinks());
+            sections.remove(group + " links");
+        }
+
+        if (group.getNetwork() == null) {
+            identity.unsetOption(domain, "network");
+        } else {
+            identity.setOption(domain, "network", group.getNetwork());
+        }
+
+        identity.setOption(domain, "description", group.getDescription());
+        identity.setOption(domain, "contents", children);
+        identity.setOption(domain, "name", group.getName());
+    }
+
+    /**
+     * Writes a map of links for the specified entry.
+     *
+     * @param name The name of the entry for which to write the links
+     * @param links The links to be written
+     */
+    protected void writeLinks(final String name, final Map<String, URI> links) {
+        final String domain = name + " links";
+        final Set<String> existing = identity.getOptions(domain).keySet();
+        existing.removeAll(links.keySet());
+
+        for (String deleted : existing) {
+            identity.unsetOption(domain, deleted);
+        }
+
+        for (Map.Entry<String, URI> link : links.entrySet()) {
+            identity.setOption(domain, link.getKey(), link.getValue().toString());
+        }
+    }
+
+    /**
+     * Writes the specified entry to this writer's identity. Any keysections
+     * that are used will be removed from the sections set, so callers can
+     * track which sections in the identity have not been used.
+     *
+     * @param entry The entry to be written
+     * @param sections A set of sections from which any new keysections
+     * should be removed
+     */
+    protected void writeEntry(final ServerEntry entry, final Set<String> sections) {
+        final String domain = entry.getName() + " server";
+        final boolean needsUpdating = entry.isModified();
+
+        sections.remove(domain);
+        entry.setModified(false);
+
+        if (!needsUpdating) {
+            return;
+        }
+
+        identity.setOption(domain, "name", entry.getName());
+        identity.setOption(domain, "address", entry.getAddress().toString());
+    }
+
+}

src/com/dmdirc/addons/serverlists/plugin.config

@@ -0,0 +1,28 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+
+metadata:
+  author=Chris <chris@dmdirc.com>
+  mainclass=com.dmdirc.addons.serverlists.ServerListPlugin
+  description=Support for server lists
+  name=serverlists
+  nicename=Server List Support
+
+updates:
+  id=59
+
+version:
+  friendly=0.5
+
+provides:
+  serverlist feature
+
+persistent:
+  *

src/com/dmdirc/addons/serverlists/service/ServerListServiceProvider.java

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.serverlists.service;
+
+import com.dmdirc.ParserFactory;
+import com.dmdirc.parser.common.MyInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.ExportedService;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.Service;
+import com.dmdirc.plugins.ServiceProvider;
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerList;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Provides a fake parser service which handles <code>serverlist://</code> URIs,
+ * and returns a suitable parser for the corresponding server list.
+ *
+ * @author chris
+ * @since 0.6.4
+ */
+public class ServerListServiceProvider implements ServiceProvider {
+
+    /** The server list that we're providing for. */
+    private final ServerList serverList;
+
+    /** The services that this provider providers. */
+    private final List<Service> services;
+
+    /**
+     * Creates a new server list service provider.
+     *
+     * @param serverList The {@link ServerList} to retrieve items from
+     */
+    public ServerListServiceProvider(final ServerList serverList) {
+        this.serverList = serverList;
+        this.services = Arrays.asList(new Service[] {
+           PluginManager.getPluginManager().getService("parser", "serverlist", true)
+        });
+    }
+
+    /**
+     * Registers this service provider.
+     */
+    public void register() {
+        for (Service service : services) {
+            service.addProvider(this);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isActive() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void activateServices() {
+        // Do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public List<Service> getServices() {
+        return services;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getProviderName() {
+        return "Serverlist service provider";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ExportedService getExportedService(final String name) {
+        if ("getParser".equals(name)) {
+            return new ExportedService(ServerListServiceProvider.class, "getParser", this);
+        } else {
+            return new ExportedService(null, null);
+        }
+    }
+
+    /**
+     * Retrieves a parser for the specified details.
+     *
+     * @param myInfo The user-supplied client identification information
+     * @param address The address to connect to (a serverlist:// URI)
+     * @return A corresponding Parser instance, or null if none applicable
+     */
+    public Parser getParser(final MyInfo myInfo, final URI address) {
+        ServerGroup group = serverList.getGroupByName(address.getHost());
+
+        if (address.getPath() != null && !address.getPath().isEmpty()) {
+            for (String part : address.getPath().split("/")) {
+                if (part.isEmpty()) {
+                    continue;
+                }
+
+                final ServerGroupItem item = group.getItemByName(part);
+
+                if (item == null) {
+                    return null;
+                } else if (item instanceof ServerGroup) {
+                    group = (ServerGroup) item;
+                } else {
+                    return getParserForItem(myInfo, item);
+                }
+            }
+        }
+
+        return getParserForItem(myInfo, group);
+    }
+
+    /**
+     * Retrieves a parser for the specified item.
+     *
+     * @param myInfo The user-supplied client identification information
+     * @param item The item to retrieve a URI from
+     * @return A corresponding parser instance
+     */
+    protected Parser getParserForItem(final MyInfo myInfo, final ServerGroupItem item) {
+        return new ParserFactory().getParser(myInfo, item.getAddress());
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/renderers/ServerGroupTreeRenderer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.awt.Color;
 import java.awt.Component;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddEntryInputDialog.java

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.URIValidator;
 import com.dmdirc.config.prefs.validator.Validator;
-import com.dmdirc.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroup;
 
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddGroupInputDialog.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.Validator;
-import com.dmdirc.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroup;
 
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Info.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.net.URI;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Perform.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Profiles.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.util.HashMap;
 import java.util.List;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListDialog.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.components.LockedLayer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.awt.Window;
 import java.awt.color.ColorSpace;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListListener.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 /**
  * Server list listener.

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListModel.java

@@ -26,10 +26,10 @@ import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.actions.wrappers.PerformType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.serverlists.ServerEntry;
-import com.dmdirc.serverlists.ServerGroup;
-import com.dmdirc.serverlists.ServerGroupItem;
-import com.dmdirc.serverlists.ServerList;
+import com.dmdirc.addons.serverlists.ServerEntry;
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerList;
 import com.dmdirc.util.ListenerList;
 
 import java.io.IOException;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Settings.java

@@ -25,8 +25,8 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.serverlists.ServerGroup;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Tree.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.renderers.ServerGroupTreeRenderer;
-import com.dmdirc.serverlists.ServerGroupItem;
+import com.dmdirc.addons.serverlists.ServerGroupItem;
 
 import java.awt.Rectangle;
 import java.awt.Window;