Kaynağa Gözat

Remove some loggers, tidy up.

Change-Id: Iad0989f307f8915cf0dc64ba95116a1f521cf53f
Reviewed-on: http://gerrit.dmdirc.com/3715
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
changes/15/3715/2
Greg Holmes 10 yıl önce
ebeveyn
işleme
c1dd4fb367

+ 4
- 3
src/com/dmdirc/addons/ui_swing/components/frames/ComponentCreator.java Dosyayı Görüntüle

26
 import com.dmdirc.addons.ui_swing.SwingController;
26
 import com.dmdirc.addons.ui_swing.SwingController;
27
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
27
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
28
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
28
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
29
+import com.dmdirc.events.UserErrorEvent;
29
 import com.dmdirc.logger.ErrorLevel;
30
 import com.dmdirc.logger.ErrorLevel;
30
-import com.dmdirc.logger.Logger;
31
 import com.dmdirc.ui.core.components.WindowComponent;
31
 import com.dmdirc.ui.core.components.WindowComponent;
32
 import com.dmdirc.util.SimpleInjector;
32
 import com.dmdirc.util.SimpleInjector;
33
 import com.dmdirc.util.URLBuilder;
33
 import com.dmdirc.util.URLBuilder;
82
         for (String string : names) {
82
         for (String string : names) {
83
             Object object;
83
             Object object;
84
             try {
84
             try {
85
-                Class<?> clazz;
85
+                final Class<?> clazz;
86
                 if (string.equals(WindowComponent.INPUTFIELD.getIdentifier())) {
86
                 if (string.equals(WindowComponent.INPUTFIELD.getIdentifier())) {
87
                     clazz = SwingInputField.class;
87
                     clazz = SwingInputField.class;
88
                 } else if (string.equals(WindowComponent.TEXTAREA.getIdentifier())) {
88
                 } else if (string.equals(WindowComponent.TEXTAREA.getIdentifier())) {
93
                 object = injector.createInstance(clazz);
93
                 object = injector.createInstance(clazz);
94
             } catch (ClassNotFoundException | IllegalArgumentException ex) {
94
             } catch (ClassNotFoundException | IllegalArgumentException ex) {
95
                 object = null;
95
                 object = null;
96
-                Logger.userError(ErrorLevel.HIGH, "Unable to create component: " + ex.getMessage());
96
+                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex,
97
+                        "Unable to create component: " + ex.getMessage(), ""));
97
             }
98
             }
98
             if (object instanceof JComponent) {
99
             if (object instanceof JComponent) {
99
                 components.add((JComponent) object);
100
                 components.add((JComponent) object);

+ 19
- 44
src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java Dosyayı Görüntüle

33
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
33
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
34
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
34
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
35
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
35
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
36
+import com.dmdirc.events.UserErrorEvent;
36
 import com.dmdirc.interfaces.CommandController;
37
 import com.dmdirc.interfaces.CommandController;
37
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
38
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
38
 import com.dmdirc.interfaces.ui.InputWindow;
39
 import com.dmdirc.interfaces.ui.InputWindow;
39
 import com.dmdirc.logger.ErrorLevel;
40
 import com.dmdirc.logger.ErrorLevel;
40
-import com.dmdirc.logger.Logger;
41
 import com.dmdirc.plugins.PluginManager;
41
 import com.dmdirc.plugins.PluginManager;
42
 import com.dmdirc.ui.input.InputHandler;
42
 import com.dmdirc.ui.input.InputHandler;
43
 import com.dmdirc.ui.messages.ColourManager;
43
 import com.dmdirc.ui.messages.ColourManager;
109
      * @param inputFieldProvider The provider to use to create a new input field.
109
      * @param inputFieldProvider The provider to use to create a new input field.
110
      * @param owner              WritableFrameContainer owning this frame.
110
      * @param owner              WritableFrameContainer owning this frame.
111
      */
111
      */
112
-    public InputTextFrame(
112
+    protected InputTextFrame(
113
             final TextFrameDependencies deps,
113
             final TextFrameDependencies deps,
114
             final Provider<SwingInputField> inputFieldProvider,
114
             final Provider<SwingInputField> inputFieldProvider,
115
             final FrameContainer owner) {
115
             final FrameContainer owner) {
116
         super(owner, owner.getCommandParser(), deps);
116
         super(owner, owner.getCommandParser(), deps);
117
 
117
 
118
-        this.config = owner.getConfigManager();
119
-        this.colourManager = new ColourManager(config);
120
-        this.parentWindow = deps.mainWindow;
121
-        this.pluginManager = deps.pluginManager;
122
-        this.pasteDialogFactory = deps.pasteDialog;
123
-        this.clipboard = deps.clipboard;
124
-        this.commandController = deps.commandController;
125
-        this.eventBus = deps.eventBus;
118
+        config = owner.getConfigManager();
119
+        colourManager = new ColourManager(config);
120
+        parentWindow = deps.mainWindow;
121
+        pluginManager = deps.pluginManager;
122
+        pasteDialogFactory = deps.pasteDialog;
123
+        clipboard = deps.clipboard;
124
+        commandController = deps.commandController;
125
+        eventBus = deps.eventBus;
126
 
126
 
127
         initComponents(inputFieldProvider);
127
         initComponents(inputFieldProvider);
128
 
128
 
233
         return inputField;
233
         return inputField;
234
     }
234
     }
235
 
235
 
236
-    /**
237
-     * {@inheritDoc}
238
-     *
239
-     * @param mouseEvent Mouse event
240
-     */
241
     @Override
236
     @Override
242
     public void mouseClicked(final MouseEvent mouseEvent) {
237
     public void mouseClicked(final MouseEvent mouseEvent) {
243
         if (mouseEvent.getSource() == getTextPane()) {
238
         if (mouseEvent.getSource() == getTextPane()) {
245
         }
240
         }
246
     }
241
     }
247
 
242
 
248
-    /**
249
-     * {@inheritDoc}
250
-     *
251
-     * @param mouseEvent Mouse event
252
-     */
253
     @Override
243
     @Override
254
     public void mousePressed(final MouseEvent mouseEvent) {
244
     public void mousePressed(final MouseEvent mouseEvent) {
255
         processMouseEvent(mouseEvent);
245
         processMouseEvent(mouseEvent);
256
     }
246
     }
257
 
247
 
258
-    /**
259
-     * {@inheritDoc}
260
-     *
261
-     * @param mouseEvent Mouse event
262
-     */
263
     @Override
248
     @Override
264
     public void mouseReleased(final MouseEvent mouseEvent) {
249
     public void mouseReleased(final MouseEvent mouseEvent) {
265
         processMouseEvent(mouseEvent);
250
         processMouseEvent(mouseEvent);
266
     }
251
     }
267
 
252
 
268
-    /**
269
-     * {@inheritDoc}
270
-     *
271
-     * @param mouseEvent Mouse event
272
-     */
273
     @Override
253
     @Override
274
     public void mouseExited(final MouseEvent mouseEvent) {
254
     public void mouseExited(final MouseEvent mouseEvent) {
275
         //Ignore
255
         //Ignore
276
     }
256
     }
277
 
257
 
278
-    /**
279
-     * {@inheritDoc}
280
-     *
281
-     * @param mouseEvent Mouse event
282
-     */
283
     @Override
258
     @Override
284
     public void mouseEntered(final MouseEvent mouseEvent) {
259
     public void mouseEntered(final MouseEvent mouseEvent) {
285
         //Ignore
260
         //Ignore
286
     }
261
     }
287
 
262
 
288
-    /**
289
-     * Processes every mouse button event to check for a popup trigger.
290
-     *
291
-     * @param e mouse event
292
-     */
293
     @Override
263
     @Override
294
     public void processMouseEvent(final MouseEvent e) {
264
     public void processMouseEvent(final MouseEvent e) {
295
         if (e.isPopupTrigger() && e.getSource() == getInputField()) {
265
         if (e.isPopupTrigger() && e.getSource() == getInputField()) {
312
                 return;
282
                 return;
313
             }
283
             }
314
         } catch (final IllegalStateException ex) {
284
         } catch (final IllegalStateException ex) {
315
-            Logger.userError(ErrorLevel.LOW, "Unable to paste from clipboard.");
285
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
286
+                    "Unable to past from clipboard.", ""));
316
             return;
287
             return;
317
         }
288
         }
318
 
289
 
322
             doPaste((String) Toolkit.getDefaultToolkit()
293
             doPaste((String) Toolkit.getDefaultToolkit()
323
                     .getSystemClipboard().getData(DataFlavor.stringFlavor));
294
                     .getSystemClipboard().getData(DataFlavor.stringFlavor));
324
         } catch (final IOException ex) {
295
         } catch (final IOException ex) {
325
-            Logger.userError(ErrorLevel.LOW,
326
-                    "Unable to get clipboard contents: " + ex.getMessage());
296
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
297
+                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
327
         } catch (final UnsupportedFlavorException ex) {
298
         } catch (final UnsupportedFlavorException ex) {
328
-            Logger.userError(ErrorLevel.LOW, "Unsupported clipboard type", ex);
299
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
300
+                    "Unsupported clipboard type", ""));
329
         }
301
         }
330
     }
302
     }
331
 
303
 
407
                                             "ui", "inputforegroundcolour",
379
                                             "ui", "inputforegroundcolour",
408
                                             "ui", "foregroundcolour"), null)));
380
                                             "ui", "foregroundcolour"), null)));
409
                     break;
381
                     break;
382
+                default:
383
+                    //Do nothing
384
+                    break;
410
             }
385
             }
411
         }
386
         }
412
     }
387
     }

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java Dosyayı Görüntüle

124
      * @param commandParser The command parser to use for this frame.
124
      * @param commandParser The command parser to use for this frame.
125
      * @param deps          Collection of TextPane dependencies.
125
      * @param deps          Collection of TextPane dependencies.
126
      */
126
      */
127
-    public TextFrame(
127
+    protected TextFrame(
128
             final FrameContainer owner,
128
             final FrameContainer owner,
129
             final CommandParser commandParser,
129
             final CommandParser commandParser,
130
             final TextFrameDependencies deps) {
130
             final TextFrameDependencies deps) {

+ 8
- 25
src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java Dosyayı Görüntüle

29
 import com.dmdirc.commandparser.parsers.CommandParser;
29
 import com.dmdirc.commandparser.parsers.CommandParser;
30
 import com.dmdirc.interfaces.CommandController;
30
 import com.dmdirc.interfaces.CommandController;
31
 import com.dmdirc.interfaces.ui.InputField;
31
 import com.dmdirc.interfaces.ui.InputField;
32
-import com.dmdirc.logger.ErrorLevel;
33
-import com.dmdirc.logger.Logger;
34
 import com.dmdirc.plugins.ServiceManager;
32
 import com.dmdirc.plugins.ServiceManager;
35
 import com.dmdirc.ui.input.InputHandler;
33
 import com.dmdirc.ui.input.InputHandler;
36
 
34
 
59
      * @param commandController The controller to use to retrieve command information.
57
      * @param commandController The controller to use to retrieve command information.
60
      * @param commandParser     The command parser to use for this text field.
58
      * @param commandParser     The command parser to use for this text field.
61
      * @param parentWindow      The window that owns this input handler
59
      * @param parentWindow      The window that owns this input handler
62
-     * @param eventBus          The event bus to use to despatch input events.
60
+     * @param eventBus          The event bus to use to dispatch input events.
63
      */
61
      */
64
     public SwingInputHandler(
62
     public SwingInputHandler(
65
             final ServiceManager serviceManager,
63
             final ServiceManager serviceManager,
73
 
71
 
74
     @Override
72
     @Override
75
     protected void addUpHandler() {
73
     protected void addUpHandler() {
76
-        JTextComponent localTarget;
74
+        final JTextComponent localTarget;
77
         if (target instanceof JTextComponent) {
75
         if (target instanceof JTextComponent) {
78
             localTarget = (JTextComponent) target;
76
             localTarget = (JTextComponent) target;
79
         } else if (target instanceof SwingInputField) {
77
         } else if (target instanceof SwingInputField) {
103
 
101
 
104
     @Override
102
     @Override
105
     protected void addDownHandler() {
103
     protected void addDownHandler() {
106
-        JTextComponent localTarget;
104
+        final JTextComponent localTarget;
107
         if (target instanceof JTextComponent) {
105
         if (target instanceof JTextComponent) {
108
             localTarget = (JTextComponent) target;
106
             localTarget = (JTextComponent) target;
109
         } else if (target instanceof SwingInputField) {
107
         } else if (target instanceof SwingInputField) {
162
                     @Override
160
                     @Override
163
                     protected void done() {
161
                     protected void done() {
164
                         localTarget.setEditable(true);
162
                         localTarget.setEditable(true);
163
+                        super.done();
165
                     }
164
                     }
166
                 }.execute();
165
                 }.execute();
167
             }
166
             }
185
                             @Override
184
                             @Override
186
                             protected void done() {
185
                             protected void done() {
187
                                 localTarget.setEditable(true);
186
                                 localTarget.setEditable(true);
187
+                                super.done();
188
                             }
188
                             }
189
                         }.execute();
189
                         }.execute();
190
                     }
190
                     }
198
 
198
 
199
     @Override
199
     @Override
200
     protected void addEnterHandler() {
200
     protected void addEnterHandler() {
201
-        JTextComponent localTarget;
201
+        final JTextComponent localTarget;
202
         if (target instanceof JTextComponent) {
202
         if (target instanceof JTextComponent) {
203
             localTarget = (JTextComponent) target;
203
             localTarget = (JTextComponent) target;
204
         } else if (target instanceof SwingInputField) {
204
         } else if (target instanceof SwingInputField) {
226
                         } else if (e.getSource() instanceof JTextField) {
226
                         } else if (e.getSource() instanceof JTextField) {
227
                             source = (JTextField) e.getSource();
227
                             source = (JTextField) e.getSource();
228
                         } else {
228
                         } else {
229
-                            Logger.appError(ErrorLevel.HIGH, "Unable to send "
230
-                                    + "line", new IllegalArgumentException(
231
-                                            "Event is not from known source."));
232
-                            return;
229
+                            throw new IllegalArgumentException(
230
+                                            "Event is not from known source.");
233
                         }
231
                         }
234
                         if (source.isEditable()) {
232
                         if (source.isEditable()) {
235
                             new LoggingSwingWorker<Object, Void>() {
233
                             new LoggingSwingWorker<Object, Void>() {
255
         target.addKeyListener(this);
253
         target.addKeyListener(this);
256
     }
254
     }
257
 
255
 
258
-    /**
259
-     * {@inheritDoc}
260
-     *
261
-     * @param e Key event
262
-     */
263
     @Override
256
     @Override
264
     public void keyTyped(final KeyEvent e) {
257
     public void keyTyped(final KeyEvent e) {
265
         //Ignore
258
         //Ignore
266
     }
259
     }
267
 
260
 
268
-    /**
269
-     * {@inheritDoc}
270
-     *
271
-     * @param e Key event
272
-     */
273
     @Override
261
     @Override
274
     public void keyPressed(final KeyEvent e) {
262
     public void keyPressed(final KeyEvent e) {
275
         if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode()
263
         if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode()
284
         }
272
         }
285
     }
273
     }
286
 
274
 
287
-    /**
288
-     * {@inheritDoc}
289
-     *
290
-     * @param e Key event
291
-     */
292
     @Override
275
     @Override
293
     public void keyReleased(final KeyEvent e) {
276
     public void keyReleased(final KeyEvent e) {
294
         validateText();
277
         validateText();

Loading…
İptal
Kaydet