Преглед на файлове

Make WindowManager use WindowModel.

pull/362/head
Chris Smith преди 9 години
родител
ревизия
d232e15c99

+ 3
- 2
dcc/src/com/dmdirc/addons/dcc/PlaceholderContainer.java Целия файл

26
 import com.dmdirc.FrameContainer;
26
 import com.dmdirc.FrameContainer;
27
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
27
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
28
 import com.dmdirc.interfaces.Connection;
28
 import com.dmdirc.interfaces.Connection;
29
+import com.dmdirc.interfaces.WindowModel;
29
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
 import com.dmdirc.ui.messages.BackBufferFactory;
31
 import com.dmdirc.ui.messages.BackBufferFactory;
31
 
32
 
68
     @Override
69
     @Override
69
     public void close() {
70
     public void close() {
70
         int dccs = 0;
71
         int dccs = 0;
71
-        for (FrameContainer window : getChildren()) {
72
+        for (WindowModel window : getChildren()) {
72
             if (window instanceof TransferContainer
73
             if (window instanceof TransferContainer
73
                     && ((TransferContainer) window).getDCC().isActive()
74
                     && ((TransferContainer) window).getDCC().isActive()
74
                     || window instanceof ChatContainer
75
                     || window instanceof ChatContainer
95
     }
96
     }
96
 
97
 
97
     @Override
98
     @Override
98
-    public void removeChild(final FrameContainer child) {
99
+    public void removeChild(final WindowModel child) {
99
         super.removeChild(child);
100
         super.removeChild(child);
100
 
101
 
101
         if (getChildren().isEmpty()) {
102
         if (getChildren().isEmpty()) {

+ 2
- 1
logging/src/com/dmdirc/addons/logging/HistoryWindow.java Целия файл

26
 import com.dmdirc.FrameContainer;
26
 import com.dmdirc.FrameContainer;
27
 import com.dmdirc.events.UserErrorEvent;
27
 import com.dmdirc.events.UserErrorEvent;
28
 import com.dmdirc.interfaces.Connection;
28
 import com.dmdirc.interfaces.Connection;
29
+import com.dmdirc.interfaces.WindowModel;
29
 import com.dmdirc.logger.ErrorLevel;
30
 import com.dmdirc.logger.ErrorLevel;
30
 import com.dmdirc.ui.core.components.WindowComponent;
31
 import com.dmdirc.ui.core.components.WindowComponent;
31
 import com.dmdirc.ui.messages.BackBufferFactory;
32
 import com.dmdirc.ui.messages.BackBufferFactory;
74
 
75
 
75
     @Override
76
     @Override
76
     public Optional<Connection> getConnection() {
77
     public Optional<Connection> getConnection() {
77
-        return getParent().flatMap(FrameContainer::getConnection);
78
+        return getParent().flatMap(WindowModel::getConnection);
78
     }
79
     }
79
 
80
 
80
     @VisibleForTesting
81
     @VisibleForTesting

+ 9
- 8
ui_swing/src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java Целия файл

34
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
34
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
35
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
35
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
36
 import com.dmdirc.events.UserErrorEvent;
36
 import com.dmdirc.events.UserErrorEvent;
37
+import com.dmdirc.interfaces.WindowModel;
37
 import com.dmdirc.interfaces.ui.FrameListener;
38
 import com.dmdirc.interfaces.ui.FrameListener;
38
 import com.dmdirc.logger.ErrorLevel;
39
 import com.dmdirc.logger.ErrorLevel;
39
 
40
 
104
     }
105
     }
105
 
106
 
106
     @Override
107
     @Override
107
-    public void addWindow(final FrameContainer window, final boolean focus) {
108
+    public void addWindow(final WindowModel window, final boolean focus) {
108
         addWindow(null, window, focus);
109
         addWindow(null, window, focus);
109
     }
110
     }
110
 
111
 
111
     @Override
112
     @Override
112
-    public void addWindow(final FrameContainer parent, final FrameContainer window,
113
+    public void addWindow(final WindowModel parent, final WindowModel window,
113
             final boolean focus) {
114
             final boolean focus) {
114
         UIUtilities.invokeLater(() -> {
115
         UIUtilities.invokeLater(() -> {
115
-            final TextFrame parentWindow = getSwingWindow(parent);
116
-            final TextFrame childWindow = doAddWindow(window);
116
+            final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
117
+            final TextFrame childWindow = doAddWindow((FrameContainer) window);
117
 
118
 
118
             if (childWindow == null) {
119
             if (childWindow == null) {
119
                 return;
120
                 return;
152
     }
153
     }
153
 
154
 
154
     @Override
155
     @Override
155
-    public void delWindow(final FrameContainer window) {
156
+    public void delWindow(final WindowModel window) {
156
         delWindow(null, window);
157
         delWindow(null, window);
157
     }
158
     }
158
 
159
 
159
     @Override
160
     @Override
160
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
161
-        final TextFrame parentWindow = getSwingWindow(parent);
162
-        final TextFrame childWindow = getSwingWindow(window);
161
+    public void delWindow(final WindowModel parent, final WindowModel window) {
162
+        final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
163
+        final TextFrame childWindow = getSwingWindow((FrameContainer) window);
163
         windows.remove(window);
164
         windows.remove(window);
164
         UIUtilities.invokeLater(() -> swingEventBus.publish(new SwingWindowDeletedEvent(
165
         UIUtilities.invokeLater(() -> swingEventBus.publish(new SwingWindowDeletedEvent(
165
                 Optional.ofNullable(parentWindow), childWindow)));
166
                 Optional.ofNullable(parentWindow), childWindow)));

+ 7
- 6
ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java Целия файл

40
 import com.dmdirc.events.FrameIconChangedEvent;
40
 import com.dmdirc.events.FrameIconChangedEvent;
41
 import com.dmdirc.events.UnreadStatusChangedEvent;
41
 import com.dmdirc.events.UnreadStatusChangedEvent;
42
 import com.dmdirc.events.UserErrorEvent;
42
 import com.dmdirc.events.UserErrorEvent;
43
+import com.dmdirc.interfaces.WindowModel;
43
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
44
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
44
 import com.dmdirc.interfaces.config.ConfigChangeListener;
45
 import com.dmdirc.interfaces.config.ConfigChangeListener;
45
 import com.dmdirc.interfaces.ui.Window;
46
 import com.dmdirc.interfaces.ui.Window;
307
             }
308
             }
308
             scroller = new TreeTreeScroller(swingEventBus, tree);
309
             scroller = new TreeTreeScroller(swingEventBus, tree);
309
 
310
 
310
-            for (FrameContainer window : windowManager.getRootWindows()) {
311
-                addWindow(null, windowFactory.getSwingWindow(window));
312
-                final Collection<FrameContainer> childWindows = window.getChildren();
313
-                for (FrameContainer childWindow : childWindows) {
314
-                    addWindow(nodes.get(windowFactory.getSwingWindow(window)),
315
-                            windowFactory.getSwingWindow(childWindow));
311
+            for (WindowModel window : windowManager.getRootWindows()) {
312
+                addWindow(null, windowFactory.getSwingWindow((FrameContainer) window));
313
+                final Collection<WindowModel> childWindows = window.getChildren();
314
+                for (WindowModel childWindow : childWindows) {
315
+                    addWindow(nodes.get(windowFactory.getSwingWindow((FrameContainer) window)),
316
+                            windowFactory.getSwingWindow((FrameContainer) childWindow));
316
                 }
317
                 }
317
             }
318
             }
318
 
319
 

Loading…
Отказ
Запис