Remove deprecations from the OSD plugin.

Change-Id: I8a3c3d0ae68a7319655729e54f521982af50fe96
Reviewed-on: http://gerrit.dmdirc.com/3191
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/osd/OsdManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.osd;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.util.ArrayList;
@@ -35,8 +36,6 @@ import java.util.concurrent.Callable;
 
 /**
  * Class to manage OSD Windows.
- *
- * @since 0.6.3
  */
 public class OsdManager {
 
@@ -52,13 +51,17 @@ public class OsdManager {
     private final List<OsdWindow> windowList = new ArrayList<>();
     /** List of messages to be queued. */
     private final Queue<QueuedMessage> windowQueue = new LinkedList<>();
+    /** This plugin's settings domain. */
+    private final String domain;
 
     public OsdManager(final MainFrame mainFrame, final IdentityController identityController,
-            final OsdPlugin plugin, final ColourManager colourManager) {
+            final OsdPlugin plugin, final ColourManager colourManager,
+            final PluginInfo pluginInfo) {
         this.mainFrame = mainFrame;
         this.identityController = identityController;
         this.plugin = plugin;
         this.colourManager = colourManager;
+        this.domain = pluginInfo.getDomain();
     }
 
     /**
@@ -77,7 +80,7 @@ public class OsdManager {
      */
     private synchronized void displayWindows() {
         final Integer maxWindows = identityController.getGlobalConfiguration()
-                .getOptionInt(plugin.getDomain(), "maxWindows", false);
+                .getOptionInt(domain, "maxWindows", false);
 
         QueuedMessage nextItem;
 
@@ -100,10 +103,9 @@ public class OsdManager {
      */
     private synchronized void displayWindow(final int timeout, final String message) {
         final OsdPolicy policy = OsdPolicy.valueOf(identityController.getGlobalConfiguration()
-                .getOption(plugin.getDomain(), "newbehaviour")
-                .toUpperCase());
+                .getOption(domain, "newbehaviour").toUpperCase());
         final int startY = identityController.getGlobalConfiguration()
-                .getOptionInt(plugin.getDomain(), "locationY");
+                .getOptionInt(domain, "locationY");
 
         windowList.add(UIUtilities.invokeAndWait(
                 new Callable<OsdWindow>() {
@@ -112,11 +114,10 @@ public class OsdManager {
             public OsdWindow call() {
                 return new OsdWindow(
                         mainFrame,
-                        identityController, plugin, OsdManager.this, colourManager,
+                        identityController, OsdManager.this, colourManager,
                         timeout, message, false,
                         identityController.getGlobalConfiguration().getOptionInt(
-                        plugin.getDomain(), "locationX"), policy.getYPosition(
-                        OsdManager.this, startY));
+                        domain, "locationX"), policy.getYPosition(OsdManager.this, startY), domain);
             }
         }));
     }
@@ -129,8 +130,7 @@ public class OsdManager {
     public synchronized void closeWindow(final OsdWindow window) {
         final OsdPolicy policy = OsdPolicy.valueOf(
                 identityController.getGlobalConfiguration()
-                .getOption(plugin.getDomain(), "newbehaviour")
-                .toUpperCase());
+                .getOption(domain, "newbehaviour").toUpperCase());
 
         int oldY = window.getDesiredY();
         final int closedIndex = windowList.indexOf(window);

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -53,7 +53,7 @@ public class OsdPlugin extends BaseCommandPlugin implements
     /** Config OSD Window. */
     private OsdWindow osdWindow;
     /** The OSD Manager that this plugin is using. */
-    private OsdManager osdManager;
+    private final OsdManager osdManager;
     /** X-axis position of OSD. */
     private int x;
     /** Y-axis potion of OSD. */
@@ -73,6 +73,8 @@ public class OsdPlugin extends BaseCommandPlugin implements
     private final ColourManager colourManager;
     /** The window that the OSDs will be associated with. */
     private final MainFrame mainFrame;
+    /** This plugin's settings domain. */
+    private final String domain;
 
     /**
      * Creates a new instance of this plugin.
@@ -93,46 +95,46 @@ public class OsdPlugin extends BaseCommandPlugin implements
         this.identityController = identityController;
         this.colourManager = colourManager;
         this.mainFrame = swingController.getMainFrame();
-        osdManager = new OsdManager(mainFrame, identityController, this, colourManager);
+        this.domain = pluginInfo.getDomain();
+        osdManager = new OsdManager(mainFrame, identityController, this, colourManager, pluginInfo);
         registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         x = identityController.getGlobalConfiguration()
-                .getOptionInt(getDomain(), "locationX");
+                .getOptionInt(domain, "locationX");
         y = identityController.getGlobalConfiguration()
-                .getOptionInt(getDomain(), "locationY");
+                .getOptionInt(domain, "locationY");
 
         final PreferencesCategory category = new PluginPreferencesCategory(
                 pluginInfo, "OSD",
                 "General configuration for OSD plugin.", "category-osd");
 
         fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "fontSize", "Font size", "Changes the font " + "size of the OSD",
+                domain, "fontSize", "Font size", "Changes the font " + "size of the OSD",
                 manager.getConfigManager(),
                 manager.getIdentity()).registerChangeListener(this);
         backgroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
-                getDomain(), "bgcolour", "Background colour",
+                domain, "bgcolour", "Background colour",
                 "Background colour for the OSD", manager.getConfigManager(),
                 manager.getIdentity()).registerChangeListener(this);
         foregroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
-                getDomain(), "fgcolour", "Foreground colour",
+                domain, "fgcolour", "Foreground colour",
                 "Foreground colour for the OSD", manager.getConfigManager(),
                 manager.getIdentity()).registerChangeListener(this);
         widthSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "width", "OSD Width", "Width of the OSD Window",
+                domain, "width", "OSD Width", "Width of the OSD Window",
                 manager.getConfigManager(), manager.getIdentity())
                 .registerChangeListener(this);
         timeoutSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
-                getDomain(), "timeout", "Timeout", "Length of time in "
+                domain, "timeout", "Timeout", "Length of time in "
                 + "seconds before the OSD window closes", manager.getConfigManager(),
                 manager.getIdentity());
         maxWindowsSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
-                getDomain(), "maxWindows", "Maximum open windows",
+                domain, "maxWindows", "Maximum open windows",
                 "Maximum number of OSD windows that will be displayed at any given time",
                 manager.getConfigManager(), manager.getIdentity());
 
@@ -150,7 +152,7 @@ public class OsdPlugin extends BaseCommandPlugin implements
             posOptions.put(policy.name(), policy.getDescription());
         }
 
-        category.addSetting(new PreferencesSetting(getDomain(), "newbehaviour",
+        category.addSetting(new PreferencesSetting(domain, "newbehaviour",
                 "New window policy", "What to do when an OSD Window "
                 + "is opened when there are other, existing windows open",
                 posOptions, manager.getConfigManager(), manager.getIdentity()));
@@ -163,10 +165,8 @@ public class OsdPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void categorySelected(final PreferencesCategory category) {
-        osdWindow = new OsdWindow(
-                mainFrame,
-                identityController, this, osdManager, colourManager, -1,
-                "Please drag this OSD to position", true, x, y);
+        osdWindow = new OsdWindow(mainFrame, identityController, osdManager, colourManager,
+                -1, "Please drag this OSD to position", true, x, y, domain);
         osdWindow.setBackgroundColour(backgroundSetting.getValue());
         osdWindow.setForegroundColour(foregroundSetting.getValue());
         osdWindow.setFontSize(Integer.parseInt(fontSizeSetting.getValue()));
@@ -185,10 +185,8 @@ public class OsdPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void save() {
-        identityController.getUserSettings()
-                .setOption(getDomain(), "locationX", x);
-        identityController.getUserSettings()
-                .setOption(getDomain(), "locationY", y);
+        identityController.getUserSettings().setOption(domain, "locationX", x);
+        identityController.getUserSettings().setOption(domain, "locationY", y);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/osd/OsdPolicy.java

@@ -24,9 +24,6 @@ package com.dmdirc.addons.osd;
 
 /**
  * Enumerates OSD Policies.
- *
- * @author simon
- * @since 0.6.3
  */
 public enum OsdPolicy {
 
@@ -117,8 +114,6 @@ public enum OsdPolicy {
         return changesPosition;
     }
 
-    ;
-
     /**
      * Return a description of what each policy does.
      *

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -48,17 +48,10 @@ import net.miginfocom.swing.MigLayout;
 /**
  * The OSD Window is an always-on-top window designed to convey information about events to the
  * user.
- *
- * @author chris
  */
-public class OsdWindow extends JDialog implements MouseListener,
-        MouseMotionListener {
+public class OsdWindow extends JDialog implements MouseListener, MouseMotionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 2;
     /** The OSD Manager that owns this window. */
     private final OsdManager osdManager;
@@ -91,15 +84,15 @@ public class OsdWindow extends JDialog implements MouseListener,
      *                           to be moved)
      * @param x                  The x-axis position for the OSD Window
      * @param y                  The y-axis position for the OSD window
-     * @param plugin             Parent OSD Plugin
      * @param osdManager         The manager that owns this OSD Window
+     * @param domain             This plugin's settings domain
      */
     public OsdWindow(
             final MainFrame mainFrame,
-            final IdentityController identityController, final OsdPlugin plugin,
+            final IdentityController identityController,
             final OsdManager osdManager, final ColourManager colourManager,
             final int timeout, final String text, final boolean config, final int x,
-            final int y) {
+            final int y, final String domain) {
         super(mainFrame, false);
 
         this.colourManager = colourManager;
@@ -107,8 +100,8 @@ public class OsdWindow extends JDialog implements MouseListener,
         this.osdManager = osdManager;
 
         if (timeout < 0) {
-            this.timeout = identityController.getGlobalConfiguration().getOptionInt(
-                    osdManager.getPlugin().getDomain(), "timeout", false);
+            this.timeout = identityController.getGlobalConfiguration().getOptionInt(domain,
+            "timeout", false);
         } else {
             this.timeout = timeout;
         }
@@ -128,23 +121,19 @@ public class OsdWindow extends JDialog implements MouseListener,
         panel = new JPanel();
         panel.setBorder(new LineBorder(Color.BLACK));
         panel.setBackground(UIUtilities.convertColour(
-                colourManager.getColourFromString(
-                identityController.getGlobalConfiguration()
-                .getOptionString(plugin.getDomain(), "bgcolour"), null)));
+                colourManager.getColourFromString(identityController.getGlobalConfiguration()
+                        .getOptionString(domain, "bgcolour"), null)));
 
-        final int width = identityController.getGlobalConfiguration()
-                .getOptionInt(plugin.getDomain(), "width");
+        final int width = identityController.getGlobalConfiguration().getOptionInt(domain, "width");
         setContentPane(panel);
         setLayout(new MigLayout("wmin " + width + ", wmax " + width + ", ins rel, fill"));
 
         label = new JLabel(text);
         label.setForeground(UIUtilities.convertColour(
-                colourManager.getColourFromString(
-                identityController.getGlobalConfiguration()
-                .getOptionString(plugin.getDomain(), "fgcolour"), null)));
-        label.setFont(label.getFont().deriveFont(
-                (float) identityController
-                .getGlobalConfiguration().getOptionInt(plugin.getDomain(), "fontSize")));
+                colourManager.getColourFromString(identityController.getGlobalConfiguration()
+                        .getOptionString(domain, "fgcolour"), null)));
+        label.setFont(label.getFont().deriveFont((float) identityController
+                .getGlobalConfiguration().getOptionInt(domain, "fontSize")));
         label.setHorizontalAlignment(SwingConstants.CENTER);
         add(label, "alignx center, hmin " + label.getFont().getSize());