Browse Source

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 years ago
parent
commit
decb60c49b
25 changed files with 47 additions and 208 deletions
  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 View File

33
 
33
 
34
 /**
34
 /**
35
  * The Audio Command allows playing of audio files.
35
  * The Audio Command allows playing of audio files.
36
- *
37
- * @author Shane "Dataforce" Mc Cormack
38
  */
36
  */
39
 public final class AudioCommand extends Command implements CommandInfo {
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
     /** {@inheritDoc} */
39
     /** {@inheritDoc} */
49
     @Override
40
     @Override
50
     public void execute(final FrameContainer origin,
41
     public void execute(final FrameContainer origin,

+ 0
- 10
src/com/dmdirc/addons/audio/BeepCommand.java View File

33
 
33
 
34
 /**
34
 /**
35
  * The Beep Command emits a beep
35
  * The Beep Command emits a beep
36
- *
37
- * @author Shane "Dataforce" Mc Cormack
38
  */
36
  */
39
 public final class BeepCommand extends Command implements CommandInfo {
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
     /** {@inheritDoc} */
39
     /** {@inheritDoc} */
49
     @Override
40
     @Override
50
     public void execute(final FrameContainer origin,
41
     public void execute(final FrameContainer origin,
77
     }
68
     }
78
 
69
 
79
 }
70
 }
80
-

+ 0
- 17
src/com/dmdirc/addons/dcc/io/DCC.java View File

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

+ 1
- 12
src/com/dmdirc/addons/dcc/io/DCCChat.java View File

23
 package com.dmdirc.addons.dcc.io;
23
 package com.dmdirc.addons.dcc.io;
24
 
24
 
25
 import com.dmdirc.addons.dcc.DCCChatHandler;
25
 import com.dmdirc.addons.dcc.DCCChatHandler;
26
+
26
 import java.io.BufferedReader;
27
 import java.io.BufferedReader;
27
 import java.io.IOException;
28
 import java.io.IOException;
28
 import java.io.InputStreamReader;
29
 import java.io.InputStreamReader;
30
 
31
 
31
 /**
32
 /**
32
  * This class handles a DCC Chat
33
  * This class handles a DCC Chat
33
- *
34
- * @author Shane 'Dataforce' McCormack
35
  */
34
  */
36
 public class DCCChat extends DCC {
35
 public class DCCChat extends DCC {
37
 
36
 
38
     /** The handler for this DCCChat. */
37
     /** The handler for this DCCChat. */
39
     private DCCChatHandler handler = null;
38
     private DCCChatHandler handler = null;
40
-
41
     /** Used to send data out the socket. */
39
     /** Used to send data out the socket. */
42
     private PrintWriter out;
40
     private PrintWriter out;
43
-
44
     /** Used to read data from the socket. */
41
     /** Used to read data from the socket. */
45
     private BufferedReader in;
42
     private BufferedReader in;
46
-
47
     /** Are we active? */
43
     /** Are we active? */
48
     private boolean active = false;
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
      * Change the handler for this DCC Chat.
47
      * Change the handler for this DCC Chat.
59
      *
48
      *

+ 0
- 8
src/com/dmdirc/addons/dcop/DcopCommand.java View File

33
 
33
 
34
 /**
34
 /**
35
  * The dcop command retrieves information from a dcop application.
35
  * The dcop command retrieves information from a dcop application.
36
- * @author chris
37
  */
36
  */
38
 public final class DcopCommand extends Command implements CommandInfo {
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
     /** {@inheritDoc} */
39
     /** {@inheritDoc} */
48
     @Override
40
     @Override
49
     public void execute(final FrameContainer origin,
41
     public void execute(final FrameContainer origin,

+ 1
- 7
src/com/dmdirc/addons/dcop/DcopPlugin.java View File

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

+ 0
- 5
src/com/dmdirc/addons/dns/DNSCommand.java View File

37
  */
37
  */
38
 public final class DNSCommand extends Command implements CommandInfo {
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
     /** {@inheritDoc} */
40
     /** {@inheritDoc} */
46
     @Override
41
     @Override
47
     public void execute(final FrameContainer origin,
42
     public void execute(final FrameContainer origin,

+ 0
- 5
src/com/dmdirc/addons/dns/DNSPlugin.java View File

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

+ 3
- 8
src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java View File

47
 /**
47
 /**
48
  * This plugin adds freedesktop Style Notifications to dmdirc.
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
     /** The DcopCommand we created */
53
     /** The DcopCommand we created */
52
     private FDNotifyCommand command = null;
54
     private FDNotifyCommand command = null;
53
     /** notification timeout. */
55
     /** notification timeout. */
61
     /** Strip codes. */
63
     /** Strip codes. */
62
     private boolean stripcodes;
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
      * Used to show a notification using this plugin.
67
      * Used to show a notification using this plugin.
73
      *
68
      *

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java View File

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

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java View File

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

+ 0
- 7
src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java View File

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

+ 0
- 9
src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java View File

35
 /**
35
 /**
36
  * Provides a media source for mplayer which uses lsof to hackily see what
36
  * Provides a media source for mplayer which uses lsof to hackily see what
37
  * mplayer is currently accessing.
37
  * mplayer is currently accessing.
38
- *
39
- * @author chris
40
  */
38
  */
41
 public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource {
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
     /** {@inheritDoc} */
41
     /** {@inheritDoc} */
51
     @Override
42
     @Override
52
     public void onLoad() {
43
     public void onLoad() {

+ 0
- 7
src/com/dmdirc/addons/notifications/NotificationsPlugin.java View File

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

+ 3
- 10
src/com/dmdirc/addons/parserdebug/DebugPlugin.java View File

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

+ 1
- 9
src/com/dmdirc/addons/relaybot/RelayBotPlugin.java View File

51
 
51
 
52
 /**
52
 /**
53
  * This plugin makes certain relay bots less obnoxious looking.
53
  * This plugin makes certain relay bots less obnoxious looking.
54
- *
55
- * @author shane
56
  */
54
  */
57
 public class RelayBotPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
55
 public class RelayBotPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
56
+
58
     /** Known RelayChannelHandlers. */
57
     /** Known RelayChannelHandlers. */
59
     private final Map<Channel, RelayChannelHandler> handlers = new HashMap<Channel, RelayChannelHandler>();
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
     /** {@inheritDoc} */
60
     /** {@inheritDoc} */
69
     @Override
61
     @Override
70
     public void onLoad() {
62
     public void onLoad() {

+ 0
- 9
src/com/dmdirc/addons/time/TimePlugin.java View File

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

+ 13
- 27
src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java View File

142
                 getOptionInt("dialogstate", "actionsmanagerdialog");
142
                 getOptionInt("dialogstate", "actionsmanagerdialog");
143
         if (selected >= 0 && selected < me.groups.getModel().getSize()) {
143
         if (selected >= 0 && selected < me.groups.getModel().getSize()) {
144
             me.groups.setSelectedIndex(selected);
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
     private void initComponents() {
175
     private void initComponents() {
176
         orderButtons(new JButton(), new JButton());
176
         orderButtons(new JButton(), new JButton());
177
         infoLabel = new TextLabel("Actions allow you to make DMDirc"
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
         groups = new JList(new SortedListModel<ActionGroup>(
181
         groups = new JList(new SortedListModel<ActionGroup>(
182
                 new ActionGroupNameComparator()));
182
                 new ActionGroupNameComparator()));
183
         actions = new ActionsGroupPanel(this, null);
183
         actions = new ActionsGroupPanel(this, null);
192
         groupPanel.setName("Groups");
192
         groupPanel.setName("Groups");
193
 
193
 
194
         groupPanel.setBorder(BorderFactory.createTitledBorder(UIManager.
194
         groupPanel.setBorder(BorderFactory.createTitledBorder(UIManager.
195
-                getBorder("TitledBorder.border"),
196
-                "Groups"));
195
+                getBorder("TitledBorder.border"), "Groups"));
197
         info.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
196
         info.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
198
-                "TitledBorder.border"),
199
-                "Information"));
197
+                "TitledBorder.border"), "Information"));
200
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
198
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
201
-                "TitledBorder.border"),
202
-                "Actions"));
199
+                "TitledBorder.border"), "Actions"));
203
 
200
 
204
         groups.setCellRenderer(new ActionGroupListCellRenderer());
201
         groups.setCellRenderer(new ActionGroupListCellRenderer());
205
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
202
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
280
      */
277
      */
281
     private void reloadGroups(final ActionGroup selectedGroup) {
278
     private void reloadGroups(final ActionGroup selectedGroup) {
282
         ((DefaultListModel) groups.getModel()).clear();
279
         ((DefaultListModel) groups.getModel()).clear();
283
-        for (ActionGroup group : ActionManager.getActionManager().getGroupsMap().values()) {
280
+        for (ActionGroup group : ActionManager.getActionManager()
281
+                .getGroupsMap().values()) {
284
             ((DefaultListModel) groups.getModel()).addElement(group);
282
             ((DefaultListModel) groups.getModel()).addElement(group);
285
         }
283
         }
286
         groups.setSelectedValue(selectedGroup, true);
284
         groups.setSelectedValue(selectedGroup, true);
348
                 ModalityType.DOCUMENT_MODAL, "New action group",
346
                 ModalityType.DOCUMENT_MODAL, "New action group",
349
                 "Please enter the name of the new action group", validator) {
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
             private static final long serialVersionUID = 1;
350
             private static final long serialVersionUID = 1;
357
 
351
 
358
             /** {@inheritDoc} */
352
             /** {@inheritDoc} */
392
                 ModalityType.DOCUMENT_MODAL, "Edit action group",
386
                 ModalityType.DOCUMENT_MODAL, "Edit action group",
393
                 "Please enter the new name of the action group", validator) {
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
             private static final long serialVersionUID = 1;
390
             private static final long serialVersionUID = 1;
401
 
391
 
402
             /** {@inheritDoc} */
392
             /** {@inheritDoc} */
437
                 "Are you sure you wish to delete the '" + group
427
                 "Are you sure you wish to delete the '" + group
438
                 + "' group and all actions within it?") {
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
             private static final long serialVersionUID = 1;
431
             private static final long serialVersionUID = 1;
446
 
432
 
447
             /** {@inheritDoc} */
433
             /** {@inheritDoc} */

+ 7
- 10
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java View File

153
         tableModel = new AliasTableModel(getTableData());
153
         tableModel = new AliasTableModel(getTableData());
154
         table = new PackingTable(tableModel, false, scrollPane, false) {
154
         table = new PackingTable(tableModel, false, scrollPane, false) {
155
 
155
 
156
+            /** Java Serialisation verion ID. */
156
             private static final long serialVersionUID = 1;
157
             private static final long serialVersionUID = 1;
157
 
158
 
159
+            /** {@inheritDoc} */
158
             @Override
160
             @Override
159
             public TableCellRenderer getCellRenderer(final int row,
161
             public TableCellRenderer getCellRenderer(final int row,
160
                     final int column) {
162
                     final int column) {
309
             if (checkForDuplicates()) {
311
             if (checkForDuplicates()) {
310
                 final StandardQuestionDialog dialog = new StandardQuestionDialog(
312
                 final StandardQuestionDialog dialog = new StandardQuestionDialog(
311
                         this, ModalityType.APPLICATION_MODAL,
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
                     private static final long serialVersionUID = 1;
318
                     private static final long serialVersionUID = 1;
322
 
319
 
323
                     /** {@inheritDoc} */
320
                     /** {@inheritDoc} */
329
                     /** {@inheritDoc} */
326
                     /** {@inheritDoc} */
330
                     @Override
327
                     @Override
331
                     public void cancelled() {
328
                     public void cancelled() {
332
-                        return;
329
+                        //Ignore
333
                     }
330
                     }
334
                 };
331
                 };
335
                 dialog.getOkButton().setVisible(false);
332
                 dialog.getOkButton().setVisible(false);

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java View File

310
             /** {@inheritDoc} */
310
             /** {@inheritDoc} */
311
             @Override
311
             @Override
312
             public void cancelled() {
312
             public void cancelled() {
313
-                return;
313
+                //Ignore
314
             }
314
             }
315
         }.display();
315
         }.display();
316
     }
316
     }

+ 0
- 6
src/com/dmdirc/addons/ui_swing/dialogs/profiles/Profile.java View File

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

+ 6
- 6
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java View File

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

+ 4
- 5
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java View File

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

+ 3
- 3
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java View File

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

+ 4
- 4
src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java View File

59
      * objects being unserialized with the new class).
59
      * objects being unserialized with the new class).
60
      */
60
      */
61
     private static final long serialVersionUID = 1;
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
     /** Drag selection enabled? */
66
     /** Drag selection enabled? */
63
     private boolean dragSelect;
67
     private boolean dragSelect;
64
     /** Drag button 1? */
68
     /** Drag button 1? */
65
     private boolean dragButton;
69
     private boolean dragButton;
66
     /** Show handles. */
70
     /** Show handles. */
67
     private boolean showHandles;
71
     private boolean showHandles;
68
-    /** Tree frame manager. */
69
-    private TreeFrameManager manager;
70
-    /** UI Controller. */
71
-    private SwingController controller;
72
 
72
 
73
     /**
73
     /**
74
      * Specialised JTree for frame manager.
74
      * Specialised JTree for frame manager.

Loading…
Cancel
Save