Merge pull request #125 from greboid/master

"Remove server lists.  They're half arsed and broken"

serverlistdialog/build.gradle

@@ -1,4 +0,0 @@
-dependencies {
-  compile plugin('ui_swing')
-  compile plugin('serverlists')
-}

serverlistdialog/plugin.config

@@ -1,26 +0,0 @@
-# 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
-  requires
-
-metadata:
-  author=Greg <greg@dmdirc.com>
-  mainclass=com.dmdirc.addons.serverlistdialog.ServerListDialogPlugin
-  description=Support for server lists
-  name=serverlistdialog
-  nicename=Server List Dialog
-
-updates:
-  id=74
-
-version:
-  friendly=0.2
-
-requires:
-  parent=ui_swing

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/AddEntryInputDialog.java

@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.NotEmptyValidator;
-import com.dmdirc.util.validators.URIValidator;
-import com.dmdirc.util.validators.Validator;
-
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.net.URI;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JTree;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Standard input dialog.
- */
-public class AddEntryInputDialog extends StandardDialog {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Entry name Validator. */
-    private final Validator<String> entryValidator;
-    /** URI Validator. */
-    private final Validator<String> uriValidator;
-    /** Group name. */
-    private ValidatingJTextField entryName;
-    /** Network name. */
-    private ValidatingJTextField uri;
-    /** Blurb label. */
-    private TextLabel blurb;
-    /** Message. */
-    private final String message;
-    /** Parent tree. */
-    private final JTree items;
-    /** Parent model. */
-    private final ServerListModel model;
-
-    /**
-     * Instantiates a new standard input dialog.
-     *
-     * @param iconManager Icon Manager
-     * @param items       Parent tree
-     * @param owner       Dialog owner
-     * @param model       Server list model
-     */
-    public AddEntryInputDialog(final IconManager iconManager,
-            final Window owner, final JTree items,
-            final ServerListModel model) {
-        super(owner, ModalityType.MODELESS);
-
-        this.items = items;
-        this.model = model;
-        this.entryValidator = new NotEmptyValidator();
-        this.uriValidator = new URIValidator();
-        this.message = "Please fill in the entry name and its address";
-
-        setTitle("Add new server entry");
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
-
-        initComponents(iconManager);
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Called when the dialog's OK button is clicked.
-     *
-     * @return whether the dialog can close
-     */
-    public boolean save() {
-        DefaultMutableTreeNode groupNode = (DefaultMutableTreeNode) items.
-                getSelectionPath().getLastPathComponent();
-        while (!((groupNode.getUserObject()) instanceof ServerGroup)) {
-            groupNode = (DefaultMutableTreeNode) groupNode.getParent();
-        }
-        model.addEntry((ServerGroup) groupNode.getUserObject(), getEntryName(),
-                URI.create(getURI()));
-        return true;
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents(final IconManager iconManager) {
-        orderButtons(new JButton(), new JButton());
-        entryName = new ValidatingJTextField(iconManager, entryValidator);
-        uri = new URIJTextField(iconManager, "", uriValidator);
-        blurb = new TextLabel(message);
-        validateText();
-    }
-
-    /**
-     * Adds the listeners.
-     */
-    private void addListeners() {
-        getOkButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                if (save()) {
-                    dispose();
-                }
-            }
-        });
-        getCancelButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                dispose();
-            }
-        });
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowOpened(final WindowEvent e) {
-                entryName.requestFocusInWindow();
-            }
-
-            @Override
-            public void windowClosed(final WindowEvent e) {
-                //Ignore
-            }
-        });
-        final DocumentListener dl = new DocumentListener() {
-
-            @Override
-            public void insertUpdate(final DocumentEvent e) {
-                validateText();
-            }
-
-            @Override
-            public void removeUpdate(final DocumentEvent e) {
-                validateText();
-            }
-
-            @Override
-            public void changedUpdate(final DocumentEvent e) {
-                //Ignore
-            }
-        };
-        entryName.getDocument().addDocumentListener(dl);
-        uri.getDocument().addDocumentListener(dl);
-    }
-
-    @Override
-    public boolean enterPressed() {
-        executeAction(getOkButton());
-        return true;
-    }
-
-    /**
-     * Validates the change.
-     */
-    private void validateText() {
-        getOkButton().setEnabled(!entryValidator.validate(getEntryName())
-                .isFailure() && !uriValidator.validate(getURI()).isFailure());
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 2"));
-
-        add(blurb, "growx, spanx 2");
-        add(new JLabel("Item name: "));
-        add(entryName, "growx");
-        add(new JLabel("Server URI: "));
-        add(uri, "growx");
-        add(getLeftButton(), "split 3, skip, right");
-        add(getRightButton(), "right");
-    }
-
-    /**
-     * Returns the text in the entry name.
-     *
-     * @return Entry name
-     */
-    public String getEntryName() {
-        return entryName.getText();
-    }
-
-    /**
-     * Returns the URI in the URI field.
-     *
-     * @return server URI
-     */
-    public String getURI() {
-        return uri.getText();
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/AddGroupInputDialog.java

@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.NotEmptyValidator;
-import com.dmdirc.util.validators.Validator;
-
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.JTree;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Standard input dialog.
- */
-public class AddGroupInputDialog extends StandardDialog {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Validator. */
-    private final Validator<String> validator;
-    /** Group name. */
-    private ValidatingJTextField groupName;
-    /** Network name. */
-    private JTextField networkName;
-    /** Blurb label. */
-    private TextLabel blurb;
-    /** Message. */
-    private final String message;
-    /** Parent tree. */
-    private final JTree tree;
-    /** Parent model. */
-    private final ServerListModel serverListModel;
-
-    /**
-     * Instantiates a new standard input dialog.
-     *
-     * @param iconManager Icon manager
-     * @param items       Parent tree
-     * @param owner       Dialog owner
-     * @param model       Server list model
-     */
-    public AddGroupInputDialog(final IconManager iconManager,
-            final Window owner, final JTree items,
-            final ServerListModel model) {
-        super(owner, ModalityType.MODELESS);
-
-        this.tree = items;
-        this.serverListModel = model;
-        this.validator = new NotEmptyValidator();
-        this.message = "Please fill in the group name and its network name";
-
-        setTitle("Add new server group");
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
-
-        initComponents(iconManager);
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Called when the dialog's OK button is clicked.
-     *
-     * @return whether the dialog can close
-     */
-    public boolean save() {
-        DefaultMutableTreeNode groupNode = (DefaultMutableTreeNode) tree.
-                getSelectionPath().getLastPathComponent();
-        if (groupNode == null) {
-            groupNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
-        } else {
-            while (!((groupNode.getUserObject()) instanceof ServerGroup)) {
-                if (groupNode.getParent() == null) {
-                    groupNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
-                    break;
-                } else {
-                    groupNode = (DefaultMutableTreeNode) groupNode.getParent();
-                }
-            }
-        }
-        if (groupNode == tree.getModel().getRoot()) {
-            serverListModel.addGroup(null, getGroupName(), getNetworkName());
-        } else {
-            serverListModel.addGroup((ServerGroup) groupNode.getUserObject(),
-                    getGroupName(), getNetworkName());
-        }
-        return true;
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents(final IconManager iconManager) {
-        orderButtons(new JButton(), new JButton());
-        groupName = new ValidatingJTextField(iconManager, validator);
-        networkName = new JTextField();
-        blurb = new TextLabel(message);
-        validateText();
-    }
-
-    /**
-     * Adds the listeners.
-     */
-    private void addListeners() {
-        getOkButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                if (save()) {
-                    dispose();
-                }
-            }
-        });
-        getCancelButton().addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                dispose();
-            }
-        });
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowOpened(final WindowEvent e) {
-                groupName.requestFocusInWindow();
-            }
-
-            @Override
-            public void windowClosed(final WindowEvent e) {
-                //Ignore
-            }
-        });
-        groupName.getDocument().addDocumentListener(new DocumentListener() {
-
-            @Override
-            public void insertUpdate(final DocumentEvent e) {
-                validateText();
-            }
-
-            @Override
-            public void removeUpdate(final DocumentEvent e) {
-                validateText();
-            }
-
-            @Override
-            public void changedUpdate(final DocumentEvent e) {
-                //Ignore
-            }
-        });
-    }
-
-    @Override
-    public boolean enterPressed() {
-        executeAction(getOkButton());
-        return true;
-    }
-
-    /**
-     * Validates the change.
-     */
-    private void validateText() {
-        getOkButton().setEnabled(!validator.validate(getGroupName())
-                .isFailure());
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 2"));
-
-        add(blurb, "growx, spanx 2");
-        add(new JLabel("Group name: "));
-        add(groupName, "growx");
-        add(new JLabel("Network name: "));
-        add(networkName, "growx");
-        add(getLeftButton(), "split 3, skip, right");
-        add(getRightButton(), "right");
-    }
-
-    /**
-     * Returns the text in the group name.
-     *
-     * @return Group name
-     */
-    public String getGroupName() {
-        return groupName.getText();
-    }
-
-    /**
-     * Returns the text in the network name.
-     *
-     * @return Network name
-     */
-    public String getNetworkName() {
-        return networkName.getText();
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Help.java

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Introductory panel for the Server list dialog.
- */
-public class Help extends JPanel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 2;
-
-    /**
-     * Creates a new help panel.
-     */
-    public Help() {
-        setLayout(new MigLayout("fill"));
-        add(new TextLabel("Please select an item from the left to start "
-                + "editing options and settings."), "grow, pushy");
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Info.java

@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.ui.core.util.URLHandler;
-
-import java.net.URI;
-import java.util.Map.Entry;
-
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkEvent.EventType;
-import javax.swing.event.HyperlinkListener;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Panel for showing server group item information.
- */
-public class Info extends JPanel implements HyperlinkListener,
-        ServerListListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 2;
-    /** Info pane. */
-    private final TextLabel infoLabel;
-    /** Link label. */
-    private final TextLabel linkLabel;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Info scroll panel. */
-    private final JScrollPane sp;
-    /** URL Handler to use to open links. */
-    private final URLHandler urlHandler;
-
-    /**
-     * Creates a new info panel.
-     *
-     * @param model      Model to pull information from
-     * @param urlHandler A {@link URLHandler} to use to open links
-     */
-    public Info(final ServerListModel model, final URLHandler urlHandler) {
-
-        this.urlHandler = urlHandler;
-        this.model = model;
-
-        infoLabel = new TextLabel();
-        linkLabel = new TextLabel();
-        sp = new JScrollPane(infoLabel);
-
-        setLayout(new MigLayout("fill, ins 0"));
-        add(sp, "grow, push");
-        add(linkLabel, "grow");
-
-        addListeners();
-        serverGroupChanged(model.getSelectedItem());
-    }
-
-    /**
-     * Adds required listeners.
-     */
-    private void addListeners() {
-        linkLabel.addHyperlinkListener(this);
-        model.addServerListListener(this);
-    }
-
-    @Override
-    public void hyperlinkUpdate(final HyperlinkEvent e) {
-        if (e.getEventType() == EventType.ACTIVATED) {
-            urlHandler.launchApp(e.getURL());
-        }
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        setVisible(false);
-        infoLabel.setVisible(false);
-        linkLabel.setVisible(false);
-        if (item == null) {
-            infoLabel.setText("");
-            linkLabel.setText("");
-        } else {
-            final StringBuilder sb = new StringBuilder();
-            sb.append("<html><b>");
-            sb.append(item.getPath());
-            sb.append("</b><br>");
-            if (item.getGroup() == null) {
-                sb.append("");
-            } else {
-                sb.append(item.getGroup().getDescription());
-            }
-            sb.append("</html>");
-            infoLabel.setText(sb.toString());
-            sb.setLength(0);
-            for (Entry<String, URI> entry : item.getGroup().getLinks()
-                    .entrySet()) {
-                if (sb.length() != 0) {
-                    sb.append("<br>");
-                }
-                sb.append("<a href=\"");
-                sb.append(entry.getValue().toString());
-                sb.append("\">");
-                sb.append(entry.getKey());
-                sb.append("</a>");
-            }
-            linkLabel.setText(sb.toString());
-        }
-        UIUtilities.resetScrollPane(sp);
-        infoLabel.setVisible(true);
-        linkLabel.setVisible(true);
-        setVisible(true);
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Perform.java

@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Panel to show and edit performs for a server group.
- */
-public class Perform extends JPanel implements ServerListListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2;
-    /** Perform panel. */
-    private final PerformPanel performPanel;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Platform border. */
-    private final Border border;
-
-    /**
-     * Creates a new perform panel backed by the specified model.
-     *
-     * @param iconManager  Icon Manager
-     * @param globalConfig Global configuration
-     * @param wrapper      Perform wrapper to read/write performs to.
-     * @param model        Backing model
-     */
-    public Perform(
-            final IconManager iconManager,
-            final AggregateConfigProvider globalConfig,
-            final PerformWrapper wrapper,
-            final ServerListModel model,
-            final ColourManagerFactory colourManagerFactory) {
-
-        this.model = model;
-        performPanel = new PerformPanel(iconManager, colourManagerFactory, globalConfig, wrapper);
-
-        addListeners();
-        if (model.getSelectedItemPerformDescription() != null) {
-            performPanel.switchPerform(model
-                    .getSelectedItemPerformDescription());
-        }
-
-        border = UIManager.getBorder("TitledBorder.border");
-        setBorder(BorderFactory.createTitledBorder(border, "Network perform"));
-        setLayout(new MigLayout("fill"));
-        add(performPanel, "grow");
-    }
-
-    /**
-     * Adds required listeners.
-     */
-    private void addListeners() {
-        model.addServerListListener(this);
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        if (item == null) {
-            performPanel.switchPerform(null);
-            return;
-        }
-        if (item.getGroup() == item) {
-            setBorder(BorderFactory.createTitledBorder(border,
-                    "Network perform"));
-        } else {
-            setBorder(BorderFactory.createTitledBorder(border,
-                    "Server perform"));
-        }
-        performPanel.switchPerform(model.getSelectedItemPerformDescription());
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        if (save) {
-            performPanel.savePerform();
-        }
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Profiles.java

@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Profile selection field for an associated server group item.
- */
-public class Profiles extends JPanel implements ServerListListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Combo boxes. */
-    private final Map<ServerGroupItem, JComboBox<ConfigProvider>> combos = new HashMap<>();
-    /** Info label. */
-    private final JLabel label;
-    /** Controller to use to get profiles. */
-    private final IdentityController identityController;
-
-    /**
-     * Creates a new profile panel backed by the specified model.
-     *
-     * @param model              Backing server list model
-     * @param identityController Controller to use to get profiles.
-     */
-    public Profiles(final ServerListModel model, final IdentityController identityController) {
-
-        this.model = model;
-        this.identityController = identityController;
-
-        label = new JLabel("Use this profile on this network: ");
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Default profile"));
-        addListeners();
-
-        setLayout(new MigLayout("fill"));
-        add(label);
-        add(getComboBox(model.getSelectedItem()), "grow, push");
-    }
-
-    /**
-     * Adds required listeners.
-     */
-    private void addListeners() {
-        model.addServerListListener(this);
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        setVisible(false);
-        removeAll();
-        add(label);
-        add(getComboBox(item), "grow, push");
-        setVisible(true);
-    }
-
-    /**
-     * Gets or creates a combo box for selecting performs for the specified server group item.
-     *
-     * @param item Server group item requiring the profile selection
-     *
-     * @return The server group item's associated profile selection box
-     */
-    private JComboBox<ConfigProvider> getComboBox(final ServerGroupItem item) {
-        if (!combos.containsKey(item)) {
-            final DefaultComboBoxModel<ConfigProvider> comboModel = new VetoableComboBoxModel<>();
-
-            ConfigProvider selectedItem = null;
-            comboModel.addElement(null);
-            for (ConfigProvider profile : identityController.getProvidersByType("profile")) {
-                comboModel.addElement(profile);
-                if (item != null && profile.getName().equals(
-                        item.getProfile())) {
-                    selectedItem = profile;
-                }
-            }
-            comboModel.setSelectedItem(selectedItem);
-            combos.put(item, new JComboBox<>(comboModel));
-        }
-        return combos.get(item);
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        if (save) {
-            for (Entry<ServerGroupItem, JComboBox<ConfigProvider>> entry : combos.entrySet()) {
-                if (entry.getKey() != null) {
-                    if (entry.getValue().getSelectedItem() == null) {
-                        entry.getKey().setProfile(null);
-                    } else {
-                        entry.getKey().setProfile(((ConfigProvider) entry.getValue().
-                                getSelectedItem()).getName());
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerGroupTreeRenderer.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-
-import java.awt.Color;
-import java.awt.Component;
-
-import javax.swing.JLabel;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
-
-/**
- * Renders a server group item in a tree.
- */
-public class ServerGroupTreeRenderer extends DefaultTreeCellRenderer {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    @Override
-    public Component getTreeCellRendererComponent(final JTree tree,
-            final Object value, final boolean sel, final boolean expanded,
-            final boolean leaf, final int row, final boolean hasFocus) {
-        final JLabel label = (JLabel) super.getTreeCellRendererComponent(tree,
-                value, sel, expanded, leaf, row, hasFocus);
-        label.setIcon(null);
-        label.setOpaque(false);
-        if (((DefaultMutableTreeNode) value).getUserObject() instanceof ServerGroupItem) {
-            setText(((ServerGroupItem) ((DefaultMutableTreeNode) value).
-                    getUserObject()).getName());
-        } else {
-            setText(((DefaultMutableTreeNode) value).getUserObject()
-                    .toString());
-        }
-        return label;
-    }
-
-    @Override
-    public Color getBackgroundNonSelectionColor() {
-        return null;
-    }
-
-    @Override
-    public Color getBackground() {
-        return null;
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListController.java

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.swing.JMenuItem;
-
-/**
- * Handles registering of the server list menu items, and creation of the server list dialog.
- */
-public class ServerListController {
-
-    private final Provider<ServerListDialog> dialogProvider;
-    private final MenuBar menuBar;
-
-    @Inject
-    public ServerListController(
-            final Provider<ServerListDialog> dialogProvider,
-            final MenuBar menuBar) {
-        this.dialogProvider = dialogProvider;
-        this.menuBar = menuBar;
-    }
-
-    /**
-     * Adds the 'Server lists' menu item to the app's main menu.
-     */
-    public void addMenu() {
-        final JMenuItem item = new JMenuItem("Server lists");
-        item.setMnemonic('l');
-        item.addActionListener(new MenuActionListener());
-        menuBar.addMenuItem("Server", item);
-    }
-
-    /**
-     * Removes the 'Server lists' menu item from the app's main menu.
-     */
-    public void removeMenu() {
-        menuBar.removeMenuItem("Server", "Server lists");
-    }
-
-    /**
-     * Listener that gets and displays a server list dialog when an action is performed.
-     */
-    private class MenuActionListener implements ActionListener {
-
-        @Override
-        public void actionPerformed(final ActionEvent e) {
-            dialogProvider.get().display();
-        }
-
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.components.LockedLayer;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-
-import java.awt.Window;
-import java.awt.color.ColorSpace;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.ColorConvertOp;
-
-import javax.inject.Inject;
-import javax.swing.JButton;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.jdesktop.jxlayer.JXLayer;
-import org.jdesktop.jxlayer.plaf.effect.BufferedImageOpEffect;
-
-/**
- * Dialog to show and edit server lists.
- */
-public class ServerListDialog extends StandardDialog implements
-        ActionListener, ServerListListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Connect button. */
-    private final JButton connectButton;
-    /** Info lock. */
-    private final LockedLayer<Info> infoLock;
-    /** Perform lock. */
-    private final LockedLayer<Perform> performLock;
-    /** Profile lock. */
-    private final LockedLayer<Profiles> profileLock;
-    /** Settings lock. */
-    private final LockedLayer<Settings> settingsLock;
-    /** Info layer. */
-    private final JXLayer<Info> infoLayer;
-    /** Perform layer. */
-    private final JXLayer<Perform> performLayer;
-    /** Profile layer. */
-    private final JXLayer<Profiles> profileLayer;
-    /** Settings layer. */
-    private final JXLayer<Settings> settingsLayer;
-    /** Help panel. */
-    private final Help help;
-
-    /**
-     * Creates a new server list dialog.
-     *
-     * @param iconManager        Icon manager to get icons
-     * @param globalConfig       Global config to read settings from
-     * @param urlHandler         The URL Handler to use to handle clicked links
-     * @param performWrapper     The wrapper to use for the perform tab
-     * @param serverListModel    The model to use for the dialog.
-     * @param parentWindow       The window that owns this dialog.
-     * @param settingsPanel      The panel to use for settings.
-     * @param identityController Controller to use to get profiles.
-     */
-    @Inject
-    public ServerListDialog(
-            @GlobalConfig final IconManager iconManager,
-            @GlobalConfig final AggregateConfigProvider globalConfig,
-            final URLHandler urlHandler,
-            final PerformWrapper performWrapper,
-            final ServerListModel serverListModel,
-            @MainWindow final Window parentWindow,
-            final Settings settingsPanel,
-            final IdentityController identityController,
-            final ColourManagerFactory colourManagerFactory) {
-        super(parentWindow, ModalityType.MODELESS);
-
-        setTitle("Server List");
-        model = serverListModel;
-        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-
-        connectButton = new JButton("Connect");
-
-        profileLock = new LockedLayer<>(new BufferedImageOpEffect(
-                new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                        null)));
-        performLock = new LockedLayer<>(new BufferedImageOpEffect(
-                new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                        null)));
-        settingsLock = new LockedLayer<>(new BufferedImageOpEffect(
-                new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                        null)));
-        infoLock = new LockedLayer<>(new BufferedImageOpEffect(
-                new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
-                        null)));
-        profileLayer = new JXLayer<>(new Profiles(model, identityController), profileLock);
-        performLayer = new JXLayer<>(new Perform(iconManager, globalConfig, performWrapper, model,
-                colourManagerFactory),
-                performLock);
-        settingsLayer = new JXLayer<>(settingsPanel, settingsLock);
-        infoLayer = new JXLayer<>(new Info(model, urlHandler), infoLock);
-        help = new Help();
-        lockLayers();
-
-        setLayout(new MigLayout("fill, wrap 2, wmin 600, wmax 600"));
-
-        add(new Tree(iconManager, model, this),
-                "grow, spany 4, wmax 150, wmin 150");
-        add(help, "pos 160 0.5al");
-        add(infoLayer, "growx, pushx");
-        add(settingsLayer, "grow, push, gaptop unrel, gapbottom unrel");
-        add(performLayer, "grow, push");
-        add(profileLayer, "growx, pushx");
-        add(connectButton, "skip 1, split 3, right, gapright unrel*2, "
-                + "sgx button");
-        add(getLeftButton(), "right, sgx button");
-        add(getRightButton(), "right, sgx button");
-
-        addListeners();
-    }
-
-    /**
-     * Adds requires listeners to objects.
-     */
-    private void addListeners() {
-        model.addServerListListener(this);
-        connectButton.addActionListener(this);
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == getOkButton()) {
-            model.dialogClosed(true);
-            dispose();
-        } else if (e.getSource() == getCancelButton()) {
-            model.dialogClosed(false);
-            dispose();
-        } else if (e.getSource() == connectButton) {
-            model.getSelectedItem().connect();
-        }
-    }
-
-    /**
-     * Lock or unlock layers.
-     */
-    private void lockLayers() {
-        final boolean lock = !model.hasItems()
-                || model.getSelectedItem() == null;
-        performLock.setLocked(lock);
-        settingsLock.setLocked(lock);
-        infoLock.setLocked(lock);
-        profileLock.setLocked(lock);
-        connectButton.setEnabled(!lock);
-        performLayer.setVisible(!lock);
-        settingsLayer.setVisible(!lock);
-        infoLayer.setVisible(!lock);
-        profileLayer.setVisible(!lock);
-        help.setVisible(lock);
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        lockLayers();
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        if (save) {
-            model.save();
-        }
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        lockLayers();
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        lockLayers();
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListDialogPlugin.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.implementations.BasePlugin;
-
-import dagger.ObjectGraph;
-
-/**
- * Server list dialog plugin.
- */
-public class ServerListDialogPlugin extends BasePlugin {
-
-    /** Controller that manages the server list. */
-    private ServerListController controller;
-
-    @Override
-    public void onUnload() {
-        super.onUnload();
-
-        controller.removeMenu();
-    }
-
-    @Override
-    public void onLoad() {
-        controller.addMenu();
-    }
-
-    @Override
-    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
-        super.load(pluginInfo, graph);
-        setObjectGraph(graph.plus(new ServerListModule()));
-
-        controller = getObjectGraph().get(ServerListController.class);
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListListener.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-
-/**
- * Server list listener.
- */
-public interface ServerListListener {
-
-    /**
-     * Called to indicate the selected server group has changed.
-     *
-     * @param item Currently selected item
-     */
-    void serverGroupChanged(ServerGroupItem item);
-
-    /**
-     * Called to indicate the dialog has been closed.
-     *
-     * @param save Do we need to save changes
-     */
-    void dialogClosed(final boolean save);
-
-    /**
-     * Called to indicate a server group has been added.
-     *
-     * @param parent Parent group
-     * @param group  New group
-     */
-    void serverGroupAdded(ServerGroupItem parent, ServerGroupItem group);
-
-    /**
-     * Called to indicate a server group has been removed.
-     *
-     * @param parent Parent group
-     * @param group  Removed group
-     */
-    void serverGroupRemoved(ServerGroupItem parent, ServerGroupItem group);
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListModel.java

@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.actions.wrappers.PerformType;
-import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
-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.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.util.collections.ListenerList;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-
-/**
- * Model proxying requests from the core server list model to the swing ui.
- */
-public class ServerListModel {
-
-    /** Server list. */
-    private final ServerList list;
-    /** Listener list. */
-    private final ListenerList listeners;
-    /** Active server item. */
-    private ServerGroupItem activeItem;
-    /** ServerManager that ServerEntrys use to create servers */
-    private final ConnectionManager connectionManager;
-    /** The manager to retrieve settings from. */
-    private final ProfileManager profileManager;
-
-    /**
-     * Creates a new server list model.
-     *
-     * @param connectionManager  ServerManager currently in use.
-     * @param profileManager     The manager to retrieve settings from.
-     * @param serverList         The server list to use for the top-level entries.
-     */
-    @Inject
-    public ServerListModel(
-            final ConnectionManager connectionManager,
-            final ProfileManager profileManager,
-            final ServerList serverList) {
-        this.connectionManager = connectionManager;
-        this.profileManager = profileManager;
-        list = serverList;
-        listeners = new ListenerList();
-    }
-
-    /**
-     * Returns a populated tree model for this server list model.
-     *
-     * @return Populated tree model
-     */
-    public DefaultTreeModel getTreeModel() {
-        return populateModel(new DefaultTreeModel(
-                new DefaultMutableTreeNode("All Servers")));
-    }
-
-    /**
-     * Has this model got any groups?
-     *
-     * @return true iif there are server groups
-     */
-    public boolean hasItems() {
-        return !list.getServerGroups().isEmpty();
-    }
-
-    /**
-     * Populates a tree model for this server list model.
-     *
-     * @param model Un-populated tree model to populate
-     *
-     * @return Populated tree model
-     */
-    public DefaultTreeModel populateModel(final DefaultTreeModel model) {
-        for (ServerGroup group : list.getServerGroups()) {
-            final DefaultMutableTreeNode child = new DefaultMutableTreeNode(
-                    group);
-            model.insertNodeInto(child, (DefaultMutableTreeNode) model
-                    .getRoot(), model.getChildCount(model.getRoot()));
-            model.nodeStructureChanged((DefaultMutableTreeNode) model
-                    .getRoot());
-            addGroups(model, child, group.getItems());
-        }
-        return model;
-    }
-
-    /**
-     * Recursively adds groups to the specified tree model.
-     *
-     * @param model  Tree model
-     * @param parent Parent node to populate
-     * @param items  Items to add to parent node
-     */
-    private void addGroups(final DefaultTreeModel model,
-            final DefaultMutableTreeNode parent,
-            final List<ServerGroupItem> items) {
-        for (ServerGroupItem group : items) {
-            final DefaultMutableTreeNode child = new DefaultMutableTreeNode(
-                    group);
-            model.insertNodeInto(child, parent, model.getChildCount(parent));
-            if (group instanceof ServerGroup) {
-                addGroups(model, child, ((ServerGroup) group).getItems());
-            }
-        }
-    }
-
-    /**
-     * Adds a server list listener to be notified of changes.
-     *
-     * @param listener Listener to add
-     */
-    public void addServerListListener(final ServerListListener listener) {
-        listeners.add(ServerListListener.class, listener);
-    }
-
-    /**
-     * Sets the selected item in this model.
-     *
-     * @param item Newly selected item
-     */
-    public void setSelectedItem(final ServerGroupItem item) {
-        activeItem = item;
-        for (ServerListListener listener : listeners.get(
-                ServerListListener.class)) {
-            listener.serverGroupChanged(item);
-        }
-    }
-
-    /**
-     * Gets the perform description for the selected item.
-     *
-     * @return Perform description for the active sever group item
-     */
-    public PerformDescription getSelectedItemPerformDescription() {
-        final PerformDescription perform;
-        if (activeItem instanceof ServerEntry) {
-            perform = new PerformDescription(PerformType.SERVER, activeItem
-                    .getName());
-        } else if (activeItem instanceof ServerGroup
-                && ((ServerGroup) activeItem).getNetwork() != null) {
-            perform = new PerformDescription(PerformType.NETWORK,
-                    ((ServerGroup) activeItem).getNetwork());
-        } else {
-            perform = null;
-        }
-        return perform;
-    }
-
-    /**
-     * Gets the currently selected item.
-     *
-     * @return Currently selected item
-     */
-    public ServerGroupItem getSelectedItem() {
-        return activeItem;
-    }
-
-    /**
-     * Saves the changes.
-     *
-     * @param save Do we need to save changes
-     */
-    public void dialogClosed(final boolean save) {
-        for (ServerListListener listener : listeners.get(
-                ServerListListener.class)) {
-            listener.dialogClosed(save);
-        }
-    }
-
-    /**
-     * Adds a group to this model.
-     *
-     * @param parentGroup Parent group
-     * @param groupName   Group name (not null or empty)
-     * @param networkName Network name (may be null or empty)
-     */
-    public void addGroup(final ServerGroup parentGroup,
-            final String groupName, final String networkName) {
-        final ServerGroup sg = new ServerGroup(profileManager, groupName);
-        if (networkName != null && !networkName.isEmpty()) {
-            sg.setNetwork(networkName);
-        }
-        if (parentGroup == null) {
-            list.addServerGroup(sg);
-        } else {
-            parentGroup.addItem(sg);
-        }
-        for (ServerListListener listener : listeners.get(ServerListListener.class)) {
-            listener.serverGroupAdded(parentGroup, sg);
-        }
-    }
-
-    /**
-     * Adds a group to this model.
-     *
-     * @param parentGroup Parent group
-     * @param entryName   name (not null or empty)
-     * @param url         Valid URI
-     */
-    public void addEntry(final ServerGroup parentGroup, final String entryName,
-            final URI url) {
-        final ServerGroupItem sg = new ServerEntry(profileManager, connectionManager,
-                parentGroup, entryName, url, null);
-        parentGroup.addItem(sg);
-        for (ServerListListener listener : listeners.get(
-                ServerListListener.class)) {
-            listener.serverGroupAdded(parentGroup, sg);
-        }
-    }
-
-    /**
-     * Forces the server list to save all changes.
-     */
-    public void save() {
-        list.save();
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListModule.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.ui_swing.injection.SwingModule;
-
-import dagger.Module;
-
-/**
- * DI module for the server list plugin.
- */
-@Module(injects = {ServerListController.class}, addsTo = SwingModule.class)
-public class ServerListModule {
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Settings.java

@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
-import com.dmdirc.config.prefs.PreferencesManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.ui.IconManager;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.inject.Inject;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Panel for listing and adding settings to the group item.
- */
-public class Settings extends JPanel implements ServerListListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Settings panel. */
-    private final Map<ServerGroupItem, SettingsPanel> panels = new HashMap<>();
-    /** Platform border. */
-    private final Border border;
-    /** Manager to use to retrieve icons. */
-    private final IconManager iconManager;
-    /** Factory to use to produce preference components. */
-    private final PrefsComponentFactory componentFactory;
-    /** Factory to use to produce identities. */
-    private final IdentityFactory identityFactory;
-    /** Preferences Manager to retrieve settings from. */
-    private final PreferencesManager preferencesManager;
-
-    /**
-     * Instantiates a new settings panel.
-     *
-     * @param model              Backing model
-     * @param iconManager        Manager to use to retrieve icons.
-     * @param componentFactory   Factory to use to produce preference components.
-     * @param identityFactory    Factory to use to produce identities.
-     * @param preferencesManager Preferences Manager to retrieve settings from.
-     */
-    @Inject
-    public Settings(
-            final ServerListModel model,
-            @GlobalConfig final IconManager iconManager,
-            final PrefsComponentFactory componentFactory,
-            final IdentityFactory identityFactory,
-            final PreferencesManager preferencesManager) {
-        this.model = model;
-        this.iconManager = iconManager;
-        this.componentFactory = componentFactory;
-        this.identityFactory = identityFactory;
-        this.preferencesManager = preferencesManager;
-        addListeners();
-        border = UIManager.getBorder("TitledBorder.border");
-        setBorder(BorderFactory.createTitledBorder(border, "Network Settings"));
-        setLayout(new MigLayout("fill, ins 0"));
-        add(getSettingsPanel(model.getSelectedItem()), "grow, push");
-    }
-
-    /**
-     * Adds required listeners.
-     */
-    private void addListeners() {
-        model.addServerListListener(this);
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        setVisible(false);
-        removeAll();
-        if (item != null) {
-            if (item.getGroup() == item) {
-                setBorder(BorderFactory.createTitledBorder(border,
-                        "Network settings"));
-            } else {
-                setBorder(BorderFactory.createTitledBorder(border,
-                        "Server settings"));
-            }
-        }
-        add(getSettingsPanel(item), "grow, push");
-        setVisible(true);
-    }
-
-    /**
-     * Gets a settings panel for the specified group item, creating it if required.
-     *
-     * @param item Group item panel
-     *
-     * @return Settings panel for group item
-     */
-    private SettingsPanel getSettingsPanel(final ServerGroupItem item) {
-        if (!panels.containsKey(item)) {
-            if (item instanceof ServerGroup) {
-                panels.put(item, new SettingsPanel(iconManager, componentFactory, "", false));
-                addSettings(panels.get(item),
-                        identityFactory.createAggregateConfig("irc", "", item.getGroup().
-                                getNetwork(), item.getName()),
-                        identityFactory.createServerConfig(item.getName()));
-            } else {
-                panels.put(item, new SettingsPanel(iconManager, componentFactory, "", false));
-            }
-        }
-        return panels.get(item);
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        if (save) {
-            for (Entry<ServerGroupItem, SettingsPanel> entry : panels.entrySet()) {
-                entry.getValue().save();
-            }
-        }
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //Ignore
-    }
-
-    /**
-     * Adds the settings to the panel.
-     *
-     * @param settingsPanel Settings panel to add settings to
-     * @param manager       The config manager to read current settings from.
-     * @param identity      The provider to write settings to.
-     */
-    private void addSettings(final SettingsPanel settingsPanel,
-            final AggregateConfigProvider manager, final ConfigProvider identity) {
-        settingsPanel.addOption(preferencesManager.getServerSettings(manager, identity));
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Tree.java

@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.components.TreeScroller;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Enumeration;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeSelectionModel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Tree of server groups and items.
- */
-public class Tree extends JPanel implements TreeSelectionListener,
-        ServerListListener, ActionListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2;
-    /** Tree. */
-    private final JTree items;
-    /** Tree model. */
-    private final DefaultTreeModel treeModel;
-    /** Server list model. */
-    private final ServerListModel model;
-    /** Add group. */
-    private final JButton addGroupButton;
-    /** Add Item. */
-    private final JButton addItemButton;
-    /** Parent window. */
-    private final Window parentWindow;
-    /** Icon Manager. */
-    private final IconManager iconManager;
-
-    /**
-     * Instantiates a new tree of server groups.
-     *
-     * @param iconManager  Icon Manager
-     * @param model        Model backing this tree
-     * @param parentWindow Dialog's parent window
-     */
-    public Tree(final IconManager iconManager, final ServerListModel model,
-            final Window parentWindow) {
-
-        this.iconManager = iconManager;
-        this.model = model;
-        this.parentWindow = parentWindow;
-        addGroupButton = new JButton("Add group");
-        addItemButton = new JButton("Add item");
-        model.addServerListListener(this);
-        treeModel = model.getTreeModel();
-        items = new JTree(treeModel) {
-            /** Serial version UID. */
-            private static final long serialVersionUID = 2;
-
-            @Override
-            public void scrollRectToVisible(final Rectangle aRect) {
-                final Rectangle rect = new Rectangle(0, aRect.y,
-                        aRect.width, aRect.height);
-                super.scrollRectToVisible(rect);
-            }
-        };
-
-        items.putClientProperty("JTree.lineStyle", "Angled");
-        items.getInputMap().setParent(null);
-        items.getInputMap(JComponent.WHEN_FOCUSED).clear();
-        items.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .clear();
-        items.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).clear();
-        items.getSelectionModel().setSelectionMode(
-                TreeSelectionModel.SINGLE_TREE_SELECTION);
-        items.setRootVisible(true);
-        items.setShowsRootHandles(true);
-        items.setOpaque(true);
-        items.setFocusable(false);
-        new TreeScroller(items);
-        items.setCellRenderer(new ServerGroupTreeRenderer());
-        items.scrollRectToVisible(new Rectangle(0, 0, 0, 0));
-        items.setSelectionRow(0);
-        valueChanged(null);
-        addListeners();
-
-        setLayout(new MigLayout("fill, ins 0, wrap 1"));
-
-        add(new JScrollPane(items), "grow, push");
-        add(addGroupButton, "growx, pushx");
-        add(addItemButton, "growx, pushx");
-    }
-
-    /**
-     * Adds required listeners.
-     */
-    private void addListeners() {
-        items.addTreeSelectionListener(this);
-        addGroupButton.addActionListener(this);
-        addItemButton.addActionListener(this);
-    }
-
-    @Override
-    public final void valueChanged(final TreeSelectionEvent e) {
-        if (items.getSelectionPath() == null) {
-            addItemButton.setEnabled(false);
-            return;
-        }
-        final DefaultMutableTreeNode itemNode = (DefaultMutableTreeNode) items.
-                getSelectionPath().getLastPathComponent();
-        if (itemNode.getUserObject() instanceof ServerGroupItem) {
-            addItemButton.setEnabled(true);
-            model.setSelectedItem((ServerGroupItem) itemNode.getUserObject());
-        } else {
-            addItemButton.setEnabled(false);
-            model.setSelectedItem(null);
-        }
-    }
-
-    @Override
-    public void serverGroupChanged(final ServerGroupItem item) {
-        //Ignore
-    }
-
-    @Override
-    public void dialogClosed(final boolean save) {
-        //Ignore
-    }
-
-    @Override
-    public void serverGroupAdded(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        final DefaultMutableTreeNode parentNode = getNodeForGroup(parent);
-        treeModel.insertNodeInto(new DefaultMutableTreeNode(group), parentNode,
-                parentNode.getChildCount());
-    }
-
-    @Override
-    public void serverGroupRemoved(final ServerGroupItem parent,
-            final ServerGroupItem group) {
-        //TODO when I let people remove groups...
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == addGroupButton) {
-            new AddGroupInputDialog(iconManager, parentWindow, items, model).display();
-        } else {
-            new AddEntryInputDialog(iconManager, parentWindow, items, model).display();
-        }
-    }
-
-    /**
-     * Find the node for a specified server group item, will return root node if the group isn't
-     * found.
-     *
-     * @param item Item to search for in the tree
-     *
-     * @return Node for group, or null if not found
-     */
-    private DefaultMutableTreeNode getNodeForGroup(final ServerGroupItem item) {
-        DefaultMutableTreeNode node = (DefaultMutableTreeNode) items.getModel()
-                .getRoot();
-        final Enumeration<?> enumeration = ((DefaultMutableTreeNode) items
-                .getModel().getRoot()).breadthFirstEnumeration();
-        while (enumeration.hasMoreElements()) {
-            final DefaultMutableTreeNode current = (DefaultMutableTreeNode) enumeration.
-                    nextElement();
-            if (item == current.getUserObject()) {
-                node = current;
-                break;
-            }
-        }
-        return node;
-    }
-
-}

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/URIJTextField.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlistdialog;
-
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.Validator;
-
-/**
- * Simple extention of JTextField to return an URI usable string (defaulting to an irc scheme if
- * none specified).
- */
-public class URIJTextField extends ValidatingJTextField {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    public URIJTextField(final IconManager iconManager, final String text,
-            final Validator<String> validator) {
-        super(iconManager, text, validator);
-    }
-
-    @Override
-    public String getText() {
-        final String hostname = super.getText();
-        if (!hostname.contains("://")) {
-            return "irc://" + hostname;
-        } else {
-            return hostname;
-        }
-    }
-
-}

serverlists/plugin.config

@@ -1,29 +0,0 @@
-# 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
-  requires
-
-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.6
-
-provides:
-  serverlist feature
-
-persistent:
-  *

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

@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.ConnectionManager;
-
-import java.net.URI;
-
-/**
- * Describes an entry for a server within a {@link ServerGroup}.
- *
- * @since 0.6.4
- */
-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;
-    /** The manager to use to create new servers. */
-    private final ConnectionManager connectionManager;
-
-    /**
-     * Creates a new server entry.
-     *
-     * @param profileManager     The manager to retrieve profiles from.
-     * @param connectionManager  The server manager to connect to servers with.
-     * @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 ProfileManager profileManager,
-            final ConnectionManager connectionManager,
-            final ServerGroup group, final String name,
-            final URI address, final String profile) {
-        super(profileManager);
-
-        this.connectionManager = connectionManager;
-        setName(name);
-        setProfile(profile);
-        this.address = address;
-        this.group = group;
-    }
-
-    @Override
-    public ServerGroup getGroup() {
-        return group;
-    }
-
-    @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;
-    }
-
-    @Override
-    public void connect() {
-        connectionManager.connectToAddress(address, getProfileIdentity());
-    }
-
-    @Override
-    public String toString() {
-        return "[" + getName() + ": address: " + getAddress() + "]";
-    }
-
-}

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

@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import com.dmdirc.config.profiles.ProfileManager;
-
-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
- */
-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<>();
-    /** The items contained within the group. */
-    private final List<ServerGroupItem> entries = new ArrayList<>();
-
-    /**
-     * Creates a new server group with the specified name and no parent.
-     *
-     * @param profileManager The manager to retrieve profiles from.
-     * @param name           The name to be used for this group
-     */
-    public ServerGroup(final ProfileManager profileManager, final String name) {
-        this(profileManager, null, name);
-    }
-
-    /**
-     * Creates a new server group with the specified name.
-     *
-     * @param profileManager     The manager to retrieve settings from
-     * @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 ProfileManager profileManager,
-            final ServerGroup parent,
-            final String name) {
-        super(profileManager);
-
-        this.parent = parent;
-        setName(name);
-    }
-
-    @Override
-    public ServerGroup getGroup() {
-        return this;
-    }
-
-    @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();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "[" + getName() + ": links: " + getLinks() + "; desc: "
-                + getDescription() + "; content: " + getItems() + "]";
-    }
-
-}

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

@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import java.net.URI;
-
-/**
- * An item which is included in a server group.
- *
- * @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);
-
-}

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

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import com.dmdirc.config.profiles.Profile;
-import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.config.ConfigProvider;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Abstract base class for {@link ServerGroupItem}s.
- *
- * @since 0.6.4
- */
-public abstract class ServerGroupItemBase implements ServerGroupItem {
-
-    /** Manager to get profiles from */
-    private final ProfileManager profileManager;
-    /** 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;
-
-    public ServerGroupItemBase(final ProfileManager profileManager) {
-        this.profileManager = profileManager;
-    }
-
-    @Override
-    public boolean isModified() {
-        return modified;
-    }
-
-    @Override
-    public void setModified(final boolean isModified) {
-        this.modified = isModified;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(final String name) {
-        setModified(true);
-        this.name = name;
-    }
-
-    @Override
-    public String getPath() {
-        if (getParent() != null) {
-            return getParent().getPath() + " → " + getName();
-        }
-        return getName();
-    }
-
-    @Override
-    public String getProfile() {
-        return profile;
-    }
-
-    @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 ConfigProvider} which corresponds to this server's desired profile.
-     *
-     * @return This server's profile identity
-     */
-    protected Profile getProfileIdentity() {
-        if (profile != null) {
-            for (Profile identity : profileManager.getProfiles()) {
-                if (profile.equals(identity.getName())) {
-                    return identity;
-                }
-            }
-        }
-
-        if (getParent() == null) {
-            return profileManager.getDefault();
-        } else {
-            return getParent().getProfileIdentity();
-        }
-    }
-
-}

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

@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.Precondition;
-import com.dmdirc.addons.serverlists.io.ServerGroupReader;
-import com.dmdirc.addons.serverlists.io.ServerGroupWriter;
-import com.dmdirc.addons.serverlists.service.ServerListServiceProvider;
-import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderListener;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.plugins.PluginManager;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-/**
- * Maintains a list of top level {@link ServerGroup}s and handles reading and writing of the lists
- * to disk.
- *
- * @since 0.6.4
- */
-public class ServerList implements ConfigProviderListener {
-
-    /** A list of all known groups. */
-    private final Map<ServerGroup, ServerGroupWriter> groups = new HashMap<>();
-    /** ServerManager that ServerEntrys use to create servers */
-    private final ConnectionManager connectionManager;
-    /** The manager to retrieve profiles from. */
-    private final ProfileManager profileManager;
-    /** The factory to create new identities with. */
-    private final IdentityFactory identityFactory;
-
-    /**
-     * Creates a new ServerList and loads groups and servers.
-     *
-     * @param pluginManager      Plugin Manager to use.
-     * @param connectionManager      Server Manager to use.
-     * @param identityController The controller to read/write settings with.
-     * @param profileManager     The profile manager to retrieve profiles from.
-     * @param identityFactory    The factory to create new identities with.
-     * @param eventBus           The event bus to post errors to
-     */
-    @Inject
-    public ServerList(
-            final PluginManager pluginManager,
-            final ConnectionManager connectionManager,
-            final IdentityController identityController,
-            final ProfileManager profileManager,
-            final IdentityFactory identityFactory,
-            final DMDircMBassador eventBus) {
-        this.connectionManager = connectionManager;
-        this.profileManager = profileManager;
-        this.identityFactory = identityFactory;
-
-        identityController.registerIdentityListener("servergroup", this);
-
-        for (ConfigProvider identity : identityController.getProvidersByType("servergroup")) {
-            configProviderAdded(identity);
-        }
-
-        new ServerListServiceProvider(pluginManager, this, eventBus).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
-     */
-    public void addServerGroup(final ServerGroup group) {
-        final ServerGroupWriter writer = new ServerGroupWriter(
-                identityFactory.createCustomConfig(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;
-    }
-
-    @Override
-    public void configProviderAdded(final ConfigProvider configProvider) {
-        try {
-            final ServerGroupReader reader
-                    = new ServerGroupReader(connectionManager, profileManager, configProvider);
-            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()
-        }
-    }
-
-    @Override
-    public void configProviderRemoved(final ConfigProvider configProvider) {
-        // TODO: Remove server group
-    }
-
-}

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

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists;
-
-import com.dmdirc.plugins.implementations.BasePlugin;
-
-/** Dummy plugin for server lists. */
-public class ServerListPlugin extends BasePlugin {
-}

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

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists.io;
-
-import com.dmdirc.addons.serverlists.ServerEntry;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.ConfigProvider;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Facilitates loading of a {@link com.dmdirc.addons.serverlists.ServerEntry} from a DMDirc
- * {@link com.dmdirc.interfaces.config.ConfigProvider}.
- *
- * @since 0.6.4
- */
-public class ServerEntryReader {
-
-    /** ServerManager that ServerEntrys use to create servers */
-    private final ConnectionManager connectionManager;
-    /** The manager to retrieve profiles from. */
-    private final ProfileManager profileManager;
-    /** The identity to read entries from. */
-    private final ConfigProvider identity;
-
-    public ServerEntryReader(final ConnectionManager connectionManager,
-            final ProfileManager profileManager, final ConfigProvider identity) {
-        this.connectionManager = connectionManager;
-        this.profileManager = profileManager;
-        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(profileManager, connectionManager, group, serverName, serverURI, null);
-    }
-
-}

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

@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists.io;
-
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-
-/**
- * Facilitates loading of a {@link ServerGroup} from a DMDirc {@link ConfigProvider}.
- *
- * @since 0.6.4
- */
-public class ServerGroupReader {
-
-    /** The config provider this reader should read from. */
-    private final ConfigProvider identity;
-    /** The reader we'll use for individual servers. */
-    private final ServerEntryReader entryReader;
-    /** The manager to retrieve profiles from. */
-    private final ProfileManager profileManager;
-
-    /**
-     * Creates a new ServerGroupReader that will read from the specified identity.
-     *
-     * @param connectionManager  The server manager to use to connect to servers.
-     * @param profileManager     The manager to retrieve profiles from
-     * @param identity           The identity describing the server group
-     */
-    public ServerGroupReader(
-            final ConnectionManager connectionManager,
-            final ProfileManager profileManager,
-            final ConfigProvider identity) {
-        this.identity = identity;
-        this.profileManager = profileManager;
-        this.entryReader = new ServerEntryReader(connectionManager, profileManager, identity);
-    }
-
-    /**
-     * Reads the default server group from this reader's identity.
-     *
-     * @see #read(ServerGroup, 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(profileManager, 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 | IllegalArgumentException ex) {
-                    // TODO: Raise an error about malformed server
-                }
-            }
-        }
-
-        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);
-    }
-
-}

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

@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists.io;
-
-import com.dmdirc.addons.serverlists.ServerEntry;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.interfaces.config.ConfigProvider;
-
-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
- */
-public class ServerGroupWriter {
-
-    /** The identity which will be written to. */
-    private final ConfigProvider 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 ConfigProvider 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();
-        sections.remove("identity");
-
-        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<>();
-
-        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());
-    }
-
-}

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

@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.serverlists.service;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ParserFactory;
-import com.dmdirc.addons.serverlists.ServerGroup;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.serverlists.ServerList;
-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 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.
- *
- * @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;
-    /** Plugin Manager */
-    private final PluginManager pluginManager;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new server list service provider.
-     *
-     * @param pluginManager The PluginManager to use.
-     * @param serverList    The {@link ServerList} to retrieve items from
-     * @param eventBus      The event bus to post errors to
-     */
-    public ServerListServiceProvider(final PluginManager pluginManager, final ServerList serverList,
-            final DMDircMBassador eventBus) {
-        this.serverList = serverList;
-        this.pluginManager = pluginManager;
-        this.eventBus = eventBus;
-        this.services = Arrays.asList(pluginManager.getService("parser", "serverlist", true));
-    }
-
-    /**
-     * Registers this service provider.
-     */
-    public void register() {
-        for (Service service : services) {
-            service.addProvider(this);
-        }
-    }
-
-    @Override
-    public boolean isActive() {
-        return true;
-    }
-
-    @Override
-    public void activateServices() {
-        // Do nothing
-    }
-
-    @Override
-    public List<Service> getServices() {
-        return services;
-    }
-
-    @Override
-    public String getProviderName() {
-        return "Serverlist service provider";
-    }
-
-    @Override
-    public ExportedService getExportedService(final String name) {
-        if ("getParser".equals(name)) {
-            return new ExportedService(ServerListServiceProvider.class, "getParser", this);
-        } else {
-            return 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(pluginManager, eventBus).getParser(myInfo, item.getAddress());
-    }
-
-}