|
@@ -33,7 +33,6 @@ import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
|
33
|
33
|
import com.dmdirc.addons.ui_swing.events.SwingEventBus;
|
34
|
34
|
import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
|
35
|
35
|
import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
|
36
|
|
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
|
37
|
36
|
import com.dmdirc.events.UserErrorEvent;
|
38
|
37
|
import com.dmdirc.interfaces.ui.FrameListener;
|
39
|
38
|
import com.dmdirc.logger.ErrorLevel;
|
|
@@ -46,7 +45,6 @@ import java.util.Set;
|
46
|
45
|
|
47
|
46
|
import javax.annotation.Nullable;
|
48
|
47
|
import javax.inject.Inject;
|
49
|
|
-import javax.inject.Provider;
|
50
|
48
|
import javax.inject.Singleton;
|
51
|
49
|
|
52
|
50
|
/**
|
|
@@ -61,8 +59,6 @@ public class SwingWindowFactory implements FrameListener {
|
61
|
59
|
private final Map<Collection<String>, WindowProvider> implementations = new HashMap<>();
|
62
|
60
|
/** A map of frame containers to their Swing windows. */
|
63
|
61
|
private final Map<FrameContainer, TextFrame> windows = new HashMap<>();
|
64
|
|
- /** Active window manager. */
|
65
|
|
- private final Provider<ActiveFrameManager> activeFrameManager;
|
66
|
62
|
/** The event bus to post errors to. */
|
67
|
63
|
private final DMDircMBassador eventBus;
|
68
|
64
|
/** The swing event bus. */
|
|
@@ -71,7 +67,6 @@ public class SwingWindowFactory implements FrameListener {
|
71
|
67
|
/**
|
72
|
68
|
* Creates a new window factory for the specified controller.
|
73
|
69
|
*
|
74
|
|
- * @param activeFrameManager The provider for the active frame manager.
|
75
|
70
|
* @param customFrameFactory The factory to use to produce custom frames.
|
76
|
71
|
* @param customInputFrameFactory The factory to use to produce custom input frames.
|
77
|
72
|
* @param serverFrameFactory The factory to use to produce server frames.
|
|
@@ -81,14 +76,12 @@ public class SwingWindowFactory implements FrameListener {
|
81
|
76
|
*/
|
82
|
77
|
@Inject
|
83
|
78
|
public SwingWindowFactory(
|
84
|
|
- final Provider<ActiveFrameManager> activeFrameManager,
|
85
|
79
|
final CustomFrameFactory customFrameFactory,
|
86
|
80
|
final CustomInputFrameFactory customInputFrameFactory,
|
87
|
81
|
final ServerFrameFactory serverFrameFactory,
|
88
|
82
|
final ChannelFrameFactory channelFrameFactory,
|
89
|
83
|
final DMDircMBassador eventBus,
|
90
|
84
|
final SwingEventBus swingEventBus) {
|
91
|
|
- this.activeFrameManager = activeFrameManager;
|
92
|
85
|
this.eventBus = eventBus;
|
93
|
86
|
this.swingEventBus = swingEventBus;
|
94
|
87
|
|