Sfoglia il codice sorgente

Fix most getIconManager() calls.

Change-Id: I8070f50bf1e22459f8a33bdc88bb64ec95c4b021
Depends-On: Id672fec154a19c999b078b3980681937f62bfb41
Reviewed-on: http://gerrit.dmdirc.com/2841
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.8
Chris Smith 10 anni fa
parent
commit
a8316419d6

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java Vedi File

120
         searchBox = new ValidatingJTextField(parent.getController()
120
         searchBox = new ValidatingJTextField(parent.getController()
121
                 .getIconManager(), validator);
121
                 .getIconManager(), validator);
122
         wrapIndicator = new JLabel("Search wrapped",
122
         wrapIndicator = new JLabel("Search wrapped",
123
-                parent.getContainer().getIconManager().getIcon("linewrap"),
123
+                parent.getIconManager().getIcon("linewrap"),
124
                 JLabel.LEFT);
124
                 JLabel.LEFT);
125
 
125
 
126
         nextButton.setText("Later");
126
         nextButton.setText("Later");

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/TopicBar.java Vedi File

123
                 new ReplacePasteAction("(\r\n|\n|\r)", " "));
123
                 new ReplacePasteAction("(\r\n|\n|\r)", " "));
124
         topicEdit = new ImageButton<>("edit",
124
         topicEdit = new ImageButton<>("edit",
125
                 channelFrame.getIconManager().getIcon("edit-inactive"),
125
                 channelFrame.getIconManager().getIcon("edit-inactive"),
126
-                channelFrame.getContainer().getIconManager().getIcon("edit"));
126
+                channelFrame.getIconManager().getIcon("edit"));
127
         topicCancel = new ImageButton<>("cancel",
127
         topicCancel = new ImageButton<>("cancel",
128
                 channelFrame.getIconManager().getIcon("close"),
128
                 channelFrame.getIconManager().getIcon("close"),
129
                 channelFrame.getIconManager().getIcon("close-active"));
129
                 channelFrame.getIconManager().getIcon("close-active"));

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/DesktopWindowFrame.java Vedi File

109
             /** {@inheritDoc} */
109
             /** {@inheritDoc} */
110
             @Override
110
             @Override
111
             public void run() {
111
             public void run() {
112
-                setIconImage(window.getIconManager().getImage(icon));
112
+                setIconImage(windowWindow.getIconManager().getImage(icon));
113
             }
113
             }
114
         });
114
         });
115
     }
115
     }

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java Vedi File

559
      * @return This frame's IconManager
559
      * @return This frame's IconManager
560
      */
560
      */
561
     public IconManager getIconManager() {
561
     public IconManager getIconManager() {
562
-        return getContainer().getIconManager();
562
+        return getContainer().getIconManager(controller.getUrlBuilder());
563
     }
563
     }
564
 
564
 
565
     /**
565
     /**

+ 4
- 3
src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java Vedi File

307
      */
307
      */
308
     private void addButton(final Window source) {
308
     private void addButton(final Window source) {
309
         final FrameToggleButton button = new FrameToggleButton(
309
         final FrameToggleButton button = new FrameToggleButton(
310
-                source.getContainer().getName(), source.getContainer()
311
-                .getIconManager().getIcon(source.getContainer().getIcon()),
310
+                source.getContainer().getName(),
311
+                source.getContainer().getIconManager(controller.getUrlBuilder())
312
+                        .getIcon(source.getContainer().getIcon()),
312
                 source);
313
                 source);
313
         button.addActionListener(this);
314
         button.addActionListener(this);
314
         button.addMouseListener(this);
315
         button.addMouseListener(this);
490
             public void run() {
491
             public void run() {
491
                 final FrameToggleButton button = getButton(window);
492
                 final FrameToggleButton button = getButton(window);
492
                 if (button != null) {
493
                 if (button != null) {
493
-                    button.setIcon(window.getIconManager().getIcon(icon));
494
+                    button.setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
494
                 }
495
                 }
495
             }
496
             }
496
         });
497
         });

+ 2
- 2
src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java Vedi File

63
     public FrameContainerMenu(final FrameContainer frame,
63
     public FrameContainerMenu(final FrameContainer frame,
64
             final SwingController controller) {
64
             final SwingController controller) {
65
         super(frame.getName());
65
         super(frame.getName());
66
-        setIcon(frame.getIconManager().getIcon(frame.getIcon()));
66
+        setIcon(frame.getIconManager(controller.getUrlBuilder()).getIcon(frame.getIcon()));
67
         new WindowMenuScroller(this, controller.getGlobalConfig(),
67
         new WindowMenuScroller(this, controller.getGlobalConfig(),
68
                 controller.getDomain(), 0);
68
                 controller.getDomain(), 0);
69
 
69
 
83
             @Override
83
             @Override
84
             public void run() {
84
             public void run() {
85
                 if ((frame != null && window != null) && frame.equals(window)) {
85
                 if ((frame != null && window != null) && frame.equals(window)) {
86
-                    setIcon(window.getIconManager().getIcon(icon));
86
+                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
87
                 }
87
                 }
88
             }
88
             }
89
         });
89
         });

+ 3
- 2
src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java Vedi File

65
     public FrameContainerMenuItem(final SwingController controller,
65
     public FrameContainerMenuItem(final SwingController controller,
66
             final FrameContainer frame,
66
             final FrameContainer frame,
67
             final WindowMenuFrameManager manager) {
67
             final WindowMenuFrameManager manager) {
68
-        super(frame.getName(), frame.getIconManager().getIcon(frame.getIcon()));
68
+        super(frame.getName(),
69
+                frame.getIconManager(controller.getUrlBuilder()).getIcon(frame.getIcon()));
69
 
70
 
70
         this.controller = controller;
71
         this.controller = controller;
71
         this.frame = frame;
72
         this.frame = frame;
84
             @Override
85
             @Override
85
             public void run() {
86
             public void run() {
86
                 if (frame != null && window != null && frame.equals(window)) {
87
                 if (frame != null && window != null && frame.equals(window)) {
87
-                    setIcon(window.getIconManager().getIcon(icon));
88
+                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
88
                 }
89
                 }
89
             }
90
             }
90
         });
91
         });

Loading…
Annulla
Salva