Deprecated methods, new ListenerList usage

Change-Id: I58916a0dedd6c8e737f593279b4c91a01f1ba2f0
Reviewed-on: http://gerrit.dmdirc.com/1126
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -39,9 +39,6 @@ public class HistoryWindow extends FrameContainer {
     /** The window we're using. */
     private Window window;
 
-    /** Our parent window. */
-    private Window parent;
-
     /**
      * Creates a new HistoryWindow.
      *
@@ -51,14 +48,14 @@ public class HistoryWindow extends FrameContainer {
      * @param numLines The number of lines to show
      */
     public HistoryWindow(final String title, final ReverseFileReader reader,
-                         final Window parent, final int numLines) {
+                         final FrameContainer parent, final int numLines) {
         super("raw", title, title, parent.getConfigManager());
 
         this.parent = parent;
 
         window = Main.getUI().getWindow(this);
 
-        WindowManager.addWindow(parent, window);
+        WindowManager.addWindow(parent, this);
         window.open();
         final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
                 "ui", "frameBufferSize");
@@ -97,7 +94,7 @@ public class HistoryWindow extends FrameContainer {
     /** {@inheritDoc} */
     @Override
     public Server getServer() {
-        return parent == null ? null : parent.getContainer().getServer();
+        return parent == null ? null : parent.getServer();
     }
 
 }

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

@@ -838,7 +838,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
             return false;
         }
 
-        new HistoryWindow("History", reader, target, historyLines);
+        new HistoryWindow("History", reader, target.getContainer(), historyLines);
 
         return true;
     }

src/com/dmdirc/addons/redirect/FakeInputWindow.java

@@ -28,10 +28,8 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.StringTranscoder;
 
-import java.beans.PropertyVetoException;
 import java.nio.charset.Charset;
 
 /**
@@ -95,6 +93,7 @@ public class FakeInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void clear() {
         // Do nothing
     }
@@ -137,6 +136,7 @@ public class FakeInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setTitle(final String title) {
         // Do nothing
     }
@@ -149,6 +149,7 @@ public class FakeInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public StringTranscoder getTranscoder() {
         return new StringTranscoder(Charset.defaultCharset());
     }

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -102,6 +102,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void clear() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
@@ -153,6 +154,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setTitle(final String title) {
         this.title = title;
     }
@@ -165,6 +167,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public StringTranscoder getTranscoder() {
         return new StringTranscoder(Charset.defaultCharset());
     }

src/com/dmdirc/addons/ui_swing/components/OptionalJSpinner.java

@@ -176,9 +176,7 @@ public class OptionalJSpinner extends JPanel implements ActionListener,
      * @param listener Listener to add
      */
     public void addChangeListener(final ChangeListener listener) {
-        synchronized (listeners) {
-            listeners.add(ChangeListener.class, listener);
-        }
+        listeners.add(ChangeListener.class, listener);
     }
 
     /**
@@ -187,9 +185,7 @@ public class OptionalJSpinner extends JPanel implements ActionListener,
      * @param listener Listener to remove
      */
     public void removeChangeListener(final ChangeListener listener) {
-        synchronized (listeners) {
-            listeners.remove(ChangeListener.class, listener);
-        }
+        listeners.remove(ChangeListener.class, listener);
     }
 
     private void fireChangeListener() {

src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java

@@ -37,7 +37,6 @@ import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
-import javax.swing.UIManager;
 
 import net.miginfocom.swing.MigLayout;
 

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -182,12 +182,11 @@ public class DurationDisplay extends JPanel implements ActionListener,
      * @param listener Listener to add
      */
     public void addDurationListener(final DurationListener listener) {
-        synchronized (listeners) {
-            if (listener == null) {
-                return;
-            }
-            listeners.add(DurationListener.class, listener);
+        if (listener == null) {
+            return;
         }
+
+        listeners.add(DurationListener.class, listener);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -195,12 +195,11 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      * @param listener Listener to add
      */
     public void addDurationListener(final DurationListener listener) {
-        synchronized (listeners) {
-            if (listener == null) {
-                return;
-            }
-            listeners.add(DurationListener.class, listener);
+        if (listener == null) {
+            return;
         }
+
+        listeners.add(DurationListener.class, listener);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java

@@ -252,9 +252,7 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param listener
      */
     public void addStepListener(final StepListener listener) {
-        synchronized (stepListeners) {
-            stepListeners.add(StepListener.class, listener);
-        }
+        stepListeners.add(StepListener.class, listener);
     }
 
     /**
@@ -263,9 +261,7 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param listener
      */
     public void removeStepListener(final StepListener listener) {
-        synchronized (stepListeners) {
-            stepListeners.remove(StepListener.class, listener);
-        }
+        stepListeners.remove(StepListener.class, listener);
     }
 
     /**
@@ -274,9 +270,7 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param listener
      */
     public void addWizardListener(final WizardListener listener) {
-        synchronized (stepListeners) {
-            stepListeners.add(WizardListener.class, listener);
-        }
+        stepListeners.add(WizardListener.class, listener);
     }
 
     /**
@@ -285,9 +279,7 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param listener
      */
     public void removeWizardListener(final WizardListener listener) {
-        synchronized (stepListeners) {
-            stepListeners.remove(WizardListener.class, listener);
-        }
+        stepListeners.remove(WizardListener.class, listener);
     }
 
     /**
@@ -296,12 +288,8 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param step Step to be displayed
      */
     private void fireStepAboutToBeDisplayed(final Step step) {
-        synchronized (stepListeners) {
-            List<StepListener> listeners =
-                    stepListeners.get(StepListener.class);
-            for (StepListener listener : listeners) {
-                listener.stepAboutToDisplay(step);
-            }
+        for (StepListener listener : stepListeners.get(StepListener.class)) {
+            listener.stepAboutToDisplay(step);
         }
     }
 
@@ -311,12 +299,8 @@ public class WizardPanel extends JPanel implements ActionListener {
      * @param step step thats been hidden
      */
     private void fireStepHidden(final Step step) {
-        synchronized (stepListeners) {
-            List<StepListener> listeners =
-                    stepListeners.get(StepListener.class);
-            for (StepListener listener : listeners) {
-                listener.stepHidden(step);
-            }
+        for (StepListener listener : stepListeners.get(StepListener.class)) {
+            listener.stepHidden(step);
         }
     }
 
@@ -324,12 +308,8 @@ public class WizardPanel extends JPanel implements ActionListener {
      * Fires wizard finished events.
      */
     private void fireWizardFinished() {
-        synchronized (stepListeners) {
-            List<WizardListener> listeners =
-                    stepListeners.get(WizardListener.class);
-            for (WizardListener listener : listeners) {
-                listener.wizardFinished();
-            }
+        for (WizardListener listener : stepListeners.get(WizardListener.class)) {
+            listener.wizardFinished();
         }
     }
 
@@ -337,12 +317,8 @@ public class WizardPanel extends JPanel implements ActionListener {
      * Fires wizard cancelled events.
      */
     protected void fireWizardCancelled() {
-        synchronized (stepListeners) {
-            List<WizardListener> listeners =
-                    stepListeners.get(WizardListener.class);
-            for (WizardListener listener : listeners) {
-                listener.wizardCancelled();
-            }
+        for (WizardListener listener : stepListeners.get(WizardListener.class)) {
+            listener.wizardCancelled();
         }
     }
 }