OSD Space recycling fix - no longer spazzes out when user clicks an osd closed. Also re-added Stylized to remove control codes

Change-Id: I44dc5a45eef0577f1d83d522beb61848f5d09dc3
Reviewed-on: http://gerrit.dmdirc.com/639
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import com.dmdirc.ui.messages.Styliser;
 import java.util.List;
 
 /**
@@ -65,7 +66,7 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
      * @return True if the notification was shown.
      */
     public boolean showOSD(final String title, final String message) {
-        osdManager.showWindow(message);
+        osdManager.showWindow(Styliser.stipControlCodes(message));
         return true;
     }
 

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

@@ -109,27 +109,30 @@ public class OsdManager {
     public void closeWindow(final OsdWindow window) {
         final String policy = IdentityManager.getGlobalConfig().getOption(
                 plugin.getDomain(), "newbehaviour");
-        final int startY = IdentityManager.getGlobalConfig().getOptionInt(plugin.
-                getDomain(), "locationY");
 
         synchronized (OsdManager.this) {
             UIUtilities.invokeAndWait(new Runnable() {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
+                    int oldY = window.getY();
+                    final int closedIndex = windowList.indexOf(window);
+
+                    if (closedIndex == -1) {
+                        return;
+                    }
+
                     windowList.remove(window);
                     window.dispose();
-                    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));
-                            }
+
+                    final List<OsdWindow> newList = getWindowList();
+
+                    for (OsdWindow otherWindow : newList.subList(closedIndex, newList.size())) {
+                        final int currentY = otherWindow.getY();
+
+                        if ("down".equals(policy) || "up".equals(policy)) {
+                                otherWindow.setLocation(otherWindow.getX(), oldY);
+                                oldY = currentY;
                         }
                     }
                 }
@@ -142,8 +145,7 @@ public class OsdManager {
      * Destroy all OSD Windows.
      */
     public void closeAll() {
-        for (OsdWindow window : new ArrayList<OsdWindow>(windowList)) {
-            window.setVisible(false);
+        for (OsdWindow window : getWindowList()) {
             closeWindow(window);
         }
     }
@@ -179,14 +181,14 @@ public class OsdManager {
 
         if ("down".equals(policy)) {
             // Place our new window below old windows
-            for (OsdWindow window : new ArrayList<OsdWindow>(getWindowList())) {
+            for (OsdWindow window : getWindowList()) {
                 if (window.isVisible()) {
                     y = Math.max(y, window.getY() + window.getHeight() + WINDOW_GAP);
                 }
             }
         } else if ("up".equals(policy)) {
             // Place our new window above old windows
-            for (OsdWindow window : new ArrayList<OsdWindow>(getWindowList())) {
+            for (OsdWindow window : getWindowList()) {
                 if (window.isVisible()) {
                     y = Math.min(y, window.getY() - window.getHeight() - WINDOW_GAP);
                 }