OSD windows reuse space depending on policy.

Fixes issue 3619

Change-Id: Ieafb0fee528b8e43ccbbdc71c1a615d14d50ac4a
Reviewed-on: http://gerrit.dmdirc.com/629
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -91,7 +91,6 @@ public class OsdManager {
         OsdWindow currentWindow = new OsdWindow(message, false,
                 IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),
                 "locationX"), getYPosition(), plugin, this);
-
         windowList.add(currentWindow);
     }
 
@@ -102,9 +101,27 @@ public class OsdManager {
      * @param window The window that we are destroying.
      */
     public void closeWindow(final OsdWindow window) {
+        final String policy = IdentityManager.getGlobalConfig().getOption(
+                plugin.getDomain(), "newbehaviour");
+        final int startY = IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),
+                "locationY");
+
         windowList.remove(window);
         window.dispose();
 
+        synchronized (this) {
+            for (OsdWindow otherWindow : getWindowList()) {
+                if (otherWindow.isVisible()) {
+                    if ("down".equals(policy)) {
+                        otherWindow.setLocation(otherWindow.getX(), Math.max(startY,
+                                otherWindow.getY() - otherWindow.getHeight() - WINDOW_GAP));
+                    } else if ("up".equals(policy)) {
+                        otherWindow.setLocation(otherWindow.getX(), Math.min(startY,
+                                otherWindow.getY() + otherWindow.getHeight() + WINDOW_GAP));
+                    }
+                }
+            }
+        }
         displayWindows();
     }
 
@@ -141,7 +158,7 @@ public class OsdManager {
      *
      * @return the Y position for the next window.
      */
-    public int getYPosition() {
+    private int getYPosition() {
         final String policy = IdentityManager.getGlobalConfig().getOption(
                 plugin.getDomain(), "newbehaviour");
         int y = IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),

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

@@ -133,7 +133,6 @@ public final class OsdWindow extends JDialog implements MouseListener,
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    setVisible(false);
                     osdManager.closeWindow(OsdWindow.this);
                 }
             }, IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),
@@ -150,7 +149,6 @@ public final class OsdWindow extends JDialog implements MouseListener,
     @Override
     public void mouseClicked(final MouseEvent e) {
         if (!config) {
-            setVisible(false);
             osdManager.closeWindow(this);
         }
     }