|
@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
|
32
|
32
|
import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
|
33
|
33
|
import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
|
34
|
34
|
import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
|
|
35
|
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
|
35
|
36
|
import com.dmdirc.events.ClientFocusGainedEvent;
|
36
|
37
|
import com.dmdirc.events.ClientFocusLostEvent;
|
37
|
38
|
import com.dmdirc.events.ClientMinimisedEvent;
|
|
@@ -71,7 +72,7 @@ import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
|
71
|
72
|
*/
|
72
|
73
|
public class MainFrame extends JFrame implements WindowListener,
|
73
|
74
|
ConfigChangeListener, SwingWindowListener, FrameInfoListener,
|
74
|
|
- NotificationListener {
|
|
75
|
+ NotificationListener, ActiveFrameManager {
|
75
|
76
|
|
76
|
77
|
/** A version number for this class. */
|
77
|
78
|
private static final long serialVersionUID = 9;
|
|
@@ -212,15 +213,6 @@ public class MainFrame extends JFrame implements WindowListener,
|
212
|
213
|
}
|
213
|
214
|
}
|
214
|
215
|
|
215
|
|
- /**
|
216
|
|
- * Returns the window that is currently active.
|
217
|
|
- *
|
218
|
|
- * @return The active window
|
219
|
|
- */
|
220
|
|
- public TextFrame getActiveFrame() {
|
221
|
|
- return activeFrame;
|
222
|
|
- }
|
223
|
|
-
|
224
|
216
|
@Override
|
225
|
217
|
public MenuBar getJMenuBar() {
|
226
|
218
|
return (MenuBar) super.getJMenuBar();
|
|
@@ -565,11 +557,12 @@ public class MainFrame extends JFrame implements WindowListener,
|
565
|
557
|
}
|
566
|
558
|
}
|
567
|
559
|
|
568
|
|
- /**
|
569
|
|
- * Changes the visible frame.
|
570
|
|
- *
|
571
|
|
- * @param activeFrame The frame to be activated, or null to show none
|
572
|
|
- */
|
|
560
|
+ @Override
|
|
561
|
+ public TextFrame getActiveFrame() {
|
|
562
|
+ return activeFrame;
|
|
563
|
+ }
|
|
564
|
+
|
|
565
|
+ @Override
|
573
|
566
|
public void setActiveFrame(final TextFrame activeFrame) {
|
574
|
567
|
UIUtilities.invokeLater(new Runnable() {
|
575
|
568
|
|
|
@@ -611,26 +604,12 @@ public class MainFrame extends JFrame implements WindowListener,
|
611
|
604
|
});
|
612
|
605
|
}
|
613
|
606
|
|
614
|
|
- /**
|
615
|
|
- * Registers a new selection listener with this frame. The listener will be notified whenever
|
616
|
|
- * the currently selected frame is changed.
|
617
|
|
- *
|
618
|
|
- * @param listener The listener to be added
|
619
|
|
- *
|
620
|
|
- * @see #setActiveFrame(com.dmdirc.addons.ui_swing.components.frames.TextFrame)
|
621
|
|
- * @see #getActiveFrame()
|
622
|
|
- */
|
|
607
|
+ @Override
|
623
|
608
|
public void addSelectionListener(final SelectionListener listener) {
|
624
|
609
|
listeners.add(SelectionListener.class, listener);
|
625
|
610
|
}
|
626
|
611
|
|
627
|
|
- /**
|
628
|
|
- * Removes a previously registered selection listener.
|
629
|
|
- *
|
630
|
|
- * @param listener The listener to be removed
|
631
|
|
- *
|
632
|
|
- * @see #addSelectionListener(com.dmdirc.addons.ui_swing.SelectionListener)
|
633
|
|
- */
|
|
612
|
+ @Override
|
634
|
613
|
public void removeSelectionListener(final SelectionListener listener) {
|
635
|
614
|
listeners.remove(SelectionListener.class, listener);
|
636
|
615
|
}
|