Remove some deprecated method calls.

Change-Id: I872ecaf83eac2c7babe6942179db19806f803b33
Reviewed-on: http://gerrit.dmdirc.com/3163
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -169,7 +169,7 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
      */
     @Override
     public void onLoad() {
-        config.addChangeListener(getDomain(), this);
+        config.addChangeListener(pluginInfo.getDomain(), this);
         setCachedSettings();
         // Extract the files needed
         try {
@@ -194,8 +194,8 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        identity.setOption(getDomain(),
-                "general.icon", filesHelper.getFilesDirString() + "icon.png");
+        identity.setOption(pluginInfo.getDomain(), "general.icon",
+                filesHelper.getFilesDirString() + "icon.png");
     }
 
     /** {@inheritDoc} */
@@ -206,23 +206,23 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
                 "General configuration for FreeDesktop Notifications plugin.");
 
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "general.timeout", "Timeout",
+                pluginInfo.getDomain(), "general.timeout", "Timeout",
                 "Length of time in seconds before the notification popup closes.",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.FILE,
-                getDomain(), "general.icon", "icon",
+                pluginInfo.getDomain(), "general.icon", "icon",
                 "Path to icon to use on the notification.",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.escapehtml", "Escape HTML",
+                pluginInfo.getDomain(), "advanced.escapehtml", "Escape HTML",
                 "Some Implementations randomly parse HTML, escape it before showing?",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.strictescape", "Strict Escape HTML",
+                pluginInfo.getDomain(), "advanced.strictescape", "Strict Escape HTML",
                 "Strictly escape HTML or just the basic characters? (&, < and >)",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.stripcodes", "Strip Control Codes",
+                pluginInfo.getDomain(), "advanced.stripcodes", "Strip Control Codes",
                 "Strip IRC Control codes from messages?",
                 manager.getConfigManager(), manager.getIdentity()));
 
@@ -230,11 +230,11 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
     }
 
     private void setCachedSettings() {
-        timeout = config.getOptionInt(getDomain(), "general.timeout");
-        icon = config.getOption(getDomain(), "general.icon");
-        escapehtml = config.getOptionBool(getDomain(), "advanced.escapehtml");
-        strictescape = config.getOptionBool(getDomain(), "advanced.strictescape");
-        stripcodes = config.getOptionBool(getDomain(), "advanced.stripcodes");
+        timeout = config.getOptionInt(pluginInfo.getDomain(), "general.timeout");
+        icon = config.getOption(pluginInfo.getDomain(), "general.icon");
+        escapehtml = config.getOptionBool(pluginInfo.getDomain(), "advanced.escapehtml");
+        strictescape = config.getOptionBool(pluginInfo.getDomain(), "advanced.strictescape");
+        stripcodes = config.getOptionBool(pluginInfo.getDomain(), "advanced.stripcodes");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -80,6 +80,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
         config = identityController.getGlobalConfiguration();
     }
 
+    @Deprecated
     AggregateConfigProvider getConfig() {
         return config;
     }
@@ -96,7 +97,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
                 CoreActionType.SERVER_CONNECTERROR);
 
         myServer = new IdentdServer(this, serverManager);
-        if (config.getOptionBool(getDomain(), "advanced.alwaysOn")) {
+        if (config.getOptionBool(pluginInfo.getDomain(), "advanced.alwaysOn")) {
             myServer.startServer();
         }
     }
@@ -133,7 +134,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
             synchronized (connections) {
                 connections.remove(arguments[0]);
 
-                if (connections.isEmpty() && !config.getOptionBool(getDomain(),
+                if (connections.isEmpty() && !config.getOptionBool(pluginInfo.getDomain(),
                         "advanced.alwaysOn")) {
                     myServer.stopServer();
                 }
@@ -156,55 +157,55 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
                 + "those above them)");
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useUsername", "Use connection "
+                pluginInfo.getDomain(), "general.useUsername", "Use connection "
                 + "username rather than system username", "If this is enabled,"
                 + " the username for the connection will be used rather than " + "'" + System.
                 getProperty("user.name") + "'",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useNickname", "Use connection "
+                pluginInfo.getDomain(), "general.useNickname", "Use connection "
                 + "nickname rather than system username", "If this is enabled, "
                 + "the nickname for the connection will be used rather than " + "'" + System.
                 getProperty("user.name") + "'",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useCustomName", "Use custom name" + " all the time",
+                pluginInfo.getDomain(), "general.useCustomName", "Use custom name" + " all the time",
                 "If this is enabled, the name specified below" + " will be used all the time",
                 manager.getConfigManager(),
                 manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "general.customName", "Custom Name to use",
+                pluginInfo.getDomain(), "general.customName", "Custom Name to use",
                 "The custom name to use when 'Use Custom Name' is enabled",
                 manager.getConfigManager(), manager.getIdentity()));
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.alwaysOn", "Always have ident " + "port open",
+                pluginInfo.getDomain(), "advanced.alwaysOn", "Always have ident " + "port open",
                 "By default the identd only runs when there are "
                 + "active connection attempts. This overrides that.",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                new PortValidator(), getDomain(), "advanced.port",
+                new PortValidator(), pluginInfo.getDomain(), "advanced.port",
                 "What port should the identd listen on", "Default port is 113,"
                 + " this is probably useless if changed unless you port forward"
                 + " ident to a different port", manager.getConfigManager(),
                 manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.useCustomSystem", "Use custom OS",
+                pluginInfo.getDomain(), "advanced.useCustomSystem", "Use custom OS",
                 "By default the plugin uses 'UNIX' or 'WIN32' as the system "
                 + "type, this can be overriden by enabling this.",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "advanced.customSystem", "Custom OS to use",
+                pluginInfo.getDomain(), "advanced.customSystem", "Custom OS to use",
                 "The custom system to use when 'Use Custom System' is enabled",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.isHiddenUser", "Respond to ident"
+                pluginInfo.getDomain(), "advanced.isHiddenUser", "Respond to ident"
                 + " requests with HIDDEN-USER error", "By default the plugin will"
                 + " give a USERID response, this can force an 'ERROR :"
                 + " HIDDEN-USER' response instead.", manager.getConfigManager(),
                 manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.isNoUser", "Respond to ident"
+                pluginInfo.getDomain(), "advanced.isNoUser", "Respond to ident"
                 + " requests with NO-USER error", "By default the plugin will"
                 + " give a USERID response, this can force an 'ERROR : NO-USER'"
                 + " response instead. (Overrides HIDDEN-USER)",

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -150,7 +150,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        identity.setOption(getDomain(), "general.directory",
+        identity.setOption(pluginInfo.getDomain(), "general.directory",
                 identityController.getConfigurationDirectory() + "logs" + System.getProperty(
                 "file.separator"));
     }
@@ -174,7 +174,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             }
         }
 
-        config.addChangeListener(getDomain(), this);
+        config.addChangeListener(pluginInfo.getDomain(), this);
 
         actionController.registerListener(this,
                 CoreActionType.CHANNEL_OPENED,
@@ -264,62 +264,62 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                 "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
 
         general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
-                getDomain(), "general.directory", "Directory",
+                pluginInfo.getDomain(), "general.directory", "Directory",
                 "Directory for log files", manager.getConfigManager(),
                 manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.networkfolders",
+                pluginInfo.getDomain(), "general.networkfolders",
                 "Separate logs by network",
                 "Should the files be stored in a sub-dir with the networks name?",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.addtime", "Timestamp logs",
+                pluginInfo.getDomain(), "general.addtime", "Timestamp logs",
                 "Should a timestamp be added to the log files?",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "general.timestamp", "Timestamp format",
+                pluginInfo.getDomain(), "general.timestamp", "Timestamp format",
                 "The String to pass to 'SimpleDateFormat' to format the timestamp",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.stripcodes", "Strip Control Codes",
+                pluginInfo.getDomain(), "general.stripcodes", "Strip Control Codes",
                 "Remove known irc control codes from lines before saving?",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.channelmodeprefix",
+                pluginInfo.getDomain(), "general.channelmodeprefix",
                 "Show channel mode prefix", "Show the @,+ etc next to nicknames",
                 manager.getConfigManager(), manager.getIdentity()));
 
         backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "backbuffer.autobackbuffer", "Automatically display",
+                pluginInfo.getDomain(), "backbuffer.autobackbuffer", "Automatically display",
                 "Automatically display the backbuffer when a channel is joined",
                 manager.getConfigManager(), manager.getIdentity()));
         backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
-                getDomain(), "backbuffer.colour", "Colour to use for display",
+                pluginInfo.getDomain(), "backbuffer.colour", "Colour to use for display",
                 "Colour used when displaying the backbuffer",
                 manager.getConfigManager(), manager.getIdentity()));
         backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "backbuffer.lines", "Number of lines to show",
+                pluginInfo.getDomain(), "backbuffer.lines", "Number of lines to show",
                 "Number of lines used when displaying backbuffer",
                 manager.getConfigManager(), manager.getIdentity()));
         backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp",
+                pluginInfo.getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp",
                 "Should the line be added to the frame with the timestamp from "
                 + "the formatter aswell as the file contents",
                 manager.getConfigManager(), manager.getIdentity()));
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.filenamehash", "Add Filename hash",
+                pluginInfo.getDomain(), "advanced.filenamehash", "Add Filename hash",
                 "Add the MD5 hash of the channel/client name to the filename. "
                 + "(This is used to allow channels with similar names "
                 + "(ie a _ not a  -) to be logged separately)",
                 manager.getConfigManager(), manager.getIdentity()));
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.usedate", "Use Date directories",
+                pluginInfo.getDomain(), "advanced.usedate", "Use Date directories",
                 "Should the log files be in separate directories based on the date?",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "advanced.usedateformat", "Archive format",
+                pluginInfo.getDomain(), "advanced.usedateformat", "Archive format",
                 "The String to pass to 'SimpleDateFormat' to format the "
                 + "directory name(s) for archiving",
                 manager.getConfigManager(), manager.getIdentity()));
@@ -934,20 +934,21 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
 
     /** Updates cached settings. */
     public void setCachedSettings() {
-        networkfolders = config.getOptionBool(getDomain(), "general.networkfolders");
-        filenamehash = config.getOptionBool(getDomain(), "advanced.filenamehash");
-        addtime = config.getOptionBool(getDomain(), "general.addtime");
-        stripcodes = config.getOptionBool(getDomain(), "general.stripcodes");
-        channelmodeprefix = config.getOptionBool(getDomain(), "general.channelmodeprefix");
-        autobackbuffer = config.getOptionBool(getDomain(), "backbuffer.autobackbuffer");
-        backbufferTimestamp = config.getOptionBool(getDomain(), "backbuffer.timestamp");
-        usedate = config.getOptionBool(getDomain(), "advanced.usedate");
-        timestamp = config.getOption(getDomain(), "general.timestamp");
-        usedateformat = config.getOption(getDomain(), "advanced.usedateformat");
-        historyLines = config.getOptionInt(getDomain(), "history.lines");
-        colour = config.getOption(getDomain(), "backbuffer.colour");
-        backbufferLines = config.getOptionInt(getDomain(), "backbuffer.lines");
-        logDirectory = config.getOption(getDomain(), "general.directory");
+        networkfolders = config.getOptionBool(pluginInfo.getDomain(), "general.networkfolders");
+        filenamehash = config.getOptionBool(pluginInfo.getDomain(), "advanced.filenamehash");
+        addtime = config.getOptionBool(pluginInfo.getDomain(), "general.addtime");
+        stripcodes = config.getOptionBool(pluginInfo.getDomain(), "general.stripcodes");
+        channelmodeprefix = config.getOptionBool(pluginInfo.getDomain(),
+                "general.channelmodeprefix");
+        autobackbuffer = config.getOptionBool(pluginInfo.getDomain(), "backbuffer.autobackbuffer");
+        backbufferTimestamp = config.getOptionBool(pluginInfo.getDomain(), "backbuffer.timestamp");
+        usedate = config.getOptionBool(pluginInfo.getDomain(), "advanced.usedate");
+        timestamp = config.getOption(pluginInfo.getDomain(), "general.timestamp");
+        usedateformat = config.getOption(pluginInfo.getDomain(), "advanced.usedateformat");
+        historyLines = config.getOptionInt(pluginInfo.getDomain(), "history.lines");
+        colour = config.getOption(pluginInfo.getDomain(), "backbuffer.colour");
+        backbufferLines = config.getOptionInt(pluginInfo.getDomain(), "backbuffer.lines");
+        logDirectory = config.getOption(pluginInfo.getDomain(), "general.directory");
     }
 
     /** Open File. */

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -205,7 +205,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
                 "", "category-vlc");
 
         final PreferencesSetting setting = new PreferencesSetting(
-                PreferencesType.LABEL, getDomain(), "", "Instructions",
+                PreferencesType.LABEL, pluginInfo.getDomain(), "", "Instructions",
                 "Instructions", manager.getConfigManager(), manager.getIdentity());
         setting.setValue("<html><p>"
                 + "The VLC media source requires that VLC's web interface is"
@@ -231,7 +231,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
                 + "'Save'<li>Restart VLC</ol></html>");
         general.addSetting(setting);
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                getDomain(), "host", "Hostname and port",
+                pluginInfo.getDomain(), "host", "Hostname and port",
                 "The host and port that VLC listens on for web connections",
                 manager.getConfigManager(), manager.getIdentity()));
 
@@ -250,7 +250,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
 
         try {
             final String host = identityController.getGlobalConfiguration()
-                    .getOption(getDomain(), "host");
+                    .getOption(pluginInfo.getDomain(), "host");
             res = Downloader.getPage("http://" + host + "/old/info.html");
             res2 = Downloader.getPage("http://" + host + "/old/");
             parseInformation(res, res2);

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -91,15 +91,15 @@ public class NickColourPlugin extends BasePlugin {
         final PreferencesCategory colours = new PluginPreferencesCategory(
                 pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                        new Callable<NickColourPanel>() {
-                            /** {@inheritDoc} */
-                            @Override
-                            public NickColourPanel call() {
-                                return new NickColourPanel(mainFrame, iconManager, colourManager,
-                                        manager.getIdentity(), manager.getConfigManager(),
-                                        pluginInfo.getDomain());
-                            }
-                        }));
+                new Callable<NickColourPanel>() {
+            /** {@inheritDoc} */
+            @Override
+            public NickColourPanel call() {
+                return new NickColourPanel(mainFrame, iconManager, colourManager,
+                        manager.getIdentity(), manager.getConfigManager(),
+                        pluginInfo.getDomain());
+            }
+        }));
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "shownickcoloursintext", "Show colours in text area",

src/com/dmdirc/addons/nma/NotifyMyAndroidPlugin.java

@@ -72,12 +72,12 @@ public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
                 "General configuration for Notify My Android plugin.");
 
         category.addSetting(new PreferencesSetting(
-                PreferencesType.TEXT, getDomain(), "apikey",
+                PreferencesType.TEXT, pluginInfo.getDomain(), "apikey",
                 "API Key", "Comma-separated list of NotifyMyAndroid API keys"
                 + " to be notified when the command is used.",
                 manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(
-                PreferencesType.TEXT, getDomain(), "application",
+                PreferencesType.TEXT, pluginInfo.getDomain(), "application",
                 "Application", "Name of the application to report to "
                 + "NotifyMyAndroid",
                 manager.getConfigManager(), manager.getIdentity()));

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -116,9 +116,10 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
 
     /** Loads the plugins settings. */
     private void loadSettings() {
-        if (identityController.getGlobalConfiguration().hasOptionString(getDomain(), "methodOrder")) {
-            order = identityController.getGlobalConfiguration().getOptionList(getDomain(),
-                    "methodOrder");
+        if (identityController.getGlobalConfiguration()
+                .hasOptionString(pluginInfo.getDomain(), "methodOrder")) {
+            order = identityController.getGlobalConfiguration().
+                    getOptionList(pluginInfo.getDomain(), "methodOrder");
         } else {
             order = new ArrayList<>();
         }
@@ -230,7 +231,7 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     protected void saveSettings(final List<String> newOrder) {
         order = newOrder;
         identityController.getUserSettings()
-                .setOption(getDomain(), "methodOrder", order);
+                .setOption(pluginInfo.getDomain(), "methodOrder", order);
     }
 
 }