Changed Timeout setting in OSD plugin to be an OptionalInteger which allows for OSD windows to stay open indefinitely

Fixes issue 4292

Change-Id: I23638f76f81f8aa6cd260cc07268a16eaaf9a564
Reviewed-on: http://gerrit.dmdirc.com/1508
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

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

@@ -176,4 +176,13 @@ public class OsdManager {
     public int getWindowCount() {
         return windowList.size();
     }
+
+    /**
+     * Return the current plugin.
+     *
+     * @return Returns current plugin instance.
+     */
+    public OsdPlugin getPlugin() {
+        return plugin;
+    }
 }

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

@@ -110,8 +110,8 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
         widthSetting = new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "width", "OSD Width", "Width of the OSD Window").
                 registerChangeListener(this);
-        timeoutSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                new NumericalValidator(1, Integer.MAX_VALUE),
+        timeoutSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
+                new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
                 getDomain(), "timeout", "Timeout", "Length of time in " +
                 "seconds before the OSD window closes");
         maxWindowsSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,

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

@@ -78,6 +78,9 @@ public class OsdWindow extends JDialog implements MouseListener,
     /** Is this a config instance? */
     private final boolean config;
 
+    /** Timeout before the windows are automatically closed */
+    private final Integer timeout;
+
     /**
      * Creates a new instance of OsdWindow.
      *
@@ -96,6 +99,8 @@ public class OsdWindow extends JDialog implements MouseListener,
 
         this.config = config;
         this.osdManager = osdManager;
+        this.timeout = IdentityManager.getGlobalConfig()
+            .getOptionInt(osdManager.getPlugin().getDomain(), "timeout");
 
         setFocusableWindowState(false);
         setAlwaysOnTop(true);
@@ -136,15 +141,16 @@ public class OsdWindow extends JDialog implements MouseListener,
             addMouseListener(this);
         } else {
             addMouseListener(this);
-            new Timer("OSD Display Timer").schedule(new TimerTask() {
-
-                /** {@inheritDoc} */
-                @Override
-                public void run() {
-                    osdManager.closeWindow(OsdWindow.this);
-                }
-            }, Math.max(IdentityManager.getGlobalConfig().getOptionInt(plugin
-                    .getDomain(), "timeout"), 1) * 1000);
+            if (timeout != null) {
+                new Timer("OSD Display Timer").schedule(new TimerTask() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        osdManager.closeWindow(OsdWindow.this);
+                    }
+                }, Math.max(timeout, 1) * 1000);
+            }
         }
     }
 

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

@@ -40,7 +40,7 @@ defaults:
   bgcolour=2222aa
   fgcolour=ffffff
   fontSize=20
-  timeout=15
+  timeout=true:15
   width=500
   maxWindows=false:5