Plugin support for optional FrameContainer parents

Change-Id: Ief9fccad45d654ffaee9d7a124ebc39f7af56166
Depends-On: Ibaf13d210cd01e73adf08bac359244b14faef088
Reviewed-on: http://gerrit.dmdirc.com/3469
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -28,6 +28,7 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
+import com.google.common.base.Optional;
 import com.google.common.eventbus.EventBus;
 
 import java.util.Arrays;
@@ -64,7 +65,8 @@ public class HistoryWindow extends FrameContainer {
 
     @Override
     public Connection getConnection() {
-        return getParent() == null ? null : getParent().getConnection();
+        final Optional<FrameContainer> parent = getParent();
+        return parent.isPresent() ? parent.get().getConnection() : null;
     }
 
 }

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -44,6 +44,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -200,7 +201,7 @@ public class SwingWindowFactory implements FrameListener {
      *
      * @return A relevant window or null
      */
-    public TextFrame getSwingWindow(final FrameContainer window) {
+    public TextFrame getSwingWindow(@Nullable final FrameContainer window) {
         return windows.get(window);
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -219,7 +219,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         TextFrame parentWindow;
         for (FrameContainer frame : windowCollection) {
             window = windowFactory.getSwingWindow(frame);
-            parentWindow = windowFactory.getSwingWindow(frame.getParent());
+            parentWindow = windowFactory.getSwingWindow(frame.getParent().orNull());
             if (window != null) {
                 windowAdded(parentWindow, window);
             }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -29,6 +29,8 @@ import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.ui.messages.Styliser;
 
+import com.google.common.base.Optional;
+
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -117,9 +119,9 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
     public void selectionChanged(final TextFrame window) {
         if (frame.equals(window.getContainer())) {
             setFont(getFont().deriveFont(Font.BOLD));
-            final FrameContainer parentWindow = window.getContainer().getParent();
-            if (parentWindow != null) {
-                manager.parentSelection(parentWindow);
+            final Optional<FrameContainer> parentWindow = window.getContainer().getParent();
+            if (parentWindow.isPresent()) {
+                manager.parentSelection(parentWindow.get());
             }
         } else {
             setFont(getFont().deriveFont(Font.PLAIN));

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -36,6 +36,8 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.base.Optional;
+
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -267,13 +269,9 @@ public class WindowMenuFrameManager extends JMenu implements
     }
 
     private JMenu getParentMenu(final FrameContainer window) {
-        final FrameContainer parent = window.getParent();
+        final Optional<FrameContainer> parent = window.getParent();
 
-        if (parent == null) {
-            return this;
-        } else {
-            return menus.get(parent);
-        }
+        return parent.isPresent() ? menus.get(parent.get()) : this;
     }
 
     private void replaceItemWithMenu(final JMenu parentMenu,

src/com/dmdirc/addons/ui_web/Client.java

@@ -62,7 +62,7 @@ public class Client {
         while (!queued.isEmpty()) {
             final Window window = queued.remove(0);
             final Window parent = controller.getWindowManager()
-                    .getWindow(window.getContainer().getParent());
+                    .getWindow(window.getContainer().getParent().orNull());
 
             if (parent == null) {
                 events.add(new Event("newwindow", window));

src/com/dmdirc/addons/ui_web/WebWindowManager.java

@@ -39,6 +39,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * Manages WebUI windows.
  */
@@ -96,7 +98,7 @@ public class WebWindowManager implements FrameListener {
      *
      * @return The corresponding web window, or null if there is none
      */
-    public WebWindow getWindow(final FrameContainer container) {
+    public WebWindow getWindow(@Nullable final FrameContainer container) {
         return windows.get(container);
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -35,6 +35,8 @@ import com.dmdirc.ui.messages.IRCDocumentListener;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 import com.dmdirc.ui.messages.Styliser;
 
+import com.google.common.base.Optional;
+
 import java.awt.Color;
 import java.awt.font.TextAttribute;
 import java.text.AttributedCharacterIterator;
@@ -70,12 +72,13 @@ public class WebWindow implements Window, IRCDocumentListener,
         parent.addFrameInfoListener(this);
         parent.addCloseListener(this);
 
-        if (parent.getParent() == null) {
-            handler.addEvent(new Event("newwindow", this));
-        } else {
+        final Optional<FrameContainer> grandParent = parent.getParent();
+        if (grandParent.isPresent()) {
             handler.addEvent(new Event("newchildwindow",
                     new Object[]{controller.getWindowManager().getWindow(
-                                parent.getParent()), this}));
+                                grandParent.get()), this}));
+        } else {
+            handler.addEvent(new Event("newwindow", this));
         }
     }