Stop using Window and InputWindow.

These interfaces are basically pointless.

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -44,7 +44,6 @@ import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
@@ -62,9 +61,8 @@ import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
-import net.miginfocom.swing.MigLayout;
-
 import net.engio.mbassy.listener.Handler;
+import net.miginfocom.swing.MigLayout;
 
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 import static java.util.function.Predicate.isEqual;
@@ -521,7 +519,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
     @Handler(invocation = EdtHandlerInvocation.class)
     public void titleChanged(final FrameTitleChangedEvent event) {
         checkOnEDT();
-        activeFrame.map(Window::getContainer)
+        activeFrame.map(TextFrame::getContainer)
                 .filter(isEqual(event.getContainer()))
                 .ifPresent(c -> setTitle(event.getTitle()));
     }
@@ -529,7 +527,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
     @Handler(invocation = EdtHandlerInvocation.class)
     public void unreadStatusChanged(final UnreadStatusChangedEvent event) {
         checkOnEDT();
-        activeFrame.map(Window::getContainer)
+        activeFrame.map(TextFrame::getContainer)
                 .filter(isEqual(event.getSource()))
                 .ifPresent(c -> event.getManager().clearStatus());
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/SwingLinkHandler.java

@@ -61,7 +61,7 @@ public class SwingLinkHandler {
 
     @Handler
     public void handleChannelClick(final LinkChannelClickedEvent event) {
-        final WindowModel container = event.getWindow().getContainer();
+        final WindowModel container = event.getWindow();
         container.getConnection()
                 .map(Connection::getGroupChatManager)
                 .ifPresent(c -> c.join(new ChannelJoinRequest(event.getTarget())));
@@ -74,7 +74,7 @@ public class SwingLinkHandler {
 
     @Handler
     public void handleNicknameClick(final LinkNicknameClickedEvent event) {
-        final WindowModel container = event.getWindow().getContainer();
+        final WindowModel container = event.getWindow();
         container.getConnection().ifPresent(c ->
                 eventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.ofNullable(
                         windowFactory.getSwingWindow(c.getQuery(event.getTarget()))))));

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/WindowComparator.java

@@ -23,15 +23,15 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.WindowModelComparator;
-import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
 /**
- * Compares {@link Window}s by name.
+ * Compares {@link TextFrame}s by name.
  */
-public class WindowComparator implements Comparator<Window>, Serializable {
+public class WindowComparator implements Comparator<TextFrame>, Serializable {
 
     private static final long serialVersionUID = 1L;
     private final WindowModelComparator comparator;
@@ -41,7 +41,7 @@ public class WindowComparator implements Comparator<Window>, Serializable {
     }
 
     @Override
-    public int compare(final Window item1, final Window item2) {
+    public int compare(final TextFrame item1, final TextFrame item2) {
         return comparator.compare(item1.getContainer(), item2.getContainer());
     }
 }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/Input.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
+import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,7 +33,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -73,10 +73,10 @@ public class Input extends Command implements IntelligentCommand {
                     "[--clear] <text to insert into inputfield");
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            ((InputWindow) windowFactory.getSwingWindow(origin))
+            ((InputTextFrame) windowFactory.getSwingWindow(origin))
                     .getInputHandler().clearInputField();
         } else {
-            ((InputWindow) windowFactory.getSwingWindow(origin))
+            ((InputTextFrame) windowFactory.getSwingWindow(origin))
                     .getInputHandler().addToInputField(args
                             .getArgumentsAsString());
         }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -143,7 +143,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         topicLengthMax = channel.getMaxTopicLength();
         updateOptions();
         errorIcon = new JLabel(iconManager.getIcon("input-error"));
-        topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
+        topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window.getContainer()));
         ((AbstractDocument) topicText.getDocument()).setDocumentFilter(
                 new NewlinesDocumentFilter());
 
@@ -425,7 +425,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         setVisible(showBar);
         cancelTopicEdit();
         if ("showfulltopic".equals(key)) {
-            topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
+            topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window.getContainer()));
             ((AbstractDocument) topicText.getDocument()).setDocumentFilter(
                     new NewlinesDocumentFilter());
             topicChanged(channel, null);

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -35,7 +35,6 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -57,7 +56,7 @@ import net.miginfocom.layout.PlatformDefaults;
 /**
  * Frame with an input field.
  */
-public abstract class InputTextFrame extends TextFrame implements InputWindow, MouseListener {
+public abstract class InputTextFrame extends TextFrame implements MouseListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
@@ -187,7 +186,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
      *
      * @return Input handlers for this frame
      */
-    @Override
     public final InputHandler getInputHandler() {
         return inputHandler;
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBarFactory;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
@@ -59,9 +60,7 @@ import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -84,14 +83,13 @@ import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
-import net.miginfocom.swing.MigLayout;
-
 import net.engio.mbassy.listener.Handler;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Implements a generic (internal) frame.
  */
-public abstract class TextFrame extends JPanel implements Window, TextPaneListener {
+public abstract class TextFrame extends JPanel implements TextPaneListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 5;
@@ -268,8 +266,12 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
         getActionMap().put("homeAction", new TextPaneHomeAction(getTextPane()));
         getActionMap().put("endAction", new TextPaneEndAction(getTextPane()));
     }
-    
-    @Override
+
+    /**
+     * Gets the core model for this window.
+     *
+     * @return This window's model
+     */
     public WindowModel getContainer() {
         return frameParent;
     }
@@ -301,13 +303,13 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
         if (eventType == MouseEventType.CLICK && event.getButton() == MouseEvent.BUTTON1) {
             switch (clicktype.getType()) {
                 case CHANNEL:
-                    eventBus.publishAsync(new LinkChannelClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkChannelClickedEvent(getContainer(), clicktype.getValue()));
                     break;
                 case NICKNAME:
-                    eventBus.publishAsync(new LinkNicknameClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkNicknameClickedEvent(getContainer(), clicktype.getValue()));
                     break;
                 case HYPERLINK:
-                    eventBus.publishAsync(new LinkUrlClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkUrlClickedEvent(getContainer(), clicktype.getValue()));
                     break;
                 case NORMAL:
                     //Ignore normal clicks

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/text/WrapEditorKit.java

@@ -11,7 +11,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
-import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 
 import java.awt.Cursor;
@@ -47,7 +47,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
     /** Event bus to fire link click events on. */
     private final DMDircMBassador eventBus;
     /** The window this editor kit is used in. */
-    private final Window window;
+    private final WindowModel window;
 
     /**
      * Initialises a new wrapping editor kit.
@@ -56,7 +56,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
      * @param eventBus Event bus to raise hyperlink events on
      * @param window   Window as source for hyperlink events
      */
-    public WrapEditorKit(final boolean wrapping, final DMDircMBassador eventBus, final Window window) {
+    public WrapEditorKit(final boolean wrapping, final DMDircMBassador eventBus, final WindowModel window) {
         this.window = window;
         this.eventBus = eventBus;
         wrap = wrapping;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -32,9 +32,9 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -66,7 +66,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     /** Channel identity file. */
     private final ConfigProvider identity;
     /** Channel window. */
-    private final InputWindow channelWindow;
+    private final WindowModel channelWindow;
     private final IconManager iconManager;
     /** Tabbed pane. */
     private JTabbedPane tabbedPane;
@@ -135,7 +135,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
 
         identity = identityFactory.createChannelConfig(groupChat.getConnection().get().getNetwork(),
                 groupChat.getName());
-        channelWindow = (InputWindow) windowFactory.getSwingWindow(groupChat.getWindowModel());
+        channelWindow = groupChat.getWindowModel();
 
         initComponents(tabCompleterUtils);
         initListeners();

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -32,8 +32,8 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -64,7 +64,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
     /** Associated group chat. */
     private final GroupChat groupChat;
     /** Channel window. */
-    private final InputWindow channelWindow;
+    private final WindowModel channelWindow;
     /** the maximum length allowed for a topic. */
     private final int topicLengthMax;
     /** Clipboard to copy and paste from. */
@@ -90,7 +90,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
      */
     public TopicDisplayPane(final GroupChat groupChat, final IconManager iconManager,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
-            final InputWindow channelWindow, final Clipboard clipboard,
+            final WindowModel channelWindow, final Clipboard clipboard,
             final CommandController commandController,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
@@ -127,7 +127,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         final SwingInputHandler handler = new SwingInputHandler(serviceManager, topicText,
                 commandController,
                 groupChat.getWindowModel().getInputModel().get().getCommandParser(),
-                channelWindow.getContainer(), tabCompleterUtils, groupChat.getEventBus());
+                channelWindow, tabCompleterUtils, groupChat.getEventBus());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(groupChat.getWindowModel().getInputModel().get().getTabCompleter());
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -49,7 +49,7 @@ public class TopicPane extends JPanel implements ActionListener {
     /** Parent group chat. */
     private final GroupChat groupChat;
     /** Channel window. */
-    private final InputWindow channelWindow;
+    private final WindowModel channelWindow;
     /** Parent dialog. */
     private final ChannelSettingsDialog parent;
     /** Clipboard to copy and paste with. */
@@ -73,7 +73,7 @@ public class TopicPane extends JPanel implements ActionListener {
     public TopicPane(final GroupChat groupChat, final IconManager iconManager,
             final CommandController commandController,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
-            final InputWindow channelWindow, final Clipboard clipboard,
+            final WindowModel channelWindow, final Clipboard clipboard,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -42,7 +42,6 @@ import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
@@ -67,14 +66,13 @@ import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
+import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
-
 /**
  * Manages open windows in the application in a tree style view.
  */
@@ -84,7 +82,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     /** Serial version UID. */
     private static final long serialVersionUID = 5;
     /** node storage, used for adding and deleting nodes correctly. */
-    private final Map<Window, TreeViewNode> nodes;
+    private final Map<TextFrame, TreeViewNode> nodes;
     /** Configuration manager. */
     private final AggregateConfigProvider config;
     /** Colour manager. */

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewModel.java

@@ -108,8 +108,7 @@ public class TreeViewModel extends DefaultTreeModel {
      * @return True iff newChild should be sorted before child
      */
     private boolean sortBefore(final TreeViewNode newChild, final TreeViewNode child) {
-        return comparator.compare(newChild.getWindow(), child.
-                getWindow()) <= -1;
+        return comparator.compare(newChild.getWindow(), child.getWindow()) <= -1;
     }
 
     /**
@@ -122,8 +121,7 @@ public class TreeViewModel extends DefaultTreeModel {
      * @return True iff newChild should be sorted before child
      */
     private boolean sortAfter(final TreeViewNode newChild, final TreeViewNode child) {
-        return comparator.compare(newChild.getWindow(), child.
-                getWindow()) >= 1;
+        return comparator.compare(newChild.getWindow(), child.getWindow()) >= 1;
     }
 
     /**

windowstatus/src/main/java/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -27,6 +27,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
@@ -45,7 +46,6 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 
@@ -113,7 +113,7 @@ public class WindowStatusManager {
 
     @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
-        event.getWindow().map(Window::getContainer).ifPresent(this::updateStatus);
+        event.getWindow().map(TextFrame::getContainer).ifPresent(this::updateStatus);
     }
 
     /** Update the window status using the current active window. */