Просмотр исходного кода

Style fixes

Change-Id: Ib8fa12f91b38aecd30fc22b89fba624200c8e22a
Reviewed-on: http://gerrit.dmdirc.com/1946
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.7rc1
Greg Holmes 13 лет назад
Родитель
Сommit
decb60c49b
25 измененных файлов: 47 добавлений и 208 удалений
  1. 0
    9
      src/com/dmdirc/addons/audio/AudioCommand.java
  2. 0
    10
      src/com/dmdirc/addons/audio/BeepCommand.java
  3. 0
    17
      src/com/dmdirc/addons/dcc/io/DCC.java
  4. 1
    12
      src/com/dmdirc/addons/dcc/io/DCCChat.java
  5. 0
    8
      src/com/dmdirc/addons/dcop/DcopCommand.java
  6. 1
    7
      src/com/dmdirc/addons/dcop/DcopPlugin.java
  7. 0
    5
      src/com/dmdirc/addons/dns/DNSCommand.java
  8. 0
    5
      src/com/dmdirc/addons/dns/DNSPlugin.java
  9. 3
    8
      src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java
  10. 0
    7
      src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java
  11. 0
    7
      src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java
  12. 0
    7
      src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java
  13. 0
    9
      src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java
  14. 0
    7
      src/com/dmdirc/addons/notifications/NotificationsPlugin.java
  15. 3
    10
      src/com/dmdirc/addons/parserdebug/DebugPlugin.java
  16. 1
    9
      src/com/dmdirc/addons/relaybot/RelayBotPlugin.java
  17. 0
    9
      src/com/dmdirc/addons/time/TimePlugin.java
  18. 13
    27
      src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java
  19. 7
    10
      src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java
  20. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java
  21. 0
    6
      src/com/dmdirc/addons/ui_swing/dialogs/profiles/Profile.java
  22. 6
    6
      src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java
  23. 4
    5
      src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java
  24. 3
    3
      src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java
  25. 4
    4
      src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

+ 0
- 9
src/com/dmdirc/addons/audio/AudioCommand.java Просмотреть файл

@@ -33,18 +33,9 @@ import java.io.File;
33 33
 
34 34
 /**
35 35
  * The Audio Command allows playing of audio files.
36
- *
37
- * @author Shane "Dataforce" Mc Cormack
38 36
  */
39 37
 public final class AudioCommand extends Command implements CommandInfo {
40 38
 
41
-    /**
42
-     * Creates a new instance of LoggingCommand.
43
-     */
44
-    public AudioCommand() {
45
-        super();
46
-    }
47
-
48 39
     /** {@inheritDoc} */
49 40
     @Override
50 41
     public void execute(final FrameContainer origin,

+ 0
- 10
src/com/dmdirc/addons/audio/BeepCommand.java Просмотреть файл

@@ -33,18 +33,9 @@ import java.awt.Toolkit;
33 33
 
34 34
 /**
35 35
  * The Beep Command emits a beep
36
- *
37
- * @author Shane "Dataforce" Mc Cormack
38 36
  */
39 37
 public final class BeepCommand extends Command implements CommandInfo {
40 38
 
41
-    /**
42
-     * Creates a new instance of BeepCommand.
43
-     */
44
-    public BeepCommand() {
45
-        super();
46
-    }
47
-
48 39
     /** {@inheritDoc} */
49 40
     @Override
50 41
     public void execute(final FrameContainer origin,
@@ -77,4 +68,3 @@ public final class BeepCommand extends Command implements CommandInfo {
77 68
     }
78 69
 
79 70
 }
80
-

+ 0
- 17
src/com/dmdirc/addons/dcc/io/DCC.java Просмотреть файл

@@ -31,29 +31,21 @@ import java.util.concurrent.atomic.AtomicBoolean;
31 31
 /**
32 32
  * This class manages the socket and low-level I/O functionality for all
33 33
  * types of DCC. Subclasses process the data received by this class.
34
- *
35
- * @author Shane 'Dataforce' McCormack
36 34
  */
37 35
 public abstract class DCC implements Runnable {
38 36
 
39 37
     /** Address. */
40 38
     protected long address = 0;
41
-
42 39
     /** Port. */
43 40
     protected int port = 0;
44
-
45 41
     /** Socket used to communicate with. */
46 42
     protected Socket socket;
47
-
48 43
     /** The Thread in use for this. */
49 44
     private volatile Thread myThread;
50
-
51 45
     /** Are we already running? */
52 46
     protected final AtomicBoolean running = new AtomicBoolean();
53
-
54 47
     /** Are we a listen socket? */
55 48
     protected boolean listen = false;
56
-
57 49
     /**
58 50
      * The current socket in use if this is a listen socket.
59 51
      * This reference may be changed if and only if exactly one permit from the
@@ -61,7 +53,6 @@ public abstract class DCC implements Runnable {
61 53
      * held by the thread doing the modification.
62 54
      */
63 55
     private ServerSocket serverSocket;
64
-
65 56
     /**
66 57
      * Semaphore to control write access to ServerSocket.
67 58
      * If an object acquires a permit from the {@link #serverSocketSem}, then
@@ -70,7 +61,6 @@ public abstract class DCC implements Runnable {
70 61
      * acquires a permit from the {@link #serverListeningSem}.
71 62
      */
72 63
     private final Semaphore serverSocketSem = new Semaphore(1);
73
-
74 64
     /**
75 65
      * Semaphore used when we're blocking waiting for connections.
76 66
      * If an object acquires a permit from the {@link #serverListeningSem},
@@ -82,13 +72,6 @@ public abstract class DCC implements Runnable {
82 72
      */
83 73
     private final Semaphore serverListeningSem = new Semaphore(0);
84 74
 
85
-    /**
86
-     * Creates a new instance of DCC.
87
-     */
88
-    public DCC() {
89
-        super();
90
-    }
91
-
92 75
     /**
93 76
      * Connect this dcc.
94 77
      */

+ 1
- 12
src/com/dmdirc/addons/dcc/io/DCCChat.java Просмотреть файл

@@ -23,6 +23,7 @@
23 23
 package com.dmdirc.addons.dcc.io;
24 24
 
25 25
 import com.dmdirc.addons.dcc.DCCChatHandler;
26
+
26 27
 import java.io.BufferedReader;
27 28
 import java.io.IOException;
28 29
 import java.io.InputStreamReader;
@@ -30,30 +31,18 @@ import java.io.PrintWriter;
30 31
 
31 32
 /**
32 33
  * This class handles a DCC Chat
33
- *
34
- * @author Shane 'Dataforce' McCormack
35 34
  */
36 35
 public class DCCChat extends DCC {
37 36
 
38 37
     /** The handler for this DCCChat. */
39 38
     private DCCChatHandler handler = null;
40
-
41 39
     /** Used to send data out the socket. */
42 40
     private PrintWriter out;
43
-
44 41
     /** Used to read data from the socket. */
45 42
     private BufferedReader in;
46
-
47 43
     /** Are we active? */
48 44
     private boolean active = false;
49 45
 
50
-    /**
51
-     * Creates a new instance of DCCChat.
52
-     */
53
-    public DCCChat() {
54
-        super();
55
-    }
56
-
57 46
     /**
58 47
      * Change the handler for this DCC Chat.
59 48
      *

+ 0
- 8
src/com/dmdirc/addons/dcop/DcopCommand.java Просмотреть файл

@@ -33,17 +33,9 @@ import java.util.List;
33 33
 
34 34
 /**
35 35
  * The dcop command retrieves information from a dcop application.
36
- * @author chris
37 36
  */
38 37
 public final class DcopCommand extends Command implements CommandInfo {
39 38
 
40
-    /**
41
-     * Creates a new instance of DcopCommand.
42
-     */
43
-    public DcopCommand() {
44
-        super();
45
-    }
46
-
47 39
     /** {@inheritDoc} */
48 40
     @Override
49 41
     public void execute(final FrameContainer origin,

+ 1
- 7
src/com/dmdirc/addons/dcop/DcopPlugin.java Просмотреть файл

@@ -33,18 +33,12 @@ import java.util.List;
33 33
 
34 34
 /**
35 35
  * Allows the user to execute dcop commands (and read the results).
36
- *
37
- * @author chris
38 36
  */
39 37
 public final class DcopPlugin extends BasePlugin {
38
+
40 39
     /** The DcopCommand we created */
41 40
     private DcopCommand command = null;
42 41
 
43
-    /** Creates a new instance of DcopPlugin. */
44
-    public DcopPlugin() {
45
-        super();
46
-    }
47
-
48 42
     /**
49 43
      * Retrieves the result from executing the specified command.
50 44
      *

+ 0
- 5
src/com/dmdirc/addons/dns/DNSCommand.java Просмотреть файл

@@ -37,11 +37,6 @@ import java.util.TimerTask;
37 37
  */
38 38
 public final class DNSCommand extends Command implements CommandInfo {
39 39
 
40
-    /** Creates a new instance of DNSCommand. */
41
-    public DNSCommand() {
42
-        super();
43
-    }
44
-
45 40
     /** {@inheritDoc} */
46 41
     @Override
47 42
     public void execute(final FrameContainer origin,

+ 0
- 5
src/com/dmdirc/addons/dns/DNSPlugin.java Просмотреть файл

@@ -39,11 +39,6 @@ public final class DNSPlugin extends BasePlugin {
39 39
     /** The DNSCommand we've registered. */
40 40
     private DNSCommand command;
41 41
 
42
-    /** Creates a new instance of DNSPlugin. */
43
-    public DNSPlugin() {
44
-        super();
45
-    }
46
-
47 42
     /** {@inheritDoc} */
48 43
     @Override
49 44
     public void onLoad() {

+ 3
- 8
src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java Просмотреть файл

@@ -47,7 +47,9 @@ import org.apache.commons.lang.StringEscapeUtils;
47 47
 /**
48 48
  * This plugin adds freedesktop Style Notifications to dmdirc.
49 49
  */
50
-public final class FreeDesktopNotificationsPlugin extends BasePlugin implements ConfigChangeListener {
50
+public final class FreeDesktopNotificationsPlugin extends BasePlugin
51
+        implements ConfigChangeListener {
52
+
51 53
     /** The DcopCommand we created */
52 54
     private FDNotifyCommand command = null;
53 55
     /** notification timeout. */
@@ -61,13 +63,6 @@ public final class FreeDesktopNotificationsPlugin extends BasePlugin implements
61 63
     /** Strip codes. */
62 64
     private boolean stripcodes;
63 65
 
64
-    /**
65
-     * Creates a new instance of the FreeDesktopNotifications Plugin.
66
-     */
67
-    public FreeDesktopNotificationsPlugin() {
68
-        super();
69
-    }
70
-
71 66
     /**
72 67
      * Used to show a notification using this plugin.
73 68
      *

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java Просмотреть файл

@@ -29,16 +29,9 @@ import java.util.List;
29 29
 
30 30
 /**
31 31
  * Uses DCOP to retrieve now playing info from Amarok.
32
- *
33
- * @author chris
34 32
  */
35 33
 public class AmarokSource implements MediaSource {
36 34
 
37
-    /** Instantiates the media source. */
38
-    public AmarokSource() {
39
-        //Do nothing
40
-    }
41
-
42 35
     /** {@inheritDoc} */
43 36
     @Override
44 37
     public MediaSourceState getState() {

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java Просмотреть файл

@@ -29,16 +29,9 @@ import java.util.List;
29 29
 
30 30
 /**
31 31
  * Uses DCOP to retrieve now playing info from Kaffeine.
32
- *
33
- * @author chris
34 32
  */
35 33
 public class KaffeineSource implements MediaSource {
36 34
 
37
-    /** Instantiates the media source. */
38
-    public KaffeineSource() {
39
-        //Do nothing
40
-    }
41
-
42 35
     /** {@inheritDoc} */
43 36
     @Override
44 37
     public MediaSourceState getState() {

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java Просмотреть файл

@@ -29,16 +29,9 @@ import java.util.List;
29 29
 
30 30
 /**
31 31
  * Uses DCOP to retrieve now playing info from Noatun.
32
- *
33
- * @author chris
34 32
  */
35 33
 public class NoatunSource implements MediaSource {
36 34
 
37
-    /** Instantiates the media source. */
38
-    public NoatunSource() {
39
-        //Do nothing
40
-    }
41
-
42 35
     /** {@inheritDoc} */
43 36
     @Override
44 37
     public MediaSourceState getState() {

+ 0
- 9
src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java Просмотреть файл

@@ -35,18 +35,9 @@ import java.util.List;
35 35
 /**
36 36
  * Provides a media source for mplayer which uses lsof to hackily see what
37 37
  * mplayer is currently accessing.
38
- *
39
- * @author chris
40 38
  */
41 39
 public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource {
42 40
 
43
-    /**
44
-     * Creates a new instance of MplayerMediaSourcePlugin.
45
-     */
46
-    public MplayerMediaSourcePlugin() {
47
-        super();
48
-    }
49
-
50 41
     /** {@inheritDoc} */
51 42
     @Override
52 43
     public void onLoad() {

+ 0
- 7
src/com/dmdirc/addons/notifications/NotificationsPlugin.java Просмотреть файл

@@ -52,13 +52,6 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
52 52
     /** The user's preferred order for method usage. */
53 53
     private List<String> order;
54 54
 
55
-    /**
56
-     * Creates a new notifications plugin.
57
-     */
58
-    public NotificationsPlugin() {
59
-        super();
60
-    }
61
-
62 55
     /** {@inheritDoc} */
63 56
     @Override
64 57
     public void onLoad() {

+ 3
- 10
src/com/dmdirc/addons/parserdebug/DebugPlugin.java Просмотреть файл

@@ -39,8 +39,6 @@ import java.util.Map;
39 39
 
40 40
 /**
41 41
  * This causes parser debugging to be spammed to the console.
42
- *
43
- * @author Shane 'Dataforce' McCormack
44 42
  */
45 43
 public final class DebugPlugin extends BasePlugin implements DebugInfoListener, ActionListener {
46 44
 
@@ -51,11 +49,6 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
51 49
     protected final Map<Parser, DebugWindow> registeredParsers
52 50
             = new HashMap<Parser, DebugWindow>();
53 51
 
54
-    /**
55
-     * Creates a new instance of the Debug Plugin.
56
-     */
57
-    public DebugPlugin() { super(); }
58
-
59 52
     /** {@inheritDoc} */
60 53
     @Override
61 54
     public void onLoad() {
@@ -73,7 +66,7 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
73 66
         for (Parser parser : registeredParsers.keySet()) {
74 67
             try {
75 68
                 parser.getCallbackManager().delCallback(DebugInfoListener.class, this);
76
-                DebugWindow window = registeredParsers.get(parser);
69
+                final DebugWindow window = registeredParsers.get(parser);
77 70
                 windowList.add(window);
78 71
             } catch (Exception e) { }
79 72
         }
@@ -86,7 +79,7 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
86 79
     /** {@inheritDoc} */
87 80
     @Override
88 81
     public void onDebugInfo(final Parser parser, final Date date, final int level, final String data) {
89
-        DebugWindow window = registeredParsers.get(parser);
82
+        final DebugWindow window = registeredParsers.get(parser);
90 83
         if (window != null) {
91 84
             window.addLine(String.format("[%d] %s%n", level, data), true);
92 85
         }
@@ -100,7 +93,7 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
100 93
             final Parser parser = thisServer.getParser();
101 94
             if (registeredParsers.containsKey(parser)) {
102 95
                 try {
103
-                    DebugWindow window = registeredParsers.get(parser);
96
+                    final DebugWindow window = registeredParsers.get(parser);
104 97
                     registeredParsers.remove(parser);
105 98
                     window.unsetParser();
106 99
                     parser.getCallbackManager().delCallback(DebugInfoListener.class, this);

+ 1
- 9
src/com/dmdirc/addons/relaybot/RelayBotPlugin.java Просмотреть файл

@@ -51,20 +51,12 @@ import java.util.Map;
51 51
 
52 52
 /**
53 53
  * This plugin makes certain relay bots less obnoxious looking.
54
- *
55
- * @author shane
56 54
  */
57 55
 public class RelayBotPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
56
+
58 57
     /** Known RelayChannelHandlers. */
59 58
     private final Map<Channel, RelayChannelHandler> handlers = new HashMap<Channel, RelayChannelHandler>();
60 59
 
61
-    /**
62
-     * Creates a new instance of the RelayBotPlugin.
63
-     */
64
-    public RelayBotPlugin() {
65
-        super();
66
-    }
67
-
68 60
     /** {@inheritDoc} */
69 61
     @Override
70 62
     public void onLoad() {

+ 0
- 9
src/com/dmdirc/addons/time/TimePlugin.java Просмотреть файл

@@ -33,27 +33,18 @@ import java.util.TimerTask;
33 33
 
34 34
 /**
35 35
  * Provides various time-related features.
36
- * @author chris
37 36
  */
38 37
 public final class TimePlugin  extends BasePlugin {
39 38
 
40 39
     /** Have we registered our types already? */
41 40
     private static boolean registered;
42
-
43 41
     /** The timer to use for scheduling. */
44 42
     private Timer timer;
45
-
46 43
     /** The TimerCommand we've registered. */
47 44
     private TimerCommand command;
48
-
49 45
     /** The Manager to use for managing timers. */
50 46
     private TimerManager manager;
51 47
 
52
-    /** Creates a new instance of TimePlugin. */
53
-    public TimePlugin() {
54
-        super();
55
-    }
56
-
57 48
     /** {@inheritDoc} */
58 49
     @Override
59 50
     public void onLoad() {

+ 13
- 27
src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java Просмотреть файл

@@ -142,8 +142,8 @@ public final class ActionsManagerDialog extends StandardDialog implements
142 142
                 getOptionInt("dialogstate", "actionsmanagerdialog");
143 143
         if (selected >= 0 && selected < me.groups.getModel().getSize()) {
144 144
             me.groups.setSelectedIndex(selected);
145
-            me.changeActiveGroup((ActionGroup) me.groups.getModel().getElementAt(
146
-                    selected));
145
+            me.changeActiveGroup((ActionGroup) me.groups.getModel()
146
+                    .getElementAt(selected));
147 147
         }
148 148
     }
149 149
 
@@ -175,9 +175,9 @@ public final class ActionsManagerDialog extends StandardDialog implements
175 175
     private void initComponents() {
176 176
         orderButtons(new JButton(), new JButton());
177 177
         infoLabel = new TextLabel("Actions allow you to make DMDirc"
178
-                + " intelligently respond to various events.  Action groups are "
179
-                + "there for you to organise groups, add or remove them "
180
-                + "to suit your needs.");
178
+                + " intelligently respond to various events.  Action groups are"
179
+                + " there for you to organise groups, add or remove them"
180
+                + " to suit your needs.");
181 181
         groups = new JList(new SortedListModel<ActionGroup>(
182 182
                 new ActionGroupNameComparator()));
183 183
         actions = new ActionsGroupPanel(this, null);
@@ -192,14 +192,11 @@ public final class ActionsManagerDialog extends StandardDialog implements
192 192
         groupPanel.setName("Groups");
193 193
 
194 194
         groupPanel.setBorder(BorderFactory.createTitledBorder(UIManager.
195
-                getBorder("TitledBorder.border"),
196
-                "Groups"));
195
+                getBorder("TitledBorder.border"), "Groups"));
197 196
         info.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
198
-                "TitledBorder.border"),
199
-                "Information"));
197
+                "TitledBorder.border"), "Information"));
200 198
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
201
-                "TitledBorder.border"),
202
-                "Actions"));
199
+                "TitledBorder.border"), "Actions"));
203 200
 
204 201
         groups.setCellRenderer(new ActionGroupListCellRenderer());
205 202
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -280,7 +277,8 @@ public final class ActionsManagerDialog extends StandardDialog implements
280 277
      */
281 278
     private void reloadGroups(final ActionGroup selectedGroup) {
282 279
         ((DefaultListModel) groups.getModel()).clear();
283
-        for (ActionGroup group : ActionManager.getActionManager().getGroupsMap().values()) {
280
+        for (ActionGroup group : ActionManager.getActionManager()
281
+                .getGroupsMap().values()) {
284 282
             ((DefaultListModel) groups.getModel()).addElement(group);
285 283
         }
286 284
         groups.setSelectedValue(selectedGroup, true);
@@ -348,11 +346,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
348 346
                 ModalityType.DOCUMENT_MODAL, "New action group",
349 347
                 "Please enter the name of the new action group", validator) {
350 348
 
351
-            /**
352
-             * A version number for this class. It should be changed whenever the class
353
-             * structure is changed (or anything else that would prevent serialized
354
-             * objects being unserialized with the new class).
355
-             */
349
+            /** Java Serialisation verion ID. */
356 350
             private static final long serialVersionUID = 1;
357 351
 
358 352
             /** {@inheritDoc} */
@@ -392,11 +386,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
392 386
                 ModalityType.DOCUMENT_MODAL, "Edit action group",
393 387
                 "Please enter the new name of the action group", validator) {
394 388
 
395
-            /**
396
-             * A version number for this class. It should be changed whenever the class
397
-             * structure is changed (or anything eloh blese that would prevent serialized
398
-             * objects being unserialized with the new class).
399
-             */
389
+            /** Java Serialisation verion ID. */
400 390
             private static final long serialVersionUID = 1;
401 391
 
402 392
             /** {@inheritDoc} */
@@ -437,11 +427,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
437 427
                 "Are you sure you wish to delete the '" + group
438 428
                 + "' group and all actions within it?") {
439 429
 
440
-            /**
441
-             * A version number for this class. It should be changed whenever the class
442
-             * structure is changed (or anything else that would prevent serialized
443
-             * objects being unserialized with the new class).
444
-             */
430
+            /** Java Serialisation verion ID. */
445 431
             private static final long serialVersionUID = 1;
446 432
 
447 433
             /** {@inheritDoc} */

+ 7
- 10
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java Просмотреть файл

@@ -153,8 +153,10 @@ public final class AliasManagerDialog extends StandardDialog implements
153 153
         tableModel = new AliasTableModel(getTableData());
154 154
         table = new PackingTable(tableModel, false, scrollPane, false) {
155 155
 
156
+            /** Java Serialisation verion ID. */
156 157
             private static final long serialVersionUID = 1;
157 158
 
159
+            /** {@inheritDoc} */
158 160
             @Override
159 161
             public TableCellRenderer getCellRenderer(final int row,
160 162
                     final int column) {
@@ -309,15 +311,10 @@ public final class AliasManagerDialog extends StandardDialog implements
309 311
             if (checkForDuplicates()) {
310 312
                 final StandardQuestionDialog dialog = new StandardQuestionDialog(
311 313
                         this, ModalityType.APPLICATION_MODAL,
312
-                        "Duplicate Aliases",
313
-                        "There are duplicate aliases in the table, these need "
314
-                        + "to be removed before saving") {
315
-
316
-                    /**
317
-                     * A version number for this class. It should be changed whenever the class
318
-                     * structure is changed (or anything else that would prevent serialized
319
-                     * objects being unserialized with the new class).
320
-                     */
314
+                        "Duplicate Aliases", "There are duplicate aliases in "
315
+                        + "the table, these need to be removed before saving") {
316
+
317
+                    /** Java Serialisation verion ID. */
321 318
                     private static final long serialVersionUID = 1;
322 319
 
323 320
                     /** {@inheritDoc} */
@@ -329,7 +326,7 @@ public final class AliasManagerDialog extends StandardDialog implements
329 326
                     /** {@inheritDoc} */
330 327
                     @Override
331 328
                     public void cancelled() {
332
-                        return;
329
+                        //Ignore
333 330
                     }
334 331
                 };
335 332
                 dialog.getOkButton().setVisible(false);

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java Просмотреть файл

@@ -310,7 +310,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
310 310
             /** {@inheritDoc} */
311 311
             @Override
312 312
             public void cancelled() {
313
-                return;
313
+                //Ignore
314 314
             }
315 315
         }.display();
316 316
     }

+ 0
- 6
src/com/dmdirc/addons/ui_swing/dialogs/profiles/Profile.java Просмотреть файл

@@ -373,12 +373,6 @@ public class Profile {
373 373
         return hash;
374 374
     }
375 375
 
376
-    /** {@inheritDoc} */
377
-    @Override
378
-    protected Object clone() throws CloneNotSupportedException {
379
-        throw new CloneNotSupportedException();
380
-    }
381
-
382 376
     /** {@inheritDoc} */
383 377
     @Override
384 378
     public String toString() {

+ 6
- 6
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java Просмотреть файл

@@ -67,6 +67,10 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
67 67
      * objects being unserialized with the new class).
68 68
      */
69 69
     private static final long serialVersionUID = 2;
70
+    /** Main frame. */
71
+    private final MainFrame mainFrame;
72
+    /** Parent window. */
73
+    private final Window parentWindow;
70 74
     /** Displayed profile. */
71 75
     private Profile profile;
72 76
     /** The profile list model. */
@@ -89,14 +93,10 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
89 93
     private JButton delButton;
90 94
     /** Edit button. */
91 95
     private JButton editButton;
92
-    /** Main frame. */
93
-    private MainFrame mainFrame;
94 96
     /** List border. */
95 97
     private Border passBorder;
96 98
     /** Validation failed border. */
97 99
     private Border failBorder;
98
-    /** Parent window. */
99
-    private Window parentWindow;
100 100
 
101 101
     /**
102 102
      * Creates a new profile detail panel.
@@ -315,7 +315,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
315 315
                 /** {@inheritDoc} */
316 316
                 @Override
317 317
                 public void cancelled() {
318
-                //Ignore
318
+                    //Ignore
319 319
                 }
320 320
             };
321 321
             dialog.setText((String) nicknames.getSelectedValue());
@@ -344,7 +344,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
344 344
                 /** {@inheritDoc} */
345 345
                 @Override
346 346
                 public void cancelled() {
347
-                    return;
347
+                    //Ignore
348 348
                 }
349 349
             }.display();
350 350
         }

+ 4
- 5
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java Просмотреть файл

@@ -50,8 +50,7 @@ import net.miginfocom.swing.MigLayout;
50 50
 
51 51
 /** Profile editing dialog. */
52 52
 public final class ProfileManagerDialog extends StandardDialog implements
53
-        ActionListener,
54
-        ListSelectionListener {
53
+        ActionListener, ListSelectionListener {
55 54
 
56 55
     /**
57 56
      * A version number for this class. It should be changed whenever the class
@@ -61,6 +60,8 @@ public final class ProfileManagerDialog extends StandardDialog implements
61 60
     private static final long serialVersionUID = 2;
62 61
     /** Previously created instance of ProfileEditorDialog. */
63 62
     private static volatile ProfileManagerDialog me;
63
+    /** main frame. */
64
+    private final MainFrame mainFrame;
64 65
     /** Profile list. */
65 66
     private JList profileList;
66 67
     /** Profile list mode. */
@@ -77,8 +78,6 @@ public final class ProfileManagerDialog extends StandardDialog implements
77 78
     private int selectedIndex;
78 79
     /** Deleted profiles. */
79 80
     private final List<Profile> deletedProfiles;
80
-    /** main frame. */
81
-    private MainFrame mainFrame;
82 81
 
83 82
     /**
84 83
      * Creates a new instance of ProfileEditorDialog.
@@ -267,7 +266,7 @@ public final class ProfileManagerDialog extends StandardDialog implements
267 266
                 /** {@inheritDoc} */
268 267
                 @Override
269 268
                 public void cancelled() {
270
-                    return;
269
+                    //Ignore
271 270
                 }
272 271
             }.display();
273 272
         }

+ 3
- 3
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java Просмотреть файл

@@ -62,6 +62,8 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
62 62
     private static final long serialVersionUID = 2;
63 63
     /** Parent server. */
64 64
     private final Server server;
65
+    /** Parent window. */
66
+    private final Window parentWindow;
65 67
     /** Add button. */
66 68
     private JButton addButton;
67 69
     /** Remove button. */
@@ -76,8 +78,6 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
76 78
     private IgnoreList cachedIgnoreList;
77 79
     /** Ignore list model . */
78 80
     private IgnoreListModel listModel;
79
-    /** Parent window. */
80
-    private final Window parentWindow;
81 81
 
82 82
     /**
83 83
      * Creates a new instance of IgnoreList.
@@ -235,7 +235,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
235 235
                 /** {@inheritDoc} */
236 236
                 @Override
237 237
                 public void cancelled() {
238
-                    return;
238
+                    //Ignore
239 239
                 }
240 240
             }.display();
241 241
         } else if (e.getSource() == viewToggle) {

+ 4
- 4
src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java Просмотреть файл

@@ -59,16 +59,16 @@ public class Tree extends JTree implements MouseMotionListener,
59 59
      * objects being unserialized with the new class).
60 60
      */
61 61
     private static final long serialVersionUID = 1;
62
+    /** Tree frame manager. */
63
+    private final TreeFrameManager manager;
64
+    /** UI Controller. */
65
+    private final SwingController controller;
62 66
     /** Drag selection enabled? */
63 67
     private boolean dragSelect;
64 68
     /** Drag button 1? */
65 69
     private boolean dragButton;
66 70
     /** Show handles. */
67 71
     private boolean showHandles;
68
-    /** Tree frame manager. */
69
-    private TreeFrameManager manager;
70
-    /** UI Controller. */
71
-    private SwingController controller;
72 72
 
73 73
     /**
74 74
      * Specialised JTree for frame manager.

Загрузка…
Отмена
Сохранить