Make getActiveFrame optional.

activewindow/src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -73,11 +73,8 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final TextFrame frame = activeFrameManager.getActiveFrame();
-        if (frame.getContainer().isWritable()) {
-            frame.getContainer().getCommandParser().parseCommand(frame.getContainer(),
-                    args.getArgumentsAsString());
-        }
+        activeFrameManager.getActiveFrame().ifPresent(f -> f.getContainer().getCommandParser()
+                .parseCommand(f.getContainer(), args.getArgumentsAsString()));
     }
 
     @Override

activewindow/src/com/dmdirc/addons/activewindow/ActiveWindowMessageSink.java

@@ -62,10 +62,8 @@ public class ActiveWindowMessageSink implements MessageSink {
     public void handleMessage(final MessageSinkManager dispatcher,
             final FrameContainer source, final String[] patternMatches,
             final Date date, final String messageType, final Object... args) {
-        final TextFrame frame = activeFrameManager.getActiveFrame();
-        if (frame.getContainer().isWritable()) {
-            frame.getContainer().addLine(messageType, date, args);
-        }
+        activeFrameManager.getActiveFrame()
+                .ifPresent(f -> f.getContainer().addLine(messageType, date, args));
     }
 
 }

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -181,10 +181,10 @@ public class LagDisplayManager implements ConfigChangeListener {
         }
         final boolean useAlternate = ((FrameContainer) event.getConnection()).getConfigManager()
                 .getOptionBool(domain, "usealternate");
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
-        final boolean isActive = active != null && event.getConnection().equals(active.
-                getConnection());
+        final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().equals(event.getConnection());
         final String[] args = event.getArgs();
         if (useAlternate && args[3].startsWith("LAGCHECK_")) {
             try {
@@ -207,10 +207,10 @@ public class LagDisplayManager implements ConfigChangeListener {
 
     @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
-        final boolean isActive = active != null && event.getConnection().equals(active.
-                getConnection());
+        final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().equals(event.getConnection());
         if (isActive) {
                 panel.getComponent().setText("Not connected");
                 pings.remove(event.getConnection());
@@ -225,10 +225,10 @@ public class LagDisplayManager implements ConfigChangeListener {
                 getOptionBool(domain, "usealternate")) {
             return;
         }
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
-        final boolean isActive = active != null && event.getConnection().equals(active.
-                getConnection());
+        final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().equals(event.getConnection());
         final String value = formatTime(event.getPing());
 
         getHistory(event.getConnection()).add(event.getPing());
@@ -247,10 +247,10 @@ public class LagDisplayManager implements ConfigChangeListener {
                 getOptionBool(domain, "usealternate")) {
             return;
         }
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
-        final boolean isActive = active != null && event.getConnection().equals(active.
-                getConnection());
+        final boolean isActive = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().equals(event.getConnection());
         final String value = formatTime(event.getPing()) + '+';
 
         pings.put(event.getConnection(), value);

lagdisplay/src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -64,8 +64,12 @@ public class PingHistoryPanel extends JPanel {
         setOpaque(false);
 
         this.manager = manager;
-        history = manager.getHistory(activeFrameManager.getActiveFrame().getContainer().
-                getConnection());
+        if (activeFrameManager.getActiveFrame().isPresent()) {
+            history = manager.getHistory(activeFrameManager.getActiveFrame().get().getContainer()
+                    .getOptionalConnection().orElse(null));
+        } else {
+            history = manager.getHistory(null);
+        }
 
         for (Long value : history.getList()) {
             maximum = Math.max(value, maximum);

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

@@ -50,7 +50,7 @@ public class SimpleActiveFrameManager implements ActiveFrameManager {
     }
 
     @Override
-    public TextFrame getActiveFrame() {
-        return window.orElse(null);
+    public Optional<TextFrame> getActiveFrame() {
+        return window;
     }
 }

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

@@ -51,7 +51,7 @@ import net.engio.mbassy.listener.Handler;
  * Provides an MDI style bar for closing frames.
  */
 @Singleton
-public class MDIBar extends JPanel implements ActionListener, ConfigChangeListener {
+public class MDIBar extends JPanel implements ConfigChangeListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = -8028057596226636245L;
@@ -97,7 +97,8 @@ public class MDIBar extends JPanel implements ActionListener, ConfigChangeListen
 
         eventBus.subscribe(this);
 
-        closeButton.addActionListener(this);
+        closeButton.addActionListener(e -> activeFrameManager.getActiveFrame()
+                .ifPresent(f -> f.getContainer().close()));
         config.addChangeListener(configDomain, "mdiBarVisibility", this);
 
         check();
@@ -114,7 +115,7 @@ public class MDIBar extends JPanel implements ActionListener, ConfigChangeListen
     private void check() {
         SwingUtilities.invokeLater(() -> {
             setVisible(visibility);
-            setEnabled(activeFrameManager.getActiveFrame() != null);
+            setEnabled(activeFrameManager.getActiveFrame().isPresent());
         });
     }
 
@@ -128,16 +129,6 @@ public class MDIBar extends JPanel implements ActionListener, ConfigChangeListen
         check();
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (activeFrameManager.getActiveFrame() == null) {
-            return;
-        }
-        if (closeButton.equals(e.getSource())) {
-            activeFrameManager.getActiveFrame().getContainer().close();
-        }
-    }
-
     @Override
     public void configChanged(final String domain, final String key) {
         visibility = config.getOptionBool(configDomain, "mdiBarVisibility");

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -24,23 +24,18 @@ package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ClientModule;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Dialog;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -53,8 +48,7 @@ import javax.swing.event.MenuListener;
  * A menu to provide channel related commands in the menu bar.
  */
 @Singleton
-public class ChannelMenu extends JMenu implements ActionListener,
-        MenuListener {
+public class ChannelMenu extends JMenu implements MenuListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -99,65 +93,49 @@ public class ChannelMenu extends JMenu implements ActionListener,
         join = new JMenuItem();
         join.setText("Join Channel...");
         join.setMnemonic('j');
-        join.setActionCommand("JoinChannel");
-        join.addActionListener(this);
+        join.addActionListener(e -> joinChannel());
         add(join);
 
         csd = new JMenuItem();
         csd.setMnemonic('c');
         csd.setText("Channel Settings");
-        csd.setActionCommand("ChannelSettings");
-        csd.addActionListener(this);
+        csd.addActionListener(l -> showChannelSettings());
         add(csd);
 
         list = new JMenuItem();
         list.setText("List channels...");
         list.setMnemonic('l');
-        list.setActionCommand("ListChannels");
-        list.addActionListener(this);
+        list.addActionListener(e -> channelListDialogProvider.displayOrRequestFocus());
         add(list);
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        switch (e.getActionCommand()) {
-            case "JoinChannel":
-                new StandardInputDialog(mainFrame, Dialog.ModalityType.APPLICATION_MODAL,
-                        iconManager, "Join Channel", "Enter the name of the channel to join.",
-                        this::doJoinChannel).displayOrRequestFocus();
-                break;
-            case "ChannelSettings":
-                final FrameContainer activeWindow = activeFrameManager.getActiveFrame().
-                        getContainer();
-                if (activeWindow instanceof Channel) {
-                    dialogProvider.displayOrRequestFocus((Channel) activeWindow);
-                }
-                break;
-            case "ListChannels":
-                channelListDialogProvider.displayOrRequestFocus();
-                break;
-        }
+    private void joinChannel() {
+        new StandardInputDialog(mainFrame,
+                Dialog.ModalityType.APPLICATION_MODAL, iconManager, "Join Channel",
+                "Enter the name of the channel to join.", this::doJoinChannel)
+                .displayOrRequestFocus();
     }
 
-    private void doJoinChannel(final String text) {
-        if (activeFrameManager.getActiveFrame() != null) {
-            final Connection connection = activeFrameManager.getActiveFrame()
-                    .getContainer().getConnection();
-            if (connection != null) {
-                connection.join(new ChannelJoinRequest(text));
+    private void showChannelSettings() {
+        activeFrameManager.getActiveFrame().ifPresent(f -> {
+            if (f.getContainer() instanceof Channel) {
+                dialogProvider.displayOrRequestFocus((Channel) f.getContainer());
             }
-        }
+        });
+    }
+
+    private void doJoinChannel(final String text) {
+        activeFrameManager.getActiveFrame()
+                .ifPresent(f -> f.getContainer().getOptionalConnection()
+                        .ifPresent(c -> c.join(new ChannelJoinRequest(text))));
     }
 
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer activeWindow = activeFrame == null ? null
-                : activeFrame.getContainer();
-
-        final boolean connected = activeWindow != null
-                && activeWindow.getConnection() != null
-                && activeWindow.getConnection().getState() == ServerState.CONNECTED;
+        final boolean connected = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().getState() == ServerState.CONNECTED;
 
         join.setEnabled(connected);
         csd.setEnabled(connected);

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -22,10 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.newserver.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
@@ -34,9 +32,6 @@ import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.LifecycleController;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.swing.JMenu;
@@ -48,8 +43,7 @@ import javax.swing.event.MenuListener;
  * A menu providing server related commands to the menu bar.
  */
 @Singleton
-public class ServerMenu extends JMenu implements ActionListener,
-        MenuListener {
+public class ServerMenu extends JMenu implements MenuListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -57,13 +51,13 @@ public class ServerMenu extends JMenu implements ActionListener,
     private final ActiveFrameManager activeFrameManager;
     /** Lifecycle controller. */
     private final LifecycleController lifecycleController;
-    /** Menu items which can be enabled/disabled. */
-    private JMenuItem ssd;
-    private JMenuItem disconnect;
     /** Provider to use to retrieve NSD instances. */
     private final DialogProvider<NewServerDialog> newServerProvider;
     /** Provider for server settings dialogs. */
     private final KeyedDialogProvider<Connection, ServerSettingsDialog> ssdProvider;
+    /** Menu items which can be enabled/disabled. */
+    private JMenuItem ssd;
+    private JMenuItem disconnect;
 
     /**
      * Creates a new Server menu.
@@ -95,65 +89,43 @@ public class ServerMenu extends JMenu implements ActionListener,
      * Initialises the server menu.
      */
     private void initServerMenu() {
-        JMenuItem menuItem = new JMenuItem();
-        menuItem.setText("New Server...");
-        menuItem.setMnemonic('n');
-        menuItem.setActionCommand("NewServer");
-        menuItem.addActionListener(this);
-        add(menuItem);
+        final JMenuItem newServer = new JMenuItem();
+        newServer.setText("New Server...");
+        newServer.setMnemonic('n');
+        newServer.addActionListener(e -> newServerProvider.displayOrRequestFocus());
+        add(newServer);
 
         disconnect = new JMenuItem();
         disconnect.setText("Disconnect");
         disconnect.setMnemonic('d');
-        disconnect.setActionCommand("Disconnect");
-        disconnect.addActionListener(this);
+        disconnect.addActionListener(e -> activeFrameManager.getActiveFrame()
+                .ifPresent(f -> f.getContainer().getOptionalConnection()
+                        .ifPresent(c -> c.disconnect())));
         add(disconnect);
 
         ssd = new JMenuItem();
         ssd.setMnemonic('s');
         ssd.setText("Server settings");
-        ssd.setActionCommand("ServerSettings");
-        ssd.addActionListener(this);
+        ssd.addActionListener(e -> activeFrameManager.getActiveFrame()
+                .ifPresent(f -> f.getContainer().getOptionalConnection()
+                        .ifPresent(ssdProvider::displayOrRequestFocus)));
         add(ssd);
 
         if (!Apple.isAppleUI()) {
-            menuItem = new JMenuItem();
-            menuItem.setText("Exit");
-            menuItem.setMnemonic('x');
-            menuItem.setActionCommand("Exit");
-            menuItem.addActionListener(this);
-            add(menuItem);
-        }
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        switch (e.getActionCommand()) {
-            case "NewServer":
-                newServerProvider.displayOrRequestFocus();
-                break;
-            case "Exit":
-                lifecycleController.quit();
-                break;
-            case "ServerSettings":
-                ssdProvider.displayOrRequestFocus(
-                        activeFrameManager.getActiveFrame().getContainer().getConnection());
-                break;
-            case "Disconnect":
-                activeFrameManager.getActiveFrame().getContainer().getConnection().disconnect();
-                break;
+            final JMenuItem exit = new JMenuItem();
+            exit.setText("Exit");
+            exit.setMnemonic('x');
+            exit.addActionListener(e -> lifecycleController.quit());
+            add(exit);
         }
     }
 
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
-        final FrameContainer activeWindow = activeFrame == null ? null
-                : activeFrame.getContainer();
-
-        final boolean connected = activeWindow != null
-                && activeWindow.getConnection() != null
-                && activeWindow.getConnection().getState() == ServerState.CONNECTED;
+        final boolean connected = activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer().getOptionalConnection()
+                .isPresent() && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().get().getState() == ServerState.CONNECTED;
 
         ssd.setEnabled(connected);
         disconnect.setEnabled(connected);

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -32,6 +32,7 @@ import java.awt.event.ActionListener;
 
 import javax.inject.Inject;
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -43,7 +44,7 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
     /** Serial version UID. */
     private static final long serialVersionUID = 1L;
     /** List panel. */
-    private final ChannelListPanel list;
+    private final JPanel list;
     /** Size label. */
     private final JLabel total;
 
@@ -54,8 +55,14 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
         super(mainWindow, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
-        list = new ChannelListPanel(
-                activeFrameManager.getActiveFrame().getContainer().getConnection(), total);
+        if (activeFrameManager.getActiveFrame().isPresent()
+                && activeFrameManager.getActiveFrame().get().getContainer()
+                .getOptionalConnection().isPresent()) {
+            list = new ChannelListPanel(activeFrameManager.getActiveFrame().get()
+                    .getContainer().getOptionalConnection().get(), total);
+        } else {
+            list = new JPanel();
+        }
         layoutComponents();
         getCancelButton().setText("Close");
         getCancelButton().addActionListener(this);

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

@@ -319,8 +319,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             }
 
             if (activeFrameManager.getActiveFrame() != null) {
-                selectionChanged(new SwingWindowSelectedEvent(
-                        Optional.ofNullable(activeFrameManager.getActiveFrame())));
+                selectionChanged(new SwingWindowSelectedEvent(activeFrameManager.getActiveFrame()));
             }
         });
     }

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

@@ -43,7 +43,7 @@ import net.engio.mbassy.listener.Invoke;
 /**
  * A Menu item that closes the active window when triggered.
  */
-public class CloseActiveWindowMenuItem extends JMenuItem implements ActionListener {
+public class CloseActiveWindowMenuItem extends JMenuItem {
 
     private final ActiveFrameManager activeFrameManager;
     private final SwingEventBus eventBus;
@@ -67,15 +67,11 @@ public class CloseActiveWindowMenuItem extends JMenuItem implements ActionListen
      * Initialises the menu item adding listeners as required.
      */
     public void init() {
-        addActionListener(this);
+        addActionListener(l -> activeFrameManager.getActiveFrame()
+                .ifPresent(c -> c.getContainer().close()));
         eventBus.subscribe(this);
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        activeFrameManager.getActiveFrame().getContainer().close();
-    }
-
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
     public void windowAdded(final SwingWindowAddedEvent event) {
         setEnabled(true);

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

@@ -64,7 +64,7 @@ public class WindowMenuSeparator extends JPopupMenu.Separator implements ActionL
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        activeFrameManager.getActiveFrame().getContainer().close();
+        activeFrameManager.getActiveFrame().ifPresent(c -> c.getContainer().close());
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)

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

@@ -53,11 +53,9 @@ public class WindowSelectionFontChanger {
         this.window = window;
     }
 
-    public void init(final ActiveFrameManager activeFrameMaanger,
-            final SwingEventBus eventBus) {
+    public void init(final ActiveFrameManager activeFrameMaanger, final SwingEventBus eventBus) {
         eventBus.subscribe(this);
-        selectionChanged(new SwingWindowSelectedEvent(
-                Optional.ofNullable(activeFrameMaanger.getActiveFrame())));
+        selectionChanged(new SwingWindowSelectedEvent(activeFrameMaanger.getActiveFrame()));
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)

ui_swing/src/com/dmdirc/addons/ui_swing/interfaces/ActiveFrameManager.java

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_swing.interfaces;
 
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
+import java.util.Optional;
+
 /**
  * Interface to the management of the active window in the swing ui.
  */
@@ -34,5 +36,5 @@ public interface ActiveFrameManager {
      *
      * @return The active window
      */
-    TextFrame getActiveFrame();
+    Optional<TextFrame> getActiveFrame();
 }

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

@@ -90,13 +90,7 @@ public class WindowStatusManager implements ConfigChangeListener {
      * Loads the plugin.
      */
     public void onLoad() {
-        panel = UIUtilities.invokeAndWait(new Callable<WindowStatusPanel>() {
-
-            @Override
-            public WindowStatusPanel call() {
-                return new WindowStatusPanel();
-            }
-        });
+        panel = UIUtilities.invokeAndWait(WindowStatusPanel::new);
         eventBus.publishAsync(new StatusBarComponentAddedEvent(panel));
         swingEventBus.subscribe(this);
         identityController.getGlobalConfiguration().addChangeListener(domain, this);
@@ -132,11 +126,7 @@ public class WindowStatusManager implements ConfigChangeListener {
 
     /** Update the window status using the current active window. */
     public void updateStatus() {
-        final TextFrame active = activeFrameManager.getActiveFrame();
-
-        if (active != null) {
-            updateStatus(active.getContainer());
-        }
+        activeFrameManager.getActiveFrame().ifPresent(c -> updateStatus(c.getContainer()));
     }
 
     /**