Browse Source

Fix line endings / trailing spaces

Change-Id: Id0a4aa086f7fb9bac776ec4c877aa8628175c0bc
Reviewed-on: http://gerrit.dmdirc.com/1921
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
tags/0.7rc1
Chris Smith 13 years ago
parent
commit
f5fff70ef4
100 changed files with 662 additions and 662 deletions
  1. 2
    2
      src/com/dmdirc/addons/calc/CalcCommand.java
  2. 1
    1
      src/com/dmdirc/addons/calc/CalcPlugin.java
  3. 1
    1
      src/com/dmdirc/addons/calc/TokenType.java
  4. 1
    1
      src/com/dmdirc/addons/calc/TreeToken.java
  5. 10
    10
      src/com/dmdirc/addons/dcc/DCCPlugin.java
  6. 1
    1
      src/com/dmdirc/addons/dcc/io/DCCTransfer.java
  7. 1
    1
      src/com/dmdirc/addons/dcc/ui/PlaceholderWindow.java
  8. 2
    2
      src/com/dmdirc/addons/dcc/ui/TransferWindow.java
  9. 7
    7
      src/com/dmdirc/addons/dcop/DcopCommand.java
  10. 11
    11
      src/com/dmdirc/addons/dcop/DcopPlugin.java
  11. 7
    7
      src/com/dmdirc/addons/dns/DNSCommand.java
  12. 11
    11
      src/com/dmdirc/addons/dns/DNSPlugin.java
  13. 5
    5
      src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java
  14. 13
    13
      src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java
  15. 174
    174
      src/com/dmdirc/addons/identd/IdentdPlugin.java
  16. 1
    1
      src/com/dmdirc/addons/lagdisplay/LagDisplayPanel.java
  17. 13
    13
      src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java
  18. 3
    3
      src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java
  19. 1
    1
      src/com/dmdirc/addons/logging/package-info.java
  20. 1
    1
      src/com/dmdirc/addons/mediasource_dbus/BansheeSource.java
  21. 11
    11
      src/com/dmdirc/addons/mediasource_dcop/AmarokSource.java
  22. 6
    6
      src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java
  23. 9
    9
      src/com/dmdirc/addons/mediasource_dcop/KaffeineSource.java
  24. 10
    10
      src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java
  25. 7
    7
      src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java
  26. 9
    9
      src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java
  27. 1
    1
      src/com/dmdirc/addons/notifications/NotificationsPlugin.java
  28. 10
    10
      src/com/dmdirc/addons/nowplaying/MediaSource.java
  29. 6
    6
      src/com/dmdirc/addons/nowplaying/MediaSourceComparator.java
  30. 4
    4
      src/com/dmdirc/addons/nowplaying/MediaSourceManager.java
  31. 4
    4
      src/com/dmdirc/addons/nowplaying/NowPlayingSubsitutionPanel.java
  32. 1
    1
      src/com/dmdirc/addons/osd/OsdManager.java
  33. 14
    14
      src/com/dmdirc/addons/osd/OsdPlugin.java
  34. 1
    1
      src/com/dmdirc/addons/parser_twitter/Twitter.java
  35. 1
    1
      src/com/dmdirc/addons/parser_twitter/api/TwitterStatus.java
  36. 4
    4
      src/com/dmdirc/addons/parser_twitter/api/TwitterUser.java
  37. 2
    2
      src/com/dmdirc/addons/parser_twitter/api/XMLResponse.java
  38. 5
    5
      src/com/dmdirc/addons/parser_xmpp/XmppFakeChannel.java
  39. 2
    2
      src/com/dmdirc/addons/parser_xmpp/XmppPlugin.java
  40. 4
    4
      src/com/dmdirc/addons/parserdebug/DebugPlugin.java
  41. 5
    5
      src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java
  42. 2
    2
      src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java
  43. 8
    8
      src/com/dmdirc/addons/redirect/RedirectPlugin.java
  44. 15
    15
      src/com/dmdirc/addons/scriptplugin/ScriptCommand.java
  45. 13
    13
      src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java
  46. 3
    3
      src/com/dmdirc/addons/serverlists/ServerGroup.java
  47. 3
    3
      src/com/dmdirc/addons/systray/PopupCommand.java
  48. 12
    12
      src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java
  49. 3
    3
      src/com/dmdirc/addons/tabcompletion_bash/BashStylePlugin.java
  50. 7
    7
      src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java
  51. 2
    2
      src/com/dmdirc/addons/tabcompletion_mirc/MircStylePlugin.java
  52. 5
    5
      src/com/dmdirc/addons/time/TimeActionMetaType.java
  53. 6
    6
      src/com/dmdirc/addons/time/TimeActionType.java
  54. 2
    2
      src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java
  55. 4
    4
      src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java
  56. 2
    2
      src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java
  57. 4
    4
      src/com/dmdirc/addons/ui_swing/BackgroundOption.java
  58. 1
    1
      src/com/dmdirc/addons/ui_swing/MainFrame.java
  59. 1
    1
      src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java
  60. 3
    3
      src/com/dmdirc/addons/ui_swing/SwingWindowListener.java
  61. 1
    1
      src/com/dmdirc/addons/ui_swing/components/PackingTable.java
  62. 1
    1
      src/com/dmdirc/addons/ui_swing/components/SortedListModel.java
  63. 1
    1
      src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java
  64. 6
    6
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java
  65. 2
    2
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java
  66. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellEditor.java
  67. 4
    4
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellRenderer.java
  68. 5
    5
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonSorter.java
  69. 4
    4
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonTable.java
  70. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonType.java
  71. 2
    2
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java
  72. 5
    5
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/DownloaderWindow.java
  73. 3
    3
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java
  74. 12
    12
      src/com/dmdirc/addons/ui_swing/components/colours/ColourChooser.java
  75. 13
    13
      src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java
  76. 24
    24
      src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerPanel.java
  77. 13
    13
      src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java
  78. 1
    1
      src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java
  79. 4
    4
      src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationListener.java
  80. 1
    1
      src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java
  81. 1
    1
      src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java
  82. 1
    1
      src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java
  83. 2
    2
      src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java
  84. 8
    8
      src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java
  85. 7
    7
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionComparisonCellRenderer.java
  86. 8
    8
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionConditionCellRenderer.java
  87. 6
    6
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeRenderer.java
  88. 5
    5
      src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeTableCellRenderer.java
  89. 5
    5
      src/com/dmdirc/addons/ui_swing/components/renderers/AddOptionCellRenderer.java
  90. 4
    4
      src/com/dmdirc/addons/ui_swing/components/renderers/ArrayCellRenderer.java
  91. 3
    3
      src/com/dmdirc/addons/ui_swing/components/renderers/CertificateChainEntryCellRenderer.java
  92. 8
    8
      src/com/dmdirc/addons/ui_swing/components/renderers/DateCellRenderer.java
  93. 3
    3
      src/com/dmdirc/addons/ui_swing/components/renderers/ErrorLevelIconCellRenderer.java
  94. 7
    7
      src/com/dmdirc/addons/ui_swing/components/renderers/ExtendedListModeCellRenderer.java
  95. 1
    1
      src/com/dmdirc/addons/ui_swing/components/renderers/FontListCellRenderer.java
  96. 2
    2
      src/com/dmdirc/addons/ui_swing/components/renderers/ListModeCellRenderer.java
  97. 3
    3
      src/com/dmdirc/addons/ui_swing/components/renderers/TopicCellRenderer.java
  98. 1
    1
      src/com/dmdirc/addons/ui_swing/components/renderers/URIHandlerCellRenderer.java
  99. 5
    5
      src/com/dmdirc/addons/ui_swing/components/renderers/UpdateComponentTableCellRenderer.java
  100. 0
    0
      src/com/dmdirc/addons/ui_swing/components/renderers/UpdateStatusTableCellRenderer.java

+ 2
- 2
src/com/dmdirc/addons/calc/CalcCommand.java View File

@@ -59,10 +59,10 @@ public class CalcCommand extends Command implements CommandInfo {
59 59
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
60 60
                     (showexpr ? input + " = " : "") + result);
61 61
         } catch (ParseException ex) {
62
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, 
62
+            sendLine(origin, args.isSilent(), FORMAT_ERROR,
63 63
                     "Unable to parse expression: " + ex.getMessage());
64 64
         } catch (ArithmeticException ex) {
65
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, 
65
+            sendLine(origin, args.isSilent(), FORMAT_ERROR,
66 66
                     "Unable to calculate expression: " + ex.getMessage());
67 67
         }
68 68
     }

+ 1
- 1
src/com/dmdirc/addons/calc/CalcPlugin.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.plugins.Plugin;
27 27
 
28 28
 /**
29 29
  * A plugin which parses and evaluates various mathematical expressions.
30
- * 
30
+ *
31 31
  * @author chris
32 32
  */
33 33
 public class CalcPlugin extends Plugin {

+ 1
- 1
src/com/dmdirc/addons/calc/TokenType.java View File

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
30 30
 /**
31 31
  * Describes the different types of possible token, their arities, precedence,
32 32
  * and the types of token that may follow them.
33
- * 
33
+ *
34 34
  * @author chris
35 35
  */
36 36
 public enum TokenType {

+ 1
- 1
src/com/dmdirc/addons/calc/TreeToken.java View File

@@ -27,7 +27,7 @@ import java.util.List;
27 27
 
28 28
 /**
29 29
  * Describes a tree of {@link Token}s.
30
- * 
30
+ *
31 31
  * @author chris
32 32
  */
33 33
 public class TreeToken {

+ 10
- 10
src/com/dmdirc/addons/dcc/DCCPlugin.java View File

@@ -107,7 +107,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
107 107
      * @param reverse Is this a reverse dcc?
108 108
      * @param token Token used in reverse dcc.
109 109
      */
110
-    public void saveFile(final String nickname, final DCCTransfer send, 
110
+    public void saveFile(final String nickname, final DCCTransfer send,
111 111
             final Parser parser, final boolean reverse, final String token) {
112 112
         // New thread to ask the user where to save in to stop us locking the UI
113 113
         new Thread(new Runnable() {
@@ -145,13 +145,13 @@ public final class DCCPlugin extends Plugin implements ActionListener {
145 145
                                         + jc.getSelectedFile().length() + " "
146 146
                                         + token);
147 147
                             } else {
148
-                                parser.sendCTCP(nickname, "DCC", "RESUME " 
148
+                                parser.sendCTCP(nickname, "DCC", "RESUME "
149 149
                                         + send.getShortFileName() + " 0 "
150 150
                                         + jc.getSelectedFile().length());
151 151
                             }
152 152
                         } else {
153 153
                             if (listen(send)) {
154
-                                parser.sendCTCP(nickname, "DCC", "SEND " 
154
+                                parser.sendCTCP(nickname, "DCC", "SEND "
155 155
                                         + send.getShortFileName() + " "
156 156
                                         + DCC.ipToLong(getListenIP(parser))
157 157
                                         + " " + send.getPort() + " "
@@ -163,7 +163,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
163 163
                                 + nickname, nickname, null);
164 164
                         if (resume) {
165 165
                             parser.sendCTCP(nickname, "DCC", "RESUME "
166
-                                    + send.getShortFileName() + " " 
166
+                                    + send.getShortFileName() + " "
167 167
                                     + send.getPort() + " "
168 168
                                     + jc.getSelectedFile().length());
169 169
                         } else {
@@ -190,7 +190,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
190 190
     private boolean handleExists(final DCCTransfer send, final JFileChooser jc,
191 191
             final String nickname, final Parser parser, final boolean reverse,
192 192
             final String token) {
193
-        if (jc.getSelectedFile().exists() && send.getFileSize() > -1 
193
+        if (jc.getSelectedFile().exists() && send.getFileSize() > -1
194 194
                 && send.getFileSize() <= jc.getSelectedFile().length()) {
195 195
             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
196 196
                     "receive.autoaccept")) {
@@ -301,7 +301,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
301 301
      * @param dontAsk Don't ask any questions, assume yes.
302 302
      * @param arguments The arguments for the event
303 303
      */
304
-    public void handleProcessEvent(final ActionType type, 
304
+    public void handleProcessEvent(final ActionType type,
305 305
             final StringBuffer format, final boolean dontAsk,
306 306
             final Object... arguments) {
307 307
         if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
@@ -542,7 +542,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
542 542
                 final Parser parser = ((Server) arguments[0]).getParser();
543 543
                 final String nick = ((ClientInfo) arguments[1]).getNickname();
544 544
                 if (ctcpData[0].equalsIgnoreCase("resume")) {
545
-                    parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\"" 
545
+                    parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\""
546 546
                             + filename + "\"" : filename) + " " + port + " "
547 547
                             + send.setFileStart(position) + token);
548 548
                 } else {
@@ -551,16 +551,16 @@ public final class DCCPlugin extends Plugin implements ActionListener {
551 551
                         // Reverse dcc
552 552
                         if (listen(send)) {
553 553
                             if (send.getToken().isEmpty()) {
554
-                                parser.sendCTCP(nick, "DCC", "SEND " 
554
+                                parser.sendCTCP(nick, "DCC", "SEND "
555 555
                                         + ((quoted) ? "\"" + filename
556
-                                        + "\"" : filename) + " " 
556
+                                        + "\"" : filename) + " "
557 557
                                         + DCC.ipToLong(send.getHost())
558 558
                                         + " " + send.getPort()
559 559
                                         + " " + send.getFileSize());
560 560
                             } else {
561 561
                                 parser.sendCTCP(nick, "DCC", "SEND "
562 562
                                         + ((quoted) ? "\"" + filename
563
-                                        + "\"" : filename) 
563
+                                        + "\"" : filename)
564 564
                                         + " " + DCC.ipToLong(send.getHost())
565 565
                                         + " " + send.getPort()
566 566
                                         + " " + send.getFileSize() + " "

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

@@ -372,7 +372,7 @@ public class DCCTransfer extends DCC {
372 372
         }
373 373
         out = null;
374 374
         in = null;
375
-        
375
+
376 376
         for (DCCTransferHandler handler : handlers.get(DCCTransferHandler.class)) {
377 377
             handler.socketClosed(this);
378 378
         }

+ 1
- 1
src/com/dmdirc/addons/dcc/ui/PlaceholderWindow.java View File

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
29 29
 /**
30 30
  * A virtually empty window which serves as a top-level placeholder for other
31 31
  * DCC windows.
32
- * 
32
+ *
33 33
  * @author chris
34 34
  * @since 0.6.4
35 35
  */

+ 2
- 2
src/com/dmdirc/addons/dcc/ui/TransferWindow.java View File

@@ -90,7 +90,7 @@ public class TransferWindow extends EmptyWindow implements ActionListener,
90 90
      */
91 91
     public TransferWindow(final SwingController controller, final FrameContainer owner) {
92 92
         super(controller, owner);
93
-        
93
+
94 94
         final TransferContainer container = (TransferContainer) owner;
95 95
         dcc = container.getDCC();
96 96
 
@@ -190,7 +190,7 @@ public class TransferWindow extends EmptyWindow implements ActionListener,
190 190
                     if (container.shouldShowOpenButton()) {
191 191
                         openButton.setVisible(true);
192 192
                     }
193
-                    
193
+
194 194
                     progress.setValue(100);
195 195
                     button.setText("Close Window");
196 196
                 } else {

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

@@ -36,7 +36,7 @@ import java.util.List;
36 36
  * @author chris
37 37
  */
38 38
 public final class DcopCommand extends Command implements CommandInfo {
39
-    
39
+
40 40
     /**
41 41
      * Creates a new instance of DcopCommand.
42 42
      */
@@ -52,20 +52,20 @@ public final class DcopCommand extends Command implements CommandInfo {
52 52
             showUsage(origin, args.isSilent(), "dcop", "<app> <object> <function>");
53 53
             return;
54 54
         }
55
-        
55
+
56 56
         final List<String> res = DcopPlugin.getDcopResult("dcop " + args.getArgumentsAsString());
57 57
         for (String line : res) {
58 58
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, line);
59 59
         }
60 60
     }
61
-    
62
-    
61
+
62
+
63 63
     /** {@inheritDoc} */
64 64
     @Override
65 65
     public String getName() {
66 66
         return "dcop";
67 67
     }
68
-    
68
+
69 69
     /** {@inheritDoc} */
70 70
     @Override
71 71
     public boolean showInHelp() {
@@ -77,11 +77,11 @@ public final class DcopCommand extends Command implements CommandInfo {
77 77
     public CommandType getType() {
78 78
         return CommandType.TYPE_SERVER;
79 79
     }
80
-    
80
+
81 81
     /** {@inheritDoc} */
82 82
     @Override
83 83
     public String getHelp() {
84 84
         return "dcop <app> <object> <function> - retrieves information from a DCOP aplication";
85 85
     }
86
-    
86
+
87 87
 }

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

@@ -33,18 +33,18 @@ import java.util.List;
33 33
 
34 34
 /**
35 35
  * Allows the user to execute dcop commands (and read the results).
36
- * 
36
+ *
37 37
  * @author chris
38 38
  */
39 39
 public final class DcopPlugin extends Plugin {
40 40
     /** The DcopCommand we created */
41 41
     private DcopCommand command = null;
42
-    
42
+
43 43
     /** Creates a new instance of DcopPlugin. */
44 44
     public DcopPlugin() {
45 45
         super();
46 46
     }
47
-    
47
+
48 48
     /**
49 49
      * Retrieves the result from executing the specified command.
50 50
      *
@@ -57,36 +57,36 @@ public final class DcopPlugin extends Plugin {
57 57
         InputStreamReader reader;
58 58
         BufferedReader input;
59 59
         Process process;
60
-        
60
+
61 61
         try {
62 62
             process = Runtime.getRuntime().exec(command);
63
-            
63
+
64 64
             reader = new InputStreamReader(process.getInputStream());
65 65
             input = new BufferedReader(reader);
66
-            
66
+
67 67
             String line = "";
68
-            
68
+
69 69
             while ((line = input.readLine()) != null) {
70 70
                 result.add(line);
71 71
             }
72
-            
72
+
73 73
             reader.close();
74 74
             input.close();
75 75
             process.destroy();
76 76
         } catch (IOException ex) {
77 77
             // Do nothing
78 78
         }
79
-        
79
+
80 80
         return result;
81 81
     }
82
-    
82
+
83 83
     /** {@inheritDoc} */
84 84
     @Override
85 85
     public void onLoad() {
86 86
         command = new DcopCommand();
87 87
         CommandManager.registerCommand(command);
88 88
     }
89
-    
89
+
90 90
     /** {@inheritDoc} */
91 91
     @Override
92 92
     public void onUnload() {

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

@@ -36,12 +36,12 @@ import java.util.TimerTask;
36 36
  * Performs DNS lookups for nicknames, hostnames or IPs.
37 37
  */
38 38
 public final class DNSCommand extends Command implements CommandInfo {
39
-    
39
+
40 40
     /** Creates a new instance of DNSCommand. */
41 41
     public DNSCommand() {
42 42
         super();
43 43
     }
44
-    
44
+
45 45
     /** {@inheritDoc} */
46 46
     @Override
47 47
     public void execute(final FrameContainer origin,
@@ -50,7 +50,7 @@ public final class DNSCommand extends Command implements CommandInfo {
50 50
             showUsage(origin, args.isSilent(), "dns", "<IP|hostname>");
51 51
             return;
52 52
         }
53
-        
53
+
54 54
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Resolving: " + args.getArguments()[0]);
55 55
         new Timer("DNS Command Timer").schedule(new TimerTask() {
56 56
             /** {@inheritDoc} */
@@ -68,13 +68,13 @@ public final class DNSCommand extends Command implements CommandInfo {
68 68
             }
69 69
         }, 0);
70 70
     }
71
-    
71
+
72 72
     /** {@inheritDoc} */
73 73
     @Override
74 74
     public String getName() {
75 75
         return "dns";
76 76
     }
77
-    
77
+
78 78
     /** {@inheritDoc} */
79 79
     @Override
80 80
     public boolean showInHelp() {
@@ -86,11 +86,11 @@ public final class DNSCommand extends Command implements CommandInfo {
86 86
     public CommandType getType() {
87 87
         return CommandType.TYPE_GLOBAL;
88 88
     }
89
-    
89
+
90 90
     /** {@inheritDoc} */
91 91
     @Override
92 92
     public String getHelp() {
93 93
         return "dns <IP|hostname> - Performs DNS lookup of the specified ip/hostname/nickname";
94 94
     }
95
-    
95
+
96 96
 }

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

@@ -35,28 +35,28 @@ import java.util.List;
35 35
  * DNS plugin.
36 36
  */
37 37
 public final class DNSPlugin extends Plugin {
38
-    
38
+
39 39
     /** The DNSCommand we've registered. */
40 40
     private DNSCommand command;
41
-    
41
+
42 42
     /** Creates a new instance of DNSPlugin. */
43 43
     public DNSPlugin() {
44 44
         super();
45 45
     }
46
-    
46
+
47 47
     /** {@inheritDoc} */
48 48
     @Override
49 49
     public void onLoad() {
50 50
         command = new DNSCommand();
51 51
         CommandManager.registerCommand(command);
52 52
     }
53
-    
53
+
54 54
     /** {@inheritDoc} */
55 55
     @Override
56 56
     public void onUnload() {
57 57
         CommandManager.unregisterCommand(command);
58 58
     }
59
-    
59
+
60 60
     /**
61 61
      * Returns the IP(s) for a hostname.
62 62
      *
@@ -66,21 +66,21 @@ public final class DNSPlugin extends Plugin {
66 66
      */
67 67
     public static String getIPs(final String hostname) {
68 68
         List<String> results = new ArrayList<String>();
69
-        
69
+
70 70
         try {
71 71
             final InetAddress[] ips = InetAddress.getAllByName(hostname);
72
-            
72
+
73 73
             for (InetAddress ip : ips) {
74 74
                 results.add(ip.getHostAddress());
75 75
             }
76
-            
76
+
77 77
         } catch (UnknownHostException ex) {
78 78
             results = new ArrayList<String>();
79 79
         }
80
-        
80
+
81 81
         return results.toString();
82 82
     }
83
-    
83
+
84 84
     /**
85 85
      * Returns the hostname for an ip.
86 86
      *
@@ -95,5 +95,5 @@ public final class DNSPlugin extends Plugin {
95 95
             return "";
96 96
         }
97 97
     }
98
-    
98
+
99 99
 }

+ 5
- 5
src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java View File

@@ -38,7 +38,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
38 38
 public final class FDNotifyCommand extends Command implements CommandInfo {
39 39
     /** Plugin that owns this command. */
40 40
     final FreeDesktopNotificationsPlugin myPlugin;
41
-    
41
+
42 42
     /**
43 43
      * Creates a new instance of FDNotifyCommand.
44 44
      *
@@ -60,14 +60,14 @@ public final class FDNotifyCommand extends Command implements CommandInfo {
60 60
             }
61 61
         }.start();
62 62
     }
63
-    
64
-    
63
+
64
+
65 65
     /** {@inheritDoc} */
66 66
     @Override
67 67
     public String getName() {
68 68
         return "fdnotify";
69 69
     }
70
-    
70
+
71 71
     /** {@inheritDoc} */
72 72
     @Override
73 73
     public boolean showInHelp() {
@@ -79,7 +79,7 @@ public final class FDNotifyCommand extends Command implements CommandInfo {
79 79
     public CommandType getType() {
80 80
         return CommandType.TYPE_GLOBAL;
81 81
     }
82
-    
82
+
83 83
     /** {@inheritDoc} */
84 84
     @Override
85 85
     public String getHelp() {

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

@@ -60,7 +60,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
60 60
     private boolean strictescape;
61 61
     /** Strip codes. */
62 62
     private boolean stripcodes;
63
-    
63
+
64 64
     /**
65 65
      * Creates a new instance of the FreeDesktopNotifications Plugin.
66 66
      */
@@ -77,9 +77,9 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
77 77
      */
78 78
     public boolean showNotification(final String title, final String message) {
79 79
         if (getFilesDir() == null) { return false; }
80
-        
80
+
81 81
         final ArrayList<String> args = new ArrayList<String>();
82
-        
82
+
83 83
         args.add("/usr/bin/env");
84 84
         args.add("python");
85 85
         args.add(getFilesDirString() + "notify.py");
@@ -97,7 +97,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
97 97
             args.add("Notification from DMDirc");
98 98
         }
99 99
         args.add(prepareString(message));
100
-        
100
+
101 101
         try {
102 102
             final Process myProcess = Runtime.getRuntime().exec(args.toArray(new String[]{}));
103 103
             final StringBuffer data = new StringBuffer();
@@ -108,10 +108,10 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
108 108
         } catch (SecurityException e) {
109 109
         } catch (IOException e) {
110 110
         }
111
-        
111
+
112 112
         return false;
113 113
     }
114
-    
114
+
115 115
     /**
116 116
      * Prepare the string for sending to dbus.
117 117
      *
@@ -130,7 +130,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
130 130
                 output = output.replace(">", "&gt;");
131 131
             }
132 132
         }
133
-        
133
+
134 134
         return output;
135 135
     }
136 136
 
@@ -147,13 +147,13 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
147 147
 
148 148
         // Extract required Files
149 149
         final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("freedesktop_notifications");
150
-        
150
+
151 151
         // This shouldn't actually happen, but check to make sure.
152 152
         if (pi != null) {
153 153
             // Now get the RM
154 154
             try {
155 155
                 final ResourceManager res = pi.getResourceManager();
156
-                
156
+
157 157
                 // Extract the files needed
158 158
                 try {
159 159
                     res.extractResoucesEndingWith(getFilesDir(), ".py");
@@ -175,24 +175,24 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
175 175
         CommandManager.unregisterCommand(command);
176 176
         IdentityManager.getGlobalConfig().removeListener(this);
177 177
     }
178
-    
178
+
179 179
     /** {@inheritDoc} */
180 180
     @Override
181 181
     public void domainUpdated() {
182 182
         IdentityManager.getAddonIdentity().setOption(getDomain(), "general.icon", getFilesDirString() + "icon.png");
183 183
     }
184
-    
184
+
185 185
     /** {@inheritDoc} */
186 186
     @Override
187 187
     public void showConfig(final PreferencesDialogModel manager) {
188 188
         final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "FreeDesktop Notifications", "General configuration for FreeDesktop Notifications plugin.");
189
-        
189
+
190 190
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "general.timeout", "Timeout", "Length of time in seconds before the notification popup closes."));
191 191
         general.addSetting(new PreferencesSetting(PreferencesType.FILE, getDomain(), "general.icon", "icon", "Path to icon to use on the notification."));
192 192
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.escapehtml", "Escape HTML", "Some Implementations randomly parse HTML, escape it before showing?"));
193 193
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.strictescape", "Strict Escape HTML", "Strictly escape HTML or just the basic characters? (&, < and >)"));
194 194
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.stripcodes", "Strip Control Codes", "Strip IRC Control codes from messages?"));
195
-        
195
+
196 196
         manager.getCategory("Plugins").addSubCategory(general);
197 197
     }
198 198
 

+ 174
- 174
src/com/dmdirc/addons/identd/IdentdPlugin.java View File

@@ -1,174 +1,174 @@
1
-/*
2
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- *
4
- * Permission is hereby granted, free of charge, to any person obtaining a copy
5
- * of this software and associated documentation files (the "Software"), to deal
6
- * in the Software without restriction, including without limitation the rights
7
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
- * copies of the Software, and to permit persons to whom the Software is
9
- * furnished to do so, subject to the following conditions:
10
- *
11
- * The above copyright notice and this permission notice shall be included in
12
- * all copies or substantial portions of the Software.
13
- *
14
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20
- * SOFTWARE.
21
- */
22
-
23
-package com.dmdirc.addons.identd;
24
-
25
-import com.dmdirc.Server;
26
-import com.dmdirc.actions.ActionManager;
27
-import com.dmdirc.actions.CoreActionType;
28
-import com.dmdirc.actions.interfaces.ActionType;
29
-import com.dmdirc.config.IdentityManager;
30
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
31
-import com.dmdirc.config.prefs.PreferencesCategory;
32
-import com.dmdirc.config.prefs.PreferencesDialogModel;
33
-import com.dmdirc.config.prefs.PreferencesSetting;
34
-import com.dmdirc.config.prefs.PreferencesType;
35
-import com.dmdirc.util.validators.PortValidator;
36
-import com.dmdirc.interfaces.ActionListener;
37
-import com.dmdirc.plugins.Plugin;
38
-
39
-import java.util.ArrayList;
40
-import java.util.List;
41
-
42
-/**
43
- * The Identd plugin answers ident requests from IRC servers.
44
- */
45
-public class IdentdPlugin extends Plugin implements ActionListener {
46
-
47
-    /** Array list to store all the servers in that need ident replies. */
48
-    private final List<Server> servers = new ArrayList<Server>();
49
-
50
-    /** The IdentdServer that we use. */
51
-    private IdentdServer myServer;
52
-
53
-    /**
54
-     * Called when the plugin is loaded.
55
-     */
56
-    @Override
57
-    public void onLoad() {
58
-        // Add action hooks
59
-        ActionManager.getActionManager().registerListener(this,
60
-                CoreActionType.SERVER_CONNECTED,
61
-                CoreActionType.SERVER_CONNECTING,
62
-                CoreActionType.SERVER_CONNECTERROR);
63
-
64
-        myServer = new IdentdServer(this);
65
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
66
-                "advanced.alwaysOn")) {
67
-            myServer.startServer();
68
-        }
69
-    }
70
-
71
-    /**
72
-     * Called when this plugin is unloaded.
73
-     */
74
-    @Override
75
-    public void onUnload() {
76
-        myServer.stopServer();
77
-        servers.clear();
78
-        ActionManager.getActionManager().unregisterListener(this);
79
-    }
80
-
81
-    /**
82
-     * Process an event of the specified type.
83
-     *
84
-     * @param type The type of the event to process
85
-     * @param format Format of messages that are about to be sent. (May be null)
86
-     * @param arguments The arguments for the event
87
-     */
88
-    @Override
89
-    public void processEvent(final ActionType type, final StringBuffer format,
90
-            final Object... arguments) {
91
-        if (type == CoreActionType.SERVER_CONNECTING) {
92
-            synchronized (servers) {
93
-                if (servers.isEmpty()) {
94
-                    myServer.startServer();
95
-                }
96
-                servers.add((Server) arguments[0]);
97
-            }
98
-        } else if (type == CoreActionType.SERVER_CONNECTED
99
-                || type == CoreActionType.SERVER_CONNECTERROR) {
100
-            synchronized (servers) {
101
-                servers.remove(arguments[0]);
102
-
103
-                if (servers.isEmpty() && !IdentityManager.getGlobalConfig()
104
-                        .getOptionBool(getDomain(), "advanced.alwaysOn")) {
105
-                    myServer.stopServer();
106
-                }
107
-            }
108
-        }
109
-    }
110
-
111
-    /** {@inheritDoc} */
112
-    @Override
113
-    public void showConfig(final PreferencesDialogModel manager) {
114
-        final PreferencesCategory general = new PluginPreferencesCategory(
115
-                getPluginInfo(), "Identd",
116
-                "General Identd Plugin config ('Lower' options take priority " +
117
-                "over those above them)");
118
-        final PreferencesCategory advanced = new PluginPreferencesCategory(
119
-                getPluginInfo(), "Advanced",
120
-                "Advanced Identd Plugin config - Only edit these if you need " +
121
-                "to/know what you are doing. Editing these could prevent " +
122
-                "access to some servers. ('Lower' options take priority over " +
123
-                "those above them)");
124
-
125
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
126
-                getDomain(), "general.useUsername", "Use connection " +
127
-                "username rather than system username", "If this is enabled," +
128
-                " the username for the connection will be used rather than " +
129
-                "'" + System.getProperty("user.name") + "'"));
130
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
131
-                getDomain(), "general.useNickname", "Use connection " +
132
-                "nickname rather than system username", "If this is enabled, " +
133
-                "the nickname for the connection will be used rather than " +
134
-                "'" + System.getProperty("user.name") + "'"));
135
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
136
-                getDomain(), "general.useCustomName", "Use custom name" +
137
-                " all the time", "If this is enabled, the name specified below" +
138
-                " will be used all the time"));
139
-        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
140
-                getDomain(), "general.customName", "Custom Name to use",
141
-                "The custom name to use when 'Use Custom Name' is enabled"));
142
-
143
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
144
-                getDomain(), "advanced.alwaysOn", "Always have ident " +
145
-                "port open", "By default the identd only runs when there are " +
146
-                "active connection attempts. This overrides that."));
147
-        advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
148
-                new PortValidator(), getDomain(), "advanced.port",
149
-                "What port should the identd listen on", "Default port is 113," +
150
-                " this is probably useless if changed unless you port forward" +
151
-                " ident to a different port"));
152
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
153
-                getDomain(), "advanced.useCustomSystem", "Use custom OS",
154
-                "By default the plugin uses 'UNIX' or 'WIN32' as the system " +
155
-                "type, this can be overriden by enabling this."));
156
-        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
157
-                getDomain(), "advanced.customSystem", "Custom OS to use",
158
-                "The custom system to use when 'Use Custom System' is enabled"));
159
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
160
-                getDomain(), "advanced.isHiddenUser", "Respond to ident" +
161
-                " requests with HIDDEN-USER error", "By default the plugin will" +
162
-                " give a USERID response, this can force an 'ERROR :" +
163
-                " HIDDEN-USER' response instead."));
164
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
165
-                getDomain(), "advanced.isNoUser", "Respond to ident" +
166
-                " requests with NO-USER error", "By default the plugin will" +
167
-                " give a USERID response, this can force an 'ERROR : NO-USER'" +
168
-                " response instead. (Overrides HIDDEN-USER)"));
169
-
170
-        manager.getCategory("Plugins").addSubCategory(general);
171
-        general.addSubCategory(advanced);
172
-    }
173
-
174
-}
1
+/*
2
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
+ *
4
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ * of this software and associated documentation files (the "Software"), to deal
6
+ * in the Software without restriction, including without limitation the rights
7
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ * copies of the Software, and to permit persons to whom the Software is
9
+ * furnished to do so, subject to the following conditions:
10
+ *
11
+ * The above copyright notice and this permission notice shall be included in
12
+ * all copies or substantial portions of the Software.
13
+ *
14
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20
+ * SOFTWARE.
21
+ */
22
+
23
+package com.dmdirc.addons.identd;
24
+
25
+import com.dmdirc.Server;
26
+import com.dmdirc.actions.ActionManager;
27
+import com.dmdirc.actions.CoreActionType;
28
+import com.dmdirc.actions.interfaces.ActionType;
29
+import com.dmdirc.config.IdentityManager;
30
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
31
+import com.dmdirc.config.prefs.PreferencesCategory;
32
+import com.dmdirc.config.prefs.PreferencesDialogModel;
33
+import com.dmdirc.config.prefs.PreferencesSetting;
34
+import com.dmdirc.config.prefs.PreferencesType;
35
+import com.dmdirc.util.validators.PortValidator;
36
+import com.dmdirc.interfaces.ActionListener;
37
+import com.dmdirc.plugins.Plugin;
38
+
39
+import java.util.ArrayList;
40
+import java.util.List;
41
+
42
+/**
43
+ * The Identd plugin answers ident requests from IRC servers.
44
+ */
45
+public class IdentdPlugin extends Plugin implements ActionListener {
46
+
47
+    /** Array list to store all the servers in that need ident replies. */
48
+    private final List<Server> servers = new ArrayList<Server>();
49
+
50
+    /** The IdentdServer that we use. */
51
+    private IdentdServer myServer;
52
+
53
+    /**
54
+     * Called when the plugin is loaded.
55
+     */
56
+    @Override
57
+    public void onLoad() {
58
+        // Add action hooks
59
+        ActionManager.getActionManager().registerListener(this,
60
+                CoreActionType.SERVER_CONNECTED,
61
+                CoreActionType.SERVER_CONNECTING,
62
+                CoreActionType.SERVER_CONNECTERROR);
63
+
64
+        myServer = new IdentdServer(this);
65
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
66
+                "advanced.alwaysOn")) {
67
+            myServer.startServer();
68
+        }
69
+    }
70
+
71
+    /**
72
+     * Called when this plugin is unloaded.
73
+     */
74
+    @Override
75
+    public void onUnload() {
76
+        myServer.stopServer();
77
+        servers.clear();
78
+        ActionManager.getActionManager().unregisterListener(this);
79
+    }
80
+
81
+    /**
82
+     * Process an event of the specified type.
83
+     *
84
+     * @param type The type of the event to process
85
+     * @param format Format of messages that are about to be sent. (May be null)
86
+     * @param arguments The arguments for the event
87
+     */
88
+    @Override
89
+    public void processEvent(final ActionType type, final StringBuffer format,
90
+            final Object... arguments) {
91
+        if (type == CoreActionType.SERVER_CONNECTING) {
92
+            synchronized (servers) {
93
+                if (servers.isEmpty()) {
94
+                    myServer.startServer();
95
+                }
96
+                servers.add((Server) arguments[0]);
97
+            }
98
+        } else if (type == CoreActionType.SERVER_CONNECTED
99
+                || type == CoreActionType.SERVER_CONNECTERROR) {
100
+            synchronized (servers) {
101
+                servers.remove(arguments[0]);
102
+
103
+                if (servers.isEmpty() && !IdentityManager.getGlobalConfig()
104
+                        .getOptionBool(getDomain(), "advanced.alwaysOn")) {
105
+                    myServer.stopServer();
106
+                }
107
+            }
108
+        }
109
+    }
110
+
111
+    /** {@inheritDoc} */
112
+    @Override
113
+    public void showConfig(final PreferencesDialogModel manager) {
114
+        final PreferencesCategory general = new PluginPreferencesCategory(
115
+                getPluginInfo(), "Identd",
116
+                "General Identd Plugin config ('Lower' options take priority " +
117
+                "over those above them)");
118
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
119
+                getPluginInfo(), "Advanced",
120
+                "Advanced Identd Plugin config - Only edit these if you need " +
121
+                "to/know what you are doing. Editing these could prevent " +
122
+                "access to some servers. ('Lower' options take priority over " +
123
+                "those above them)");
124
+
125
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
126
+                getDomain(), "general.useUsername", "Use connection " +
127
+                "username rather than system username", "If this is enabled," +
128
+                " the username for the connection will be used rather than " +
129
+                "'" + System.getProperty("user.name") + "'"));
130
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
131
+                getDomain(), "general.useNickname", "Use connection " +
132
+                "nickname rather than system username", "If this is enabled, " +
133
+                "the nickname for the connection will be used rather than " +
134
+                "'" + System.getProperty("user.name") + "'"));
135
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
136
+                getDomain(), "general.useCustomName", "Use custom name" +
137
+                " all the time", "If this is enabled, the name specified below" +
138
+                " will be used all the time"));
139
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
140
+                getDomain(), "general.customName", "Custom Name to use",
141
+                "The custom name to use when 'Use Custom Name' is enabled"));
142
+
143
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
144
+                getDomain(), "advanced.alwaysOn", "Always have ident " +
145
+                "port open", "By default the identd only runs when there are " +
146
+                "active connection attempts. This overrides that."));
147
+        advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
148
+                new PortValidator(), getDomain(), "advanced.port",
149
+                "What port should the identd listen on", "Default port is 113," +
150
+                " this is probably useless if changed unless you port forward" +
151
+                " ident to a different port"));
152
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
153
+                getDomain(), "advanced.useCustomSystem", "Use custom OS",
154
+                "By default the plugin uses 'UNIX' or 'WIN32' as the system " +
155
+                "type, this can be overriden by enabling this."));
156
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
157
+                getDomain(), "advanced.customSystem", "Custom OS to use",
158
+                "The custom system to use when 'Use Custom System' is enabled"));
159
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
160
+                getDomain(), "advanced.isHiddenUser", "Respond to ident" +
161
+                " requests with HIDDEN-USER error", "By default the plugin will" +
162
+                " give a USERID response, this can force an 'ERROR :" +
163
+                " HIDDEN-USER' response instead."));
164
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
165
+                getDomain(), "advanced.isNoUser", "Respond to ident" +
166
+                " requests with NO-USER error", "By default the plugin will" +
167
+                " give a USERID response, this can force an 'ERROR : NO-USER'" +
168
+                " response instead. (Overrides HIDDEN-USER)"));
169
+
170
+        manager.getCategory("Plugins").addSubCategory(general);
171
+        general.addSubCategory(advanced);
172
+    }
173
+
174
+}

+ 1
- 1
src/com/dmdirc/addons/lagdisplay/LagDisplayPanel.java View File

@@ -48,7 +48,7 @@ public class LagDisplayPanel extends StatusbarPopupPanel<JLabel> {
48 48
      */
49 49
     public LagDisplayPanel(final LagDisplayPlugin plugin) {
50 50
         super(new JLabel());
51
-        
51
+
52 52
         this.plugin = plugin;
53 53
     }
54 54
 

+ 13
- 13
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

@@ -53,10 +53,10 @@ import java.util.WeakHashMap;
53 53
  * @author chris
54 54
  */
55 55
 public final class LagDisplayPlugin extends Plugin implements ActionListener, ConfigChangeListener {
56
-    
56
+
57 57
     /** The panel we use in the status bar. */
58 58
     private final LagDisplayPanel panel = new LagDisplayPanel(this);
59
-    
59
+
60 60
     /** A cache of ping times. */
61 61
     private final Map<Server, String> pings = new WeakHashMap<Server, String>();
62 62
 
@@ -72,12 +72,12 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
72 72
 
73 73
     /** The length of history to keep per-server. */
74 74
     private int historySize = 100;
75
-    
75
+
76 76
     /** Creates a new instance of LagDisplayPlugin. */
77 77
     public LagDisplayPlugin() {
78 78
         super();
79 79
     }
80
-    
80
+
81 81
     /** {@inheritDoc} */
82 82
     @Override
83 83
     public void onLoad() {
@@ -87,11 +87,11 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
87 87
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
88 88
 
89 89
         readConfig();
90
-        
90
+
91 91
         ActionManager.getActionManager().registerListener(this,
92 92
                 CoreActionType.SERVER_GOTPING, CoreActionType.SERVER_NOPING,
93 93
                 CoreActionType.CLIENT_FRAME_CHANGED,
94
-                CoreActionType.SERVER_DISCONNECTED, 
94
+                CoreActionType.SERVER_DISCONNECTED,
95 95
                 CoreActionType.SERVER_PINGSENT, CoreActionType.SERVER_NUMERIC);
96 96
     }
97 97
 
@@ -108,7 +108,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
108 108
     /**
109 109
      * Retrieves the history of the specified server. If there is no history,
110 110
      * a new list is added to the history map and returned.
111
-     * 
111
+     *
112 112
      * @param server The server whose history is being requested
113 113
      * @return The history for the specified server
114 114
      */
@@ -123,7 +123,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
123 123
     /**
124 124
      * Determines if the {@link ServerInfoDialog} should show a graph of the
125 125
      * ping time for the current server.
126
-     * 
126
+     *
127 127
      * @return True if a graph should be shown, false otherwise
128 128
      */
129 129
     public boolean shouldShowGraph() {
@@ -139,7 +139,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
139 139
     public boolean shouldShowLabels() {
140 140
         return showLabels;
141 141
     }
142
-    
142
+
143 143
     /** {@inheritDoc} */
144 144
     @Override
145 145
     public void onUnload() {
@@ -147,10 +147,10 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
147 147
                 .getPluginInfoByName("ui_swing").getPlugin())
148 148
                 .getSwingStatusBar().removeComponent(panel);
149 149
         IdentityManager.getConfigIdentity().removeListener(this);
150
-        
150
+
151 151
         ActionManager.getActionManager().unregisterListener(this);
152 152
     }
153
-    
153
+
154 154
     /** {@inheritDoc} */
155 155
     @Override
156 156
     public void processEvent(final ActionType type, final StringBuffer format,
@@ -247,7 +247,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
247 247
     public String getTime(final Server server) {
248 248
         return pings.get(server) == null ? "Unknown" : pings.get(server);
249 249
     }
250
-    
250
+
251 251
     /**
252 252
      * Formats the specified time so it's a nice size to display in the label.
253 253
      * @param object An uncast Long representing the time to be formatted
@@ -255,7 +255,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
255 255
      */
256 256
     protected String formatTime(final Object object) {
257 257
         final Long time = (Long) object;
258
-        
258
+
259 259
         if (time >= 10000) {
260 260
             return Math.round(time / 1000.0) + "s";
261 261
         } else {

+ 3
- 3
src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java View File

@@ -69,7 +69,7 @@ public class PingHistoryPanel extends JPanel {
69 69
         setMinimumSize(new Dimension(50, 100));
70 70
         setMaximumSize(new Dimension(Integer.MAX_VALUE, 100));
71 71
         setOpaque(false);
72
-        
72
+
73 73
         this.plugin = plugin;
74 74
         this.history = plugin.getHistory(WindowManager.getActiveServer());
75 75
 
@@ -82,7 +82,7 @@ public class PingHistoryPanel extends JPanel {
82 82
     @Override
83 83
     public void paint(final Graphics g) {
84 84
         super.paint(g);
85
-        
85
+
86 86
         g.setColor(Color.DARK_GRAY);
87 87
         g.drawLine(2, 1, 2, getHeight() - 1);
88 88
         g.drawLine(1, getHeight() - 2, getWidth() - 1, getHeight() - 2);
@@ -103,7 +103,7 @@ public class PingHistoryPanel extends JPanel {
103 103
 
104 104
         for (int i = 0; i < list.size(); i++) {
105 105
             final Long value = list.get(i);
106
-           
106
+
107 107
             float x = lastX == -1 ? 2 : lastX + pixelsperpointX;
108 108
             float y = getHeight() - 5 - value * pixelsperpointY;
109 109
 

+ 1
- 1
src/com/dmdirc/addons/logging/package-info.java View File

@@ -21,6 +21,6 @@
21 21
  */
22 22
 
23 23
 /**
24
- * Adds logging functionality to the client. 
24
+ * Adds logging functionality to the client.
25 25
  */
26 26
 package com.dmdirc.addons.logging;

+ 1
- 1
src/com/dmdirc/addons/mediasource_dbus/BansheeSource.java View File

@@ -59,7 +59,7 @@ public class BansheeSource implements MediaSource {
59 59
     @Override
60 60
     public MediaSourceState getState() {
61 61
         final List<String> res = source.doDBusCall(SERVICE, IFACE, STATE);
62
-        
62
+
63 63
         if (res.isEmpty()) {
64 64
             trackInfo = null;
65 65
             return MediaSourceState.CLOSED;

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

@@ -33,12 +33,12 @@ import java.util.List;
33 33
  * @author chris
34 34
  */
35 35
 public class AmarokSource implements MediaSource {
36
-    
36
+
37 37
     /** Instantiates the media source. */
38 38
     public AmarokSource() {
39 39
         //Do nothing
40 40
     }
41
-    
41
+
42 42
     /** {@inheritDoc} */
43 43
     @Override
44 44
     public MediaSourceState getState() {
@@ -64,54 +64,54 @@ public class AmarokSource implements MediaSource {
64 64
             }
65 65
         }
66 66
     }
67
-    
67
+
68 68
     /** {@inheritDoc} */
69 69
     @Override
70 70
     public String getAppName() {
71 71
         return "Amarok";
72 72
     }
73
-    
73
+
74 74
     /** {@inheritDoc} */
75 75
     @Override
76 76
     public String getArtist() {
77 77
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player artist").get(0);
78 78
     }
79
-    
79
+
80 80
     /** {@inheritDoc} */
81 81
     @Override
82 82
     public String getTitle() {
83 83
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player title").get(0);
84 84
     }
85
-    
85
+
86 86
     /** {@inheritDoc} */
87 87
     @Override
88 88
     public String getAlbum() {
89 89
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player album").get(0);
90 90
     }
91
-    
91
+
92 92
     /** {@inheritDoc} */
93 93
     @Override
94 94
     public String getLength() {
95 95
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player totalTime").get(0);
96 96
     }
97
-    
97
+
98 98
     /** {@inheritDoc} */
99 99
     @Override
100 100
     public String getTime() {
101 101
         return DcopMediaSourcePlugin.getDcopResult(
102 102
                 "dcop amarok player currentTime").get(0);
103 103
     }
104
-    
104
+
105 105
     /** {@inheritDoc} */
106 106
     @Override
107 107
     public String getFormat() {
108 108
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player type").get(0);
109 109
     }
110
-    
110
+
111 111
     /** {@inheritDoc} */
112 112
     @Override
113 113
     public String getBitrate() {
114 114
         return DcopMediaSourcePlugin.getDcopResult("dcop amarok player bitrate").get(0);
115 115
     }
116
-    
116
+
117 117
 }

+ 6
- 6
src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java View File

@@ -36,10 +36,10 @@ import java.util.List;
36 36
  */
37 37
 public class DcopMediaSourcePlugin extends Plugin
38 38
         implements MediaSourceManager {
39
-    
39
+
40 40
     /** Media sources. */
41 41
     private final List<MediaSource> sources;
42
-    
42
+
43 43
     /**
44 44
      * Creates a new instance of DcopMediaSourcePlugin.
45 45
      */
@@ -50,7 +50,7 @@ public class DcopMediaSourcePlugin extends Plugin
50 50
         sources.add(new KaffeineSource());
51 51
         sources.add(new NoatunSource());
52 52
     }
53
-    
53
+
54 54
     /**
55 55
      * Get DCOP Result
56 56
      *
@@ -66,19 +66,19 @@ public class DcopMediaSourcePlugin extends Plugin
66 66
             return new ArrayList<String>();
67 67
         }
68 68
     }
69
-    
69
+
70 70
     /** {@inheritDoc} */
71 71
     @Override
72 72
     public List<MediaSource> getSources() {
73 73
         return sources;
74 74
     }
75
-    
75
+
76 76
     /** {@inheritDoc} */
77 77
     @Override
78 78
     public void onLoad() {
79 79
         // Nothing to do
80 80
     }
81
-    
81
+
82 82
     /** {@inheritDoc} */
83 83
     @Override
84 84
     public void onUnload() {

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

@@ -33,12 +33,12 @@ import java.util.List;
33 33
  * @author chris
34 34
  */
35 35
 public class KaffeineSource implements MediaSource {
36
-    
36
+
37 37
     /** Instantiates the media source. */
38 38
     public KaffeineSource() {
39 39
         //Do nothing
40 40
     }
41
-    
41
+
42 42
     /** {@inheritDoc} */
43 43
     @Override
44 44
     public MediaSourceState getState() {
@@ -54,13 +54,13 @@ public class KaffeineSource implements MediaSource {
54 54
             return MediaSourceState.CLOSED;
55 55
         }
56 56
     }
57
-    
57
+
58 58
     /** {@inheritDoc} */
59 59
     @Override
60 60
     public String getAppName() {
61 61
         return "Kaffeine";
62 62
     }
63
-    
63
+
64 64
     /** {@inheritDoc} */
65 65
     @Override
66 66
     public String getArtist() {
@@ -107,7 +107,7 @@ public class KaffeineSource implements MediaSource {
107 107
     public String getBitrate() {
108 108
         return null;
109 109
     }
110
-    
110
+
111 111
     /**
112 112
      * Get the duration in seconds as a string.
113 113
      *
@@ -120,7 +120,7 @@ public class KaffeineSource implements MediaSource {
120 120
         final long hours = secondsInput / 3600;
121 121
         final long minutes = secondsInput / 60 % 60;
122 122
         final long seconds = secondsInput % 60;
123
-        
123
+
124 124
         if (hours > 0) {
125 125
             if (hours < 10) {
126 126
                 result.append('0');
@@ -132,7 +132,7 @@ public class KaffeineSource implements MediaSource {
132 132
         if (minutes < 10) {
133 133
             result.append('0');
134 134
         }
135
-        
135
+
136 136
         result.append(minutes).append(":");
137 137
 
138 138
         if (seconds < 10) {
@@ -140,8 +140,8 @@ public class KaffeineSource implements MediaSource {
140 140
         }
141 141
 
142 142
         result.append(seconds);
143
-        
143
+
144 144
         return result.toString();
145 145
     }
146
-    
146
+
147 147
 }

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

@@ -33,12 +33,12 @@ import java.util.List;
33 33
  * @author chris
34 34
  */
35 35
 public class NoatunSource implements MediaSource {
36
-    
36
+
37 37
     /** Instantiates the media source. */
38 38
     public NoatunSource() {
39 39
         //Do nothing
40 40
     }
41
-    
41
+
42 42
     /** {@inheritDoc} */
43 43
     @Override
44 44
     public MediaSourceState getState() {
@@ -64,13 +64,13 @@ public class NoatunSource implements MediaSource {
64 64
             }
65 65
         }
66 66
     }
67
-    
67
+
68 68
     /** {@inheritDoc} */
69 69
     @Override
70 70
     public String getAppName() {
71 71
         return "Noatun";
72 72
     }
73
-    
73
+
74 74
     /** {@inheritDoc} */
75 75
     @Override
76 76
     public String getArtist() {
@@ -124,7 +124,7 @@ public class NoatunSource implements MediaSource {
124 124
     public String getBitrate() {
125 125
         return null;
126 126
     }
127
-    
127
+
128 128
     /**
129 129
      * Get the duration in seconds as a string.
130 130
      *
@@ -137,15 +137,15 @@ public class NoatunSource implements MediaSource {
137 137
         final long hours = secondsInput / 3600;
138 138
         final long minutes = secondsInput / 60 % 60;
139 139
         final long seconds = secondsInput % 60;
140
-        
141
-        if (hours > 0) { 
140
+
141
+        if (hours > 0) {
142 142
             result.append(hours).append(":");
143 143
         }
144
-        
144
+
145 145
         result.append(minutes).append(":");
146 146
         result.append(seconds).append(":");
147
-        
147
+
148 148
         return result.toString();
149 149
     }
150
-    
150
+
151 151
 }

+ 7
- 7
src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java View File

@@ -82,7 +82,7 @@ public class TitleMediaSource implements MediaSource {
82 82
     @Override
83 83
     public String getTitle() {
84 84
         final String[] info = getInfo().split("–", 2);
85
-        
85
+
86 86
         if (info.length >= 2) {
87 87
             return info[1].trim();
88 88
         } else {
@@ -119,24 +119,24 @@ public class TitleMediaSource implements MediaSource {
119 119
     public String getBitrate() {
120 120
         return "";
121 121
     }
122
-    
122
+
123 123
     private String getInfo() {
124 124
         InputStreamReader reader = null;
125 125
         BufferedReader input = null;
126 126
         Process process;
127
-        
127
+
128 128
         try {
129 129
             final String[] args = new String[]{
130 130
                 "/bin/bash", "-c", "xwininfo -root -tree | " + command
131 131
             };
132 132
 
133 133
             process = Runtime.getRuntime().exec(args);
134
-            
134
+
135 135
             reader = new InputStreamReader(process.getInputStream());
136 136
             input = new BufferedReader(reader);
137
-            
137
+
138 138
             String line = "";
139
-            
139
+
140 140
             while ((line = input.readLine()) != null) {
141 141
                 return line;
142 142
             }
@@ -147,7 +147,7 @@ public class TitleMediaSource implements MediaSource {
147 147
             StreamUtil.close(reader);
148 148
             StreamUtil.close(input);
149 149
         }
150
-        
150
+
151 151
         return "";
152 152
     }
153 153
 

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

@@ -39,20 +39,20 @@ import java.util.List;
39 39
  * @author chris
40 40
  */
41 41
 public class MplayerMediaSourcePlugin extends Plugin implements MediaSource {
42
-       
42
+
43 43
     /**
44 44
      * Creates a new instance of MplayerMediaSourcePlugin.
45 45
      */
46 46
     public MplayerMediaSourcePlugin() {
47 47
         super();
48 48
     }
49
-    
49
+
50 50
     /** {@inheritDoc} */
51 51
     @Override
52 52
     public void onLoad() {
53 53
         // Nothing to do
54 54
     }
55
-    
55
+
56 56
     /** {@inheritDoc} */
57 57
     @Override
58 58
     public void onUnload() {
@@ -128,7 +128,7 @@ public class MplayerMediaSourcePlugin extends Plugin implements MediaSource {
128 128
         InputStreamReader reader;
129 129
         BufferedReader input;
130 130
         Process process;
131
-        
131
+
132 132
         try {
133 133
             final String[] command = new String[]{"/bin/bash", "-c",
134 134
                     "/usr/bin/lsof -c gmplayer |" +
@@ -136,23 +136,23 @@ public class MplayerMediaSourcePlugin extends Plugin implements MediaSource {
136 136
                     "\\.xession|fontconfig' | tail -n 1 | sed -r 's/ +/ /g' |" +
137 137
                     " cut -d ' ' -f 9- | sed -r 's/^.*\\/(.*?)$/\\1/'"};
138 138
             process = Runtime.getRuntime().exec(command);
139
-            
139
+
140 140
             reader = new InputStreamReader(process.getInputStream());
141 141
             input = new BufferedReader(reader);
142
-            
142
+
143 143
             String line = "";
144
-            
144
+
145 145
             while ((line = input.readLine()) != null) {
146 146
                 result.add(line);
147 147
             }
148
-            
148
+
149 149
             reader.close();
150 150
             input.close();
151 151
             process.destroy();
152 152
         } catch (IOException ex) {
153 153
             ex.printStackTrace();
154 154
         }
155
-        
155
+
156 156
         return result;
157 157
     }
158 158
 

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

@@ -64,7 +64,7 @@ public class NotificationsPlugin extends Plugin implements ActionListener {
64 64
     public void onLoad() {
65 65
         methods.clear();
66 66
         loadSettings();
67
-        ActionManager.getActionManager().registerListener(this, 
67
+        ActionManager.getActionManager().registerListener(this,
68 68
                 CoreActionType.PLUGIN_LOADED, CoreActionType.PLUGIN_UNLOADED);
69 69
         for (PluginInfo target : PluginManager.getPluginManager()
70 70
                 .getPluginInfos()) {

+ 10
- 10
src/com/dmdirc/addons/nowplaying/MediaSource.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.nowplaying;
25 25
 /**
26 26
  * The media source describes one source of "now playing" information
27 27
  * (i.e., one method of getting information from one media player).
28
- * 
28
+ *
29 29
  * @author chris
30 30
  */
31 31
 public interface MediaSource {
@@ -36,56 +36,56 @@ public interface MediaSource {
36 36
      * @since 0.6.3m1
37 37
      */
38 38
     MediaSourceState getState();
39
-    
39
+
40 40
     /**
41 41
      * Retrieves the name of the application that this source is for.
42
-     * 
42
+     *
43 43
      * @return This source's application name
44 44
      */
45 45
     String getAppName();
46
-    
46
+
47 47
     /**
48 48
      * Retrieves the artist of the curently loaded track.
49 49
      *
50 50
      * @return Current track artist
51 51
      */
52 52
     String getArtist();
53
-    
53
+
54 54
     /**
55 55
      * Retrieves the title of the currently loaded track.
56 56
      *
57 57
      * @return Current track title
58 58
      */
59 59
     String getTitle();
60
-    
60
+
61 61
     /**
62 62
      * Retrieves the album of the currently loaded track.
63 63
      *
64 64
      * @return Current track album
65 65
      */
66 66
     String getAlbum();
67
-    
67
+
68 68
     /**
69 69
      * Retrieves the length of the currently loaded track ([h:]mm:ss).
70 70
      *
71 71
      * @return Current track length
72 72
      */
73 73
     String getLength();
74
-    
74
+
75 75
     /**
76 76
      * Retrieves the time of the currently loaded track ([h:]mm:ss).
77 77
      *
78 78
      * @return Current track time
79 79
      */
80 80
     String getTime();
81
-    
81
+
82 82
     /**
83 83
      * Retrives the format of the currently loaded track.
84 84
      *
85 85
      * @return Current track format
86 86
      */
87 87
     String getFormat();
88
-    
88
+
89 89
     /**
90 90
      * Retrieves the bitrate of the currently loaded track.
91 91
      *

+ 6
- 6
src/com/dmdirc/addons/nowplaying/MediaSourceComparator.java View File

@@ -32,17 +32,17 @@ import java.util.List;
32 32
  * @author chris
33 33
  */
34 34
 public class MediaSourceComparator implements Comparator<MediaSource>, Serializable {
35
-    
35
+
36 36
     /**
37 37
      * A version number for this class. It should be changed whenever the class
38 38
      * structure is changed (or anything else that would prevent serialized
39 39
      * objects being unserialized with the new class).
40 40
      */
41 41
     private static final long serialVersionUID = 1;
42
-    
42
+
43 43
     /** The order that the sources should be checked. */
44 44
     private final List<String> order;
45
-    
45
+
46 46
     /**
47 47
      * Creates a new instance of MediaSourceComparator.
48 48
      * NB: The order list may be altered during comparisons.
@@ -58,7 +58,7 @@ public class MediaSourceComparator implements Comparator<MediaSource>, Serializa
58 58
     public int compare(final MediaSource o1, final MediaSource o2) {
59 59
         return getPosition(o1) - getPosition(o2);
60 60
     }
61
-    
61
+
62 62
     /**
63 63
      * Retrieves the position of the source within the order list.
64 64
      * If the source is not present it is appended to the list.
@@ -69,8 +69,8 @@ public class MediaSourceComparator implements Comparator<MediaSource>, Serializa
69 69
         if (!order.contains(source.getAppName())) {
70 70
             order.add(source.getAppName());
71 71
         }
72
-        
72
+
73 73
         return order.indexOf(source.getAppName());
74 74
     }
75
-    
75
+
76 76
 }

+ 4
- 4
src/com/dmdirc/addons/nowplaying/MediaSourceManager.java View File

@@ -27,16 +27,16 @@ import java.util.List;
27 27
 /**
28 28
  * The media source manager is a standard interface for an object that controls
29 29
  * one or more media sources.
30
- * 
30
+ *
31 31
  * @author chris
32 32
  */
33 33
 public interface MediaSourceManager {
34
-    
34
+
35 35
     /**
36 36
      * Retrieves the sources that this manager manages.
37
-     * 
37
+     *
38 38
      * @return A list of sources that this manager manages
39 39
      */
40 40
     List<MediaSource> getSources();
41
-    
41
+
42 42
 }

+ 4
- 4
src/com/dmdirc/addons/nowplaying/NowPlayingSubsitutionPanel.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -52,7 +52,7 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
52 52
 
53 53
     /**
54 54
      * Instantiates a new now playing subsitutiuons panel.
55
-     * 
55
+     *
56 56
      * @param subs list of substitutions.
57 57
      */
58 58
     public NowPlayingSubsitutionPanel(final List<String> subs) {

+ 1
- 1
src/com/dmdirc/addons/osd/OsdManager.java View File

@@ -84,7 +84,7 @@ public class OsdManager {
84 84
      * <p>
85 85
      * This method needs to be synchronised to ensure that the window list is
86 86
      * not modified in between the invocation of
87
-     * {@link OsdPolicy#getYPosition(com.dmdirc.addons.osd.OsdManager, int)} 
87
+     * {@link OsdPolicy#getYPosition(com.dmdirc.addons.osd.OsdManager, int)}
88 88
      * and the point at which the {@link OsdWindow} is added to the windowList.
89 89
      *
90 90
      * @see OsdPolicy#getYPosition(com.dmdirc.addons.osd.OsdManager, int)

+ 14
- 14
src/com/dmdirc/addons/osd/OsdPlugin.java View File

@@ -44,22 +44,22 @@ import java.util.Map;
44 44
  */
45 45
 public final class OsdPlugin extends Plugin implements CategoryChangeListener,
46 46
         PreferencesInterface, SettingChangeListener {
47
-    
47
+
48 48
     /** Config OSD Window. */
49 49
     private OsdWindow osdWindow;
50
-    
50
+
51 51
     /** OSD Command. */
52 52
     private OsdCommand command;
53 53
 
54 54
     /** The OSD Manager that this plugin is using. */
55 55
     private OsdManager osdManager;
56
-    
56
+
57 57
     /** X-axis position of OSD. */
58 58
     private int x;
59
-    
59
+
60 60
     /** Y-axis potion of OSD. */
61 61
     private int y;
62
-    
62
+
63 63
     /** Setting objects with registered change listeners.*/
64 64
     /**
65 65
      * Setting objects with registered change listeners.
@@ -75,14 +75,14 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
75 75
         super();
76 76
         osdManager = new OsdManager(this);
77 77
     }
78
-    
78
+
79 79
     /** {@inheritDoc} */
80 80
     @Override
81 81
     public void onLoad() {
82 82
         command = new OsdCommand(osdManager);
83 83
         CommandManager.registerCommand(command);
84 84
     }
85
-    
85
+
86 86
     /** {@inheritDoc} */
87 87
     @Override
88 88
     public void onUnload() {
@@ -94,11 +94,11 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
94 94
     public void showConfig(final PreferencesDialogModel manager) {
95 95
         x = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationX");
96 96
         y = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationY");
97
-        
97
+
98 98
         final PreferencesCategory category = new PluginPreferencesCategory(
99 99
                 getPluginInfo(), "OSD",
100 100
                 "General configuration for OSD plugin.", "category-osd");
101
-        
101
+
102 102
         fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,
103 103
                 getDomain(), "fontSize", "Font size", "Changes the font " +
104 104
                 "size of the OSD").registerChangeListener(this);
@@ -119,21 +119,21 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
119 119
                 new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
120 120
                 getDomain(), "maxWindows", "Maximum open windows", "Maximum number of OSD " +
121 121
                 "windows that will be displayed at any given time");
122
-                
122
+
123 123
         category.addSetting(fontSizeSetting);
124 124
         category.addSetting(backgroundSetting);
125 125
         category.addSetting(foregroundSetting);
126 126
         category.addSetting(widthSetting);
127 127
         category.addSetting(timeoutSetting);
128 128
         category.addSetting(maxWindowsSetting);
129
-        
129
+
130 130
         final Map<String, String> posOptions = new HashMap<String, String>();
131 131
 
132 132
         //Populate policy MULTICHOICE
133 133
         for (OsdPolicy policy : OsdPolicy.values()) {
134 134
             posOptions.put(policy.name(), policy.getDescription());
135 135
         }
136
-        
136
+
137 137
         category.addSetting(new PreferencesSetting(getDomain(), "newbehaviour",
138 138
                 "New window policy", "What to do when an OSD Window "
139 139
                 + "is opened when there are other, existing windows open", posOptions));
@@ -157,7 +157,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
157 157
     public void categoryDeselected(final PreferencesCategory category) {
158 158
         x = osdWindow.getLocationOnScreen().x;
159 159
         y = osdWindow.getLocationOnScreen().y;
160
-        
160
+
161 161
         osdWindow.dispose();
162 162
         osdWindow = null;
163 163
     }
@@ -177,7 +177,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
177 177
             // Ignore the request.
178 178
             return;
179 179
         }
180
-        
180
+
181 181
         if (setting.equals(fontSizeSetting)) {
182 182
             osdWindow.setFontSize(Integer.parseInt(setting.getValue()));
183 183
         } else if (setting.equals(backgroundSetting)) {

+ 1
- 1
src/com/dmdirc/addons/parser_twitter/Twitter.java View File

@@ -93,7 +93,7 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
93 93
     private static final long PRUNE_COUNT = 20;
94 94
     /** Maximum age of items to leave in the status cache when pruning. */
95 95
     private static final long PRUNE_TIME = 3600 * 1000;
96
-    
96
+
97 97
     /** A map of this parser's implementations of common interfaces. */
98 98
     protected static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
99 99
 

+ 1
- 1
src/com/dmdirc/addons/parser_twitter/api/TwitterStatus.java View File

@@ -253,7 +253,7 @@ public class TwitterStatus implements Comparable<TwitterStatus> {
253 253
     /**
254 254
      * Is this equal to the given Status?
255 255
      * @param status
256
-     * @return 
256
+     * @return
257 257
      */
258 258
     @Override
259 259
     public boolean equals(final Object status) {

+ 4
- 4
src/com/dmdirc/addons/parser_twitter/api/TwitterUser.java View File

@@ -71,7 +71,7 @@ public class TwitterUser {
71 71
     /**
72 72
      * Create a unknown TwitterUser
73 73
      *
74
-     * @param api 
74
+     * @param api
75 75
      * @param screenName Screen name for the user.
76 76
      */
77 77
     protected TwitterUser(final TwitterAPI api, final String screenName) {
@@ -193,7 +193,7 @@ public class TwitterUser {
193 193
 
194 194
     /**
195 195
      * Get the id for this user.
196
-     * 
196
+     *
197 197
      * @return this users id.
198 198
      */
199 199
     public long getID() {
@@ -202,7 +202,7 @@ public class TwitterUser {
202 202
 
203 203
     /**
204 204
      * Get the real name for this user.
205
-     * 
205
+     *
206 206
      * @return this users real name.
207 207
      */
208 208
     public String getRealName() {
@@ -211,7 +211,7 @@ public class TwitterUser {
211 211
 
212 212
     /**
213 213
      * Are we following this user?
214
-     * 
214
+     *
215 215
      * @return True if we are following this user, else false.
216 216
      */
217 217
     public boolean isFollowing() {

+ 2
- 2
src/com/dmdirc/addons/parser_twitter/api/XMLResponse.java View File

@@ -130,7 +130,7 @@ public class XMLResponse {
130 130
 
131 131
     /**
132 132
      * Get the response code from the request.
133
-     * 
133
+     *
134 134
      * @return The response code, or 0 on error.
135 135
      */
136 136
     public int getResponseCode() {
@@ -147,7 +147,7 @@ public class XMLResponse {
147 147
     /**
148 148
      * Checks to see if the response code was 200, the document is not null
149 149
      * and no error element is in the document.
150
-     * 
150
+     *
151 151
      * @return true if the response code was 200, the document is not null
152 152
      * and no error element is in the document.
153 153
      */

+ 5
- 5
src/com/dmdirc/addons/parser_xmpp/XmppFakeChannel.java View File

@@ -129,14 +129,14 @@ public class XmppFakeChannel extends BaseChannelInfo {
129 129
     @Override
130 130
     public ChannelClientInfo getChannelClient(final String client, final boolean create) {
131 131
         final String[] parts = getParser().parseHostmask(client);
132
-        
132
+
133 133
         if (create && getClient(parts[0]) == null) {
134 134
             return new XmppChannelClientInfo(this, getParser().getClient(client));
135 135
         }
136
-        
136
+
137 137
         return getClient(parts[0]);
138 138
     }
139
-    
139
+
140 140
     /**
141 141
      * Updates this channel with the specified contacts.
142 142
      *
@@ -146,9 +146,9 @@ public class XmppFakeChannel extends BaseChannelInfo {
146 146
         for (XmppClientInfo client : clients) {
147 147
             addClient(client.getNickname(), new XmppChannelClientInfo(this, client));
148 148
         }
149
-        
149
+
150 150
         // TODO: Delete old contacts, don't needlessly create new objects
151
-        
151
+
152 152
         getParser().getCallbackManager().getCallbackType(ChannelNamesListener.class).call(this);
153 153
     }
154 154
 

+ 2
- 2
src/com/dmdirc/addons/parser_xmpp/XmppPlugin.java View File

@@ -44,7 +44,7 @@ public class XmppPlugin extends Plugin {
44 44
     public void onUnload() {
45 45
         // Do nothing
46 46
     }
47
-    
47
+
48 48
     /**
49 49
      * Creates a new XMPP parser for the specified client info and address.
50 50
      *
@@ -55,7 +55,7 @@ public class XmppPlugin extends Plugin {
55 55
     public Parser getParser(final MyInfo myInfo, final URI address) {
56 56
         return new XmppParser(address);
57 57
     }
58
-    
58
+
59 59
     /**
60 60
      * Retrieves an object describing the properties of the XMPP protocol.
61 61
      *

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

@@ -55,7 +55,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
55 55
      * Creates a new instance of the Debug Plugin.
56 56
      */
57 57
     public DebugPlugin() { super(); }
58
-    
58
+
59 59
     /** {@inheritDoc} */
60 60
     @Override
61 61
     public void onLoad() {
@@ -64,7 +64,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
64 64
         command = new ParserDebugCommand(this);
65 65
         CommandManager.registerCommand(command);
66 66
     }
67
-    
67
+
68 68
     /** {@inheritDoc} */
69 69
     @Override
70 70
     public void onUnload() {
@@ -82,7 +82,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
82 82
         }
83 83
         registeredParsers.clear();
84 84
     }
85
-    
85
+
86 86
     /** {@inheritDoc} */
87 87
     @Override
88 88
     public void onDebugInfo(final Parser parser, final Date date, final int level, final String data) {
@@ -91,7 +91,7 @@ public final class DebugPlugin extends Plugin implements DebugInfoListener, Acti
91 91
             window.addLine(String.format("[%d] %s%n", level, data), true);
92 92
         }
93 93
     }
94
-    
94
+
95 95
     /** {@inheritDoc} */
96 96
     @Override
97 97
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {

+ 5
- 5
src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java View File

@@ -52,7 +52,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
52 52
         super();
53 53
         myPlugin = plugin;
54 54
     }
55
-    
55
+
56 56
     /** {@inheritDoc} */
57 57
     @Override
58 58
     public CommandType getType() {
@@ -69,9 +69,9 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
69 69
     @Override
70 70
     public void execute(final FrameContainer origin, final CommandArguments commandArgs, final CommandContext context) {
71 71
         final boolean isSilent = commandArgs.isSilent();
72
-  
72
+
73 73
         Parser parser = ((ServerCommandContext) context).getServer().getParser();
74
-        
74
+
75 75
         if (parser == null) {
76 76
             sendLine(origin, isSilent, FORMAT_ERROR, "Unable to get a parser for this window.");
77 77
             return;
@@ -110,7 +110,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
110 110
      */
111 111
     @Override
112 112
     public String getName() { return "parserdebug"; }
113
-    
113
+
114 114
     /**
115 115
      * Returns whether or not this command should be shown in help messages.
116 116
      *
@@ -118,7 +118,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
118 118
      */
119 119
     @Override
120 120
     public boolean showInHelp() { return true; }
121
-    
121
+
122 122
     /**
123 123
      * Returns a string representing the help message for this command.
124 124
      *

+ 2
- 2
src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java View File

@@ -37,13 +37,13 @@ import java.util.Date;
37 37
  * chat window instead.
38 38
  */
39 39
 public class FakeWriteableFrameContainer extends WritableFrameContainer {
40
-    
40
+
41 41
     /** The target for this window. */
42 42
     private final MessageTarget target;
43 43
 
44 44
     /**
45 45
      * Creates a new instance of FakeInputWindow.
46
-     * 
46
+     *
47 47
      * @param target The message target that output gets sent to
48 48
      */
49 49
     public FakeWriteableFrameContainer(final MessageTarget target) {

+ 8
- 8
src/com/dmdirc/addons/redirect/RedirectPlugin.java View File

@@ -24,35 +24,35 @@ package com.dmdirc.addons.redirect;
24 24
 
25 25
 import com.dmdirc.commandparser.CommandManager;
26 26
 import com.dmdirc.plugins.Plugin;
27
-    
27
+
28 28
 
29 29
 /**
30 30
  * The redirect plugin allows the suer to redirect the output of commands that
31 31
  * would normally echo their results locally to a channel or chat window instead.
32
- * 
32
+ *
33 33
  * @author chris
34 34
  */
35 35
 public final class RedirectPlugin extends Plugin {
36
-    
36
+
37 37
     private final RedirectCommand command;
38
-    
38
+
39 39
     /** Creates a new system tray plugin. */
40 40
     public RedirectPlugin() {
41 41
         super();
42
-        
42
+
43 43
         command = new RedirectCommand();
44 44
     }
45
-    
45
+
46 46
     /** {@inheritDoc} */
47 47
     @Override
48 48
     public void onLoad() {
49 49
         CommandManager.registerCommand(command);
50 50
     }
51
-    
51
+
52 52
     /** {@inheritDoc}. */
53 53
     @Override
54 54
     public void onUnload() {
55 55
         CommandManager.unregisterCommand(command);
56 56
     }
57
-    
57
+
58 58
 }

+ 15
- 15
src/com/dmdirc/addons/scriptplugin/ScriptCommand.java View File

@@ -59,13 +59,13 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
59 59
         super();
60 60
         myPlugin = plugin;
61 61
     }
62
-        
62
+
63 63
     /** {@inheritDoc} */
64 64
     @Override
65 65
     public void execute(final FrameContainer origin,
66 66
             final CommandArguments args, final CommandContext context) {
67 67
         final String[] sargs = args.getArguments();
68
-    
68
+
69 69
         if (sargs.length > 0 && (sargs[0].equalsIgnoreCase("rehash") || sargs[0].equalsIgnoreCase("reload"))) {
70 70
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Reloading scripts");
71 71
             myPlugin.rehash();
@@ -105,14 +105,14 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
105 105
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Result: "+wrapper.getScriptEngine().eval(script));
106 106
                 } catch (Exception e) {
107 107
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Exception: "+e+" -> "+e.getMessage());
108
-                    
108
+
109 109
                     if (IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "eval.showStackTrace")) {
110 110
                         try {
111 111
                             final Class<?> logger = Class.forName("com.dmdirc.logger.Logger");
112 112
                             if (logger != null) {
113 113
                                 final Method exceptionToStringArray = logger.getDeclaredMethod("exceptionToStringArray", new Class[]{Throwable.class});
114 114
                                 exceptionToStringArray.setAccessible(true);
115
-                                
115
+
116 116
                                 final String[] stacktrace = (String[]) exceptionToStringArray.invoke(null, e);
117 117
                                 for (String line : stacktrace) {
118 118
                                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: "+line);
@@ -122,7 +122,7 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
122 122
                             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: Exception showing stack trace: "+ex+" -> "+ex.getMessage());
123 123
                         }
124 124
                     }
125
-                    
125
+
126 126
                 }
127 127
             } else {
128 128
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify some script to eval.");
@@ -181,7 +181,7 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
181 181
     public AdditionalTabTargets getSuggestions(final int arg,
182 182
             final IntelligentCommandContext context) {
183 183
         final AdditionalTabTargets res = new AdditionalTabTargets();
184
-        
184
+
185 185
         res.excludeAll();
186 186
         if (arg == 0) {
187 187
             res.add("help");
@@ -203,10 +203,10 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
203 203
                 }
204 204
             }
205 205
         }
206
-        
206
+
207 207
         return res;
208 208
     }
209
-    
209
+
210 210
     /**
211 211
      * Retrieves a list of all installed scripts.
212 212
      * Any file under the main plugin directory (~/.DMDirc/scripts or similar)
@@ -216,10 +216,10 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
216 216
      */
217 217
     private List<String> getPossibleScripts() {
218 218
         final List<String> res = new LinkedList<String>();
219
-        
219
+
220 220
         final LinkedList<File> dirs = new LinkedList<File>();
221 221
         dirs.add(new File(myPlugin.getScriptDir()));
222
-        
222
+
223 223
         while (!dirs.isEmpty()) {
224 224
             final File dir = dirs.pop();
225 225
             if (dir.isDirectory()) {
@@ -236,13 +236,13 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
236 236
 
237 237
     /** {@inheritDoc} */
238 238
     @Override
239
-    public String getName() { 
239
+    public String getName() {
240 240
         return "script";
241 241
     }
242
-    
242
+
243 243
     /** {@inheritDoc} */
244 244
     @Override
245
-    public boolean showInHelp() { 
245
+    public boolean showInHelp() {
246 246
         return true;
247 247
     }
248 248
 
@@ -251,10 +251,10 @@ public final class ScriptCommand extends Command implements IntelligentCommand,
251 251
     public CommandType getType() {
252 252
         return CommandType.TYPE_GLOBAL;
253 253
     }
254
-    
254
+
255 255
     /** {@inheritDoc} */
256 256
     @Override
257
-    public String getHelp() { 
257
+    public String getHelp() {
258 258
         return "script - Allows controlling the script plugin";
259 259
     }
260 260
 }

+ 13
- 13
src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java View File

@@ -45,7 +45,7 @@ public class ScriptEngineWrapper {
45 45
 
46 46
     /** The File this script is from */
47 47
     private final File file;
48
-    
48
+
49 49
     /** Script-Local JS Helper */
50 50
     private JavaScriptHelper localHelper = new JavaScriptHelper();
51 51
 
@@ -61,33 +61,33 @@ public class ScriptEngineWrapper {
61 61
     protected ScriptEngineWrapper(final ScriptPlugin plugin, final String filename) throws FileNotFoundException, ScriptException {
62 62
         this.plugin = plugin;
63 63
         file = (filename != null) ? new File(filename) : null;
64
-        
64
+
65 65
         engine = createEngine();
66
-        
66
+
67 67
         callFunction("onLoad");
68 68
     }
69
-    
69
+
70 70
     /**
71 71
      * Get a reference to the ScriptEngine.
72 72
      *
73 73
      * @return a reference to the ScriptEngine
74 74
      */
75 75
     protected ScriptEngine getScriptEngine() { return engine; }
76
-    
76
+
77 77
     /**
78 78
      * Get a reference to the JavaScriptHelper
79 79
      *
80 80
      * @return a reference to the JavaScriptHelper
81 81
      */
82 82
     protected JavaScriptHelper getJavaScriptHelper() { return localHelper; }
83
-    
83
+
84 84
     /**
85 85
      * Get the file for this script
86 86
      *
87 87
      * @return The file for this script
88 88
      */
89 89
     protected File getFile() { return file; }
90
-    
90
+
91 91
     /**
92 92
      * Create a new engine for this script
93 93
      */
@@ -102,13 +102,13 @@ public class ScriptEngineWrapper {
102 102
                 StreamUtil.close(fr);
103 103
             }
104 104
         }
105
-        
105
+
106 106
         result.put("localHelper", localHelper);
107 107
         result.put("thisEngine", this);
108
-        
108
+
109 109
         return result;
110 110
     }
111
-    
111
+
112 112
     /**
113 113
      * Call a function in this script.
114 114
      *
@@ -128,14 +128,14 @@ public class ScriptEngineWrapper {
128 128
             Logger.userError(ErrorLevel.LOW, "Error calling '"+functionName+"' in '"+file.getPath()+"': "+e.getMessage(), e);
129 129
         }
130 130
     }
131
-    
131
+
132 132
     /**
133 133
      * Try to reload this script.
134 134
      */
135 135
     protected boolean reload() {
136 136
         // Tell the current engine that its about to be obliterated.
137 137
         callFunction("onPreRehash");
138
-        
138
+
139 139
         try {
140 140
             // Try making a new engine
141 141
             engine = createEngine();
@@ -147,7 +147,7 @@ public class ScriptEngineWrapper {
147 147
             callFunction("onRehashFailed", e);
148 148
             return false;
149 149
         }
150
-        
150
+
151 151
         return true;
152 152
     }
153 153
 }

+ 3
- 3
src/com/dmdirc/addons/serverlists/ServerGroup.java View File

@@ -49,7 +49,7 @@ public class ServerGroup extends ServerGroupItemBase {
49 49
 
50 50
     /** A set of links relevant to this group (e.g. homepages). */
51 51
     private final Map<String, URI> links = new HashMap<String, URI>();
52
-    
52
+
53 53
     /** The items contained within the group. */
54 54
     private final List<ServerGroupItem> entries = new ArrayList<ServerGroupItem>();
55 55
 
@@ -134,7 +134,7 @@ public class ServerGroup extends ServerGroupItemBase {
134 134
 
135 135
     /**
136 136
      * Retrieves the description of this group.
137
-     * 
137
+     *
138 138
      * @return This group's description
139 139
      */
140 140
     public String getDescription() {
@@ -165,7 +165,7 @@ public class ServerGroup extends ServerGroupItemBase {
165 165
      * Retrieves a map of link titles to {@link URI}s which are associated
166 166
      * with this server group. Links will typically include network homepages,
167 167
      * forums, or support channels.
168
-     * 
168
+     *
169 169
      * @return An immutable map of links
170 170
      */
171 171
     public Map<String, URI> getLinks() {

+ 3
- 3
src/com/dmdirc/addons/systray/PopupCommand.java View File

@@ -35,17 +35,17 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
35 35
  * @author chris
36 36
  */
37 37
 public final class PopupCommand extends Command implements CommandInfo {
38
-    
38
+
39 39
     /** The SystrayPlugin that we belong to. */
40 40
     private final SystrayPlugin parent;
41
-    
41
+
42 42
     /**
43 43
      * Creates a new instance of PopupCommand.
44 44
      * @param newParent The plugin that this command belongs to
45 45
      */
46 46
     public PopupCommand(final SystrayPlugin newParent) {
47 47
         super();
48
-        
48
+
49 49
         this.parent = newParent;
50 50
     }
51 51
 

+ 12
- 12
src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java View File

@@ -32,13 +32,13 @@ import com.dmdirc.ui.interfaces.InputWindow;
32 32
 import java.awt.Toolkit;
33 33
 
34 34
 public class BashStyle implements TabCompletionStyle {
35
-    
35
+
36 36
     /** The last position the user tab-completed at. */
37 37
     private int lastPosition = -1;
38
-    
38
+
39 39
     /** The number of times the user has tab-completed the same position. */
40 40
     private int tabCount = 0;
41
-    
41
+
42 42
     /** The last word that was tab completed. */
43 43
     private String lastWord = "";
44 44
 
@@ -58,7 +58,7 @@ public class BashStyle implements TabCompletionStyle {
58 58
         this.tabCompleter = completer;
59 59
         this.window = window;
60 60
     }
61
-    
61
+
62 62
     /** {@inheritDoc} */
63 63
     @Override
64 64
     public TabCompletionResult getResult(final String original, final int start,
@@ -66,7 +66,7 @@ public class BashStyle implements TabCompletionStyle {
66 66
             final AdditionalTabTargets additional) {
67 67
         final String word = original.substring(start, end);
68 68
         final TabCompleterResult res = tabCompleter.complete(word, additional);
69
-        
69
+
70 70
         if (start == lastPosition && word.equals(lastWord)) {
71 71
             tabCount++;
72 72
         } else {
@@ -74,26 +74,26 @@ public class BashStyle implements TabCompletionStyle {
74 74
             lastWord = word;
75 75
             tabCount = 1;
76 76
         }
77
-        
77
+
78 78
         if (res.getResultCount() == 0) {
79 79
             Toolkit.getDefaultToolkit().beep();
80
-            
80
+
81 81
             return null;
82 82
         } else if (res.getResultCount() == 1) {
83 83
             // One result, just replace it
84
-            
84
+
85 85
             final String result = res.getResults().get(0);
86
-            
86
+
87 87
             return new TabCompletionResult(
88 88
                     original.substring(0, start) + result + original.substring(end),
89 89
                     start + result.length());
90 90
         } else {
91 91
             // Multiple results
92
-            
92
+
93 93
             final String sub = res.getBestSubstring();
94 94
             if (sub.equalsIgnoreCase(word) && tabCount >= 2) {
95 95
                 window.getContainer().addLine("tabCompletion", res.toString());
96
-                
96
+
97 97
                 return null;
98 98
             } else {
99 99
                 return new TabCompletionResult(
@@ -102,5 +102,5 @@ public class BashStyle implements TabCompletionStyle {
102 102
             }
103 103
         }
104 104
     }
105
-    
105
+
106 106
 }

+ 3
- 3
src/com/dmdirc/addons/tabcompletion_bash/BashStylePlugin.java View File

@@ -28,7 +28,7 @@ import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
28 28
 import com.dmdirc.ui.interfaces.InputWindow;
29 29
 
30 30
 public class BashStylePlugin extends Plugin {
31
-    
31
+
32 32
     /** {@inheritDoc} */
33 33
     @Override
34 34
     public void onLoad() {
@@ -43,7 +43,7 @@ public class BashStylePlugin extends Plugin {
43 43
 
44 44
     /**
45 45
      * Retrieves a new instance of the Bash tab completion style.
46
-     * 
46
+     *
47 47
      * @param completer The tab completer the instance is for
48 48
      * @param window The window the instance is for
49 49
      * @return A relevant TabCompletionStyle
@@ -52,5 +52,5 @@ public class BashStylePlugin extends Plugin {
52 52
             final InputWindow window) {
53 53
         return new BashStyle(completer, window);
54 54
     }
55
-    
55
+
56 56
 }

+ 7
- 7
src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java View File

@@ -34,13 +34,13 @@ import java.awt.Toolkit;
34 34
 import java.util.Collections;
35 35
 
36 36
 public class MircStyle implements TabCompletionStyle {
37
-    
37
+
38 38
     /** The last word that was tab completed. */
39 39
     private String lastWord;
40 40
 
41 41
     /** The last string we tried to tab complete. */
42 42
     private String tabString;
43
-    
43
+
44 44
     /** The tab completer that we use. */
45 45
     protected final TabCompleter tabCompleter;
46 46
 
@@ -57,13 +57,13 @@ public class MircStyle implements TabCompletionStyle {
57 57
         this.tabCompleter = completer;
58 58
         this.window = window;
59 59
     }
60
-    
60
+
61 61
     /** {@inheritDoc} */
62 62
     @Override
63 63
     public TabCompletionResult getResult(final String original, final int start,
64 64
             final int end, final boolean shiftPressed,
65 65
             final AdditionalTabTargets additional) {
66
-        
66
+
67 67
         final String word = original.substring(start, end);
68 68
         String target = "";
69 69
         if (word.equals(lastWord)) {
@@ -76,7 +76,7 @@ public class MircStyle implements TabCompletionStyle {
76 76
         } else {
77 77
             // New tab target
78 78
             final TabCompleterResult res = tabCompleter.complete(word, additional);
79
-            
79
+
80 80
             if (res.getResultCount() == 0) {
81 81
                 Toolkit.getDefaultToolkit().beep();
82 82
                 return null;
@@ -93,9 +93,9 @@ public class MircStyle implements TabCompletionStyle {
93 93
                 tabString = word;
94 94
             }
95 95
         }
96
-        
96
+
97 97
         lastWord = target;
98
-        
98
+
99 99
         return new TabCompletionResult(original.substring(0, start) + target
100 100
                 + original.substring(end), start + target.length());
101 101
     }

+ 2
- 2
src/com/dmdirc/addons/tabcompletion_mirc/MircStylePlugin.java View File

@@ -28,7 +28,7 @@ import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
28 28
 import com.dmdirc.ui.interfaces.InputWindow;
29 29
 
30 30
 public class MircStylePlugin extends Plugin {
31
-    
31
+
32 32
     /** {@inheritDoc} */
33 33
     @Override
34 34
     public void onLoad() {
@@ -52,5 +52,5 @@ public class MircStylePlugin extends Plugin {
52 52
             final InputWindow window) {
53 53
         return new MircStyle(completer, window);
54 54
     }
55
-    
55
+
56 56
 }

+ 5
- 5
src/com/dmdirc/addons/time/TimeActionMetaType.java View File

@@ -28,11 +28,11 @@ import java.util.Calendar;
28 28
 
29 29
 /**
30 30
  * Encapsulates the meta types used by the various time actions.
31
- * 
31
+ *
32 32
  * @author chris
33 33
  */
34 34
 public enum TimeActionMetaType implements ActionMetaType {
35
-    
35
+
36 36
     /** Time type. */
37 37
     TIME_TIME {
38 38
         /** {@inheritDoc} */
@@ -45,11 +45,11 @@ public enum TimeActionMetaType implements ActionMetaType {
45 45
         @Override
46 46
         public String[] getArgNames() { return new String[]{"Date"}; }
47 47
     };
48
-        
48
+
49 49
     /** {@inheritDoc} */
50 50
     @Override
51 51
     public String getGroup() {
52 52
         return "Time Events";
53
-    }    
54
-    
53
+    }
54
+
55 55
 }

+ 6
- 6
src/com/dmdirc/addons/time/TimeActionType.java View File

@@ -30,17 +30,17 @@ import com.dmdirc.actions.interfaces.ActionType;
30 30
  * @author chris
31 31
  */
32 32
 public enum TimeActionType implements ActionType {
33
-    
33
+
34 34
     /** Minute type. */
35 35
     TIME_MINUTE("Every minute"),
36 36
     /** Hour type. */
37 37
     TIME_HOUR("Every hour"),
38 38
     /** Day type. */
39 39
     TIME_DAY("Every day");
40
-    
40
+
41 41
     /** Action type name. */
42 42
     private final String name;
43
-    
43
+
44 44
     /**
45 45
      * Creates a new instance of a TimeActionType.
46 46
      * @param name The name of the action type
@@ -48,17 +48,17 @@ public enum TimeActionType implements ActionType {
48 48
     TimeActionType(final String name) {
49 49
         this.name = name;
50 50
     }
51
-    
51
+
52 52
     /** {@inheritDoc} */
53 53
     @Override
54 54
     public ActionMetaType getType() {
55 55
         return TimeActionMetaType.TIME_TIME;
56 56
     }
57
-    
57
+
58 58
     /** {@inheritDoc} */
59 59
     @Override
60 60
     public String getName() {
61 61
         return name;
62 62
     }
63
-    
63
+
64 64
 }

+ 2
- 2
src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java View File

@@ -29,8 +29,8 @@ import com.dmdirc.Channel;
29 29
  */
30 30
 public final class DummyChannelWindow extends DummyInputWindow {
31 31
 
32
-    /** 
33
-     * Instantiates a new DummyChannelWindow. 
32
+    /**
33
+     * Instantiates a new DummyChannelWindow.
34 34
      *
35 35
      * @param parent Parent channel
36 36
      */

+ 4
- 4
src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,7 +31,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
31 31
  * Dummy input handler.
32 32
  */
33 33
 public class DummyInputHandler extends InputHandler {
34
-    
34
+
35 35
     /**
36 36
      * Creates a new instance of InputHandler. Adds listeners to the target
37 37
      * that we need to operate.

+ 2
- 2
src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java View File

@@ -48,7 +48,7 @@ public final class DummyStatusBar implements StatusBar {
48 48
      */
49 49
     @Deprecated
50 50
     @Override
51
-    public void setMessage(final String newMessage, 
51
+    public void setMessage(final String newMessage,
52 52
             final StatusMessageNotifier newNotifier) {
53 53
         System.out.println("DummyStatusBar: " + newMessage);
54 54
     }
@@ -59,7 +59,7 @@ public final class DummyStatusBar implements StatusBar {
59 59
      */
60 60
     @Deprecated
61 61
     @Override
62
-    public void setMessage(final String newMessage, 
62
+    public void setMessage(final String newMessage,
63 63
             final StatusMessageNotifier newNotifier, final int timeout) {
64 64
         System.out.println("DummyStatusBar: " + newMessage);
65 65
     }

+ 4
- 4
src/com/dmdirc/addons/ui_swing/BackgroundOption.java View File

@@ -1,17 +1,17 @@
1 1
 /*
2
- * 
2
+ *
3 3
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
4
- * 
4
+ *
5 5
  * Permission is hereby granted, free of charge, to any person obtaining a copy
6 6
  * of this software and associated documentation files (the "Software"), to deal
7 7
  * in the Software without restriction, including without limitation the rights
8 8
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 9
  * copies of the Software, and to permit persons to whom the Software is
10 10
  * furnished to do so, subject to the following conditions:
11
- * 
11
+ *
12 12
  * The above copyright notice and this permission notice shall be included in
13 13
  * all copies or substantial portions of the Software.
14
- * 
14
+ *
15 15
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 16
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 17
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 1
- 1
src/com/dmdirc/addons/ui_swing/MainFrame.java View File

@@ -235,7 +235,7 @@ public final class MainFrame extends JFrame implements WindowListener,
235 235
 
236 236
     /**
237 237
      * Gets the string which should be prefixed to this frame's title.
238
-     * 
238
+     *
239 239
      * @return This frame's title prefix
240 240
      */
241 241
     private String getTitlePrefix() {

+ 1
- 1
src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java View File

@@ -42,7 +42,7 @@ import java.util.Map;
42 42
 
43 43
 /**
44 44
  * Handles creation of windows in the Swing UI.
45
- * 
45
+ *
46 46
  * @since 0.6.4
47 47
  */
48 48
 public class SwingWindowFactory implements FrameListener {

+ 3
- 3
src/com/dmdirc/addons/ui_swing/SwingWindowListener.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/PackingTable.java View File

@@ -158,7 +158,7 @@ public class PackingTable extends JTable {
158 158
         if (!lastColumnFit) {
159 159
             checkNumCols--;
160 160
         }
161
-        
161
+
162 162
         for (int i = 0; i < checkNumCols; i++) { //NOPMD I'm not copying
163 163
             widths[i] = getWidth(i);
164 164
             widthsTotal += widths[i];

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/SortedListModel.java View File

@@ -49,7 +49,7 @@ public class SortedListModel<T> extends DefaultListModel {
49 49
      */
50 50
     public SortedListModel(final Comparator<T> comparator) {
51 51
         super();
52
-        
52
+
53 53
         this.comparator = comparator;
54 54
     }
55 55
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java View File

@@ -251,7 +251,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
251 251
             final JFileChooser fileChooser = new JFileChooser();
252 252
             fileChooser.addChoosableFileFilter(new ExecutableFileFilter());
253 253
             fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
254
-            if (fileChooser.showDialog(this, "Select") 
254
+            if (fileChooser.showDialog(this, "Select")
255 255
                     == JFileChooser.APPROVE_OPTION) {
256 256
                 commandPath.setText(fileChooser.getSelectedFile().toString());
257 257
             }

+ 6
- 6
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java View File

@@ -1,17 +1,17 @@
1 1
 /*
2
- * 
2
+ *
3 3
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
4
- * 
4
+ *
5 5
  * Permission is hereby granted, free of charge, to any person obtaining a copy
6 6
  * of this software and associated documentation files (the "Software"), to deal
7 7
  * in the Software without restriction, including without limitation the rights
8 8
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 9
  * copies of the Software, and to permit persons to whom the Software is
10 10
  * furnished to do so, subject to the following conditions:
11
- * 
11
+ *
12 12
  * The above copyright notice and this permission notice shall be included in
13 13
  * all copies or substantial portions of the Software.
14
- * 
14
+ *
15 15
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 16
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 17
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,7 +45,7 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
45 45
 
46 46
     /**
47 47
      * Creates a new addon filter.
48
-     * 
48
+     *
49 49
      * @param verifiedBox
50 50
      * @param unverifiedBox
51 51
      * @param installedBox
@@ -61,7 +61,7 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
61 61
             final ButtonModel themesBox, final ButtonModel actionsBox,
62 62
             final JTextField searchBox) {
63 63
         super();
64
-        
64
+
65 65
         this.verifiedBox = verifiedBox;
66 66
         this.unverifiedBox = unverifiedBox;
67 67
         this.installedBox = installedBox;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java View File

@@ -206,7 +206,7 @@ public class AddonInfo {
206 206
                 return true;
207 207
             }
208 208
         }
209
-        
209
+
210 210
         return false;
211 211
     }
212 212
 
@@ -221,7 +221,7 @@ public class AddonInfo {
221 221
 
222 222
     /**
223 223
      * Returns the download location for this addoninfo, or an empty string.
224
-     * 
224
+     *
225 225
      * @return Download location or empty string
226 226
      */
227 227
     @SuppressWarnings("fallthrough")

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellEditor.java View File

@@ -56,7 +56,7 @@ public class AddonInfoCellEditor extends AbstractCellEditor implements
56 56
 
57 57
             label.setBackground((row & 1) == 1 ? new Color(0xEE, 0xEE, 0xFF)
58 58
                     : Color.WHITE);
59
-            
59
+
60 60
             table.setRowHeight(row, label.getPreferredSize().height);
61 61
 
62 62
             return label;

+ 4
- 4
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellRenderer.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -42,7 +42,7 @@ public class AddonInfoCellRenderer implements TableCellRenderer {
42 42
      * objects being unserialized with the new class).
43 43
      */
44 44
     private static final long serialVersionUID = 1;
45
-    
45
+
46 46
     /**
47 47
      * {@inheritDoc}
48 48
      *

+ 5
- 5
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonSorter.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -41,13 +41,13 @@ public class AddonSorter extends TableRowSorter<DefaultTableModel> implements
41 41
 
42 42
     /**
43 43
      * Creates a new addon sorter.
44
-     * 
44
+     *
45 45
      * @param model
46 46
      * @param sortByDate
47 47
      * @param sortByName
48 48
      * @param sortByRating
49 49
      * @param sortByStatus
50
-     * @param filter 
50
+     * @param filter
51 51
      */
52 52
     public AddonSorter(final DefaultTableModel model, final ButtonModel sortByDate,
53 53
             final ButtonModel sortByName, final ButtonModel sortByRating,

+ 4
- 4
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonTable.java View File

@@ -1,17 +1,17 @@
1 1
 /*
2
- * 
2
+ *
3 3
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
4
- * 
4
+ *
5 5
  * Permission is hereby granted, free of charge, to any person obtaining a copy
6 6
  * of this software and associated documentation files (the "Software"), to deal
7 7
  * in the Software without restriction, including without limitation the rights
8 8
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 9
  * copies of the Software, and to permit persons to whom the Software is
10 10
  * furnished to do so, subject to the following conditions:
11
- * 
11
+ *
12 12
  * The above copyright notice and this permission notice shall be included in
13 13
  * all copies or substantial portions of the Software.
14
- * 
14
+ *
15 15
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 16
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 17
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonType.java View File

@@ -37,7 +37,7 @@ public enum AddonType {
37 37
     /** {@inheritDoc} */
38 38
     @Override
39 39
     public String toString() {
40
-        return super.toString().charAt(5) 
40
+        return super.toString().charAt(5)
41 41
                 + super.toString().substring(6).toLowerCase().replace('_', ' ');
42 42
     }
43 43
 }

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java View File

@@ -40,7 +40,7 @@ import javax.swing.JScrollPane;
40 40
 /**
41 41
  * Loads the addon data feed into the addon browser.
42 42
  */
43
-public class DataLoaderWorker 
43
+public class DataLoaderWorker
44 44
         extends LoggingSwingWorker<Collection<Map<String, String>>, Object> {
45 45
 
46 46
     /** List to load data into. */
@@ -60,7 +60,7 @@ public class DataLoaderWorker
60 60
     public DataLoaderWorker(final AddonTable table,
61 61
             final BrowserWindow browserWindow, final JScrollPane scrollPane) {
62 62
         super();
63
-        
63
+
64 64
         this.table = table;
65 65
         this.browserWindow = browserWindow;
66 66
         this.scrollPane = scrollPane;

+ 5
- 5
src/com/dmdirc/addons/ui_swing/components/addonbrowser/DownloaderWindow.java View File

@@ -27,7 +27,7 @@ import net.miginfocom.swing.MigLayout;
27 27
  * Simple window to show download progress on addon feed.
28 28
  */
29 29
 public class DownloaderWindow extends JDialog implements Runnable, DownloadListener {
30
-   
30
+
31 31
     /**
32 32
      * A version number for this class. It should be changed whenever the class
33 33
      * structure is changed (or anything else that would prevent serialized
@@ -57,7 +57,7 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
57 57
         CoreUIUtils.centreWindow(this);
58 58
         setIconImage(IconManager.getIconManager().getImage("icon"));
59 59
         setVisible(true);
60
-        
60
+
61 61
         new Thread(this, "Addon downloader thread").start();
62 62
     }
63 63
 
@@ -65,7 +65,7 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
65 65
     @Override
66 66
     public void run() {
67 67
         try {
68
-            Downloader.downloadPage("http://addons.dmdirc.com/feed", 
68
+            Downloader.downloadPage("http://addons.dmdirc.com/feed",
69 69
                     Main.getConfigDir() + File.separator + "addons.feed", this);
70 70
             UIUtilities.invokeLater(new Runnable() {
71 71
 
@@ -79,10 +79,10 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
79 79
             removeAll();
80 80
             add(new JLabel("Unable to download feed."));
81 81
         }
82
-        
82
+
83 83
         dispose();
84 84
     }
85
-    
85
+
86 86
     /** {@inheritDoc} */
87 87
     @Override
88 88
     public void downloadProgress(final float percent) {

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 12
- 12
src/com/dmdirc/addons/ui_swing/components/colours/ColourChooser.java View File

@@ -73,21 +73,21 @@ public final class ColourChooser extends JPanel implements ActionListener {
73 73
     public ColourChooser() {
74 74
         this("ffffff", true, true);
75 75
     }
76
-    
77
-    /** 
76
+
77
+    /**
78 78
      * Creates a new instance of ColourChooser.
79
-     * 
79
+     *
80 80
      * @param window Parent window
81
-     * 
81
+     *
82 82
      * @since 0.6
83 83
      */
84 84
     public ColourChooser(final Window window) {
85 85
         this("ffffff", true, true, window);
86 86
     }
87
-    
87
+
88 88
     /**
89 89
      * Creates a new instance of ColourChooser.
90
-     * 
90
+     *
91 91
      * @param initialColour Snitial colour
92 92
      * @param ircColours Show irc colours
93 93
      * @param hexColours Show hex colours
@@ -99,12 +99,12 @@ public final class ColourChooser extends JPanel implements ActionListener {
99 99
 
100 100
     /**
101 101
      * Creates a new instance of ColourChooser.
102
-     * 
102
+     *
103 103
      * @param initialColour initial colour
104 104
      * @param ircColours show irc colours
105 105
      * @param hexColours show hex colours
106 106
      * @param window Parent window
107
-     * 
107
+     *
108 108
      * @since 0.6
109 109
      */
110 110
     public ColourChooser(final String initialColour, final boolean ircColours,
@@ -178,9 +178,9 @@ public final class ColourChooser extends JPanel implements ActionListener {
178 178
         }
179 179
     }
180 180
 
181
-    /** 
181
+    /**
182 182
      * {@inheritDoc}.
183
-     * 
183
+     *
184 184
      * @param e Action event
185 185
      */
186 186
     @Override
@@ -242,10 +242,10 @@ public final class ColourChooser extends JPanel implements ActionListener {
242 242
             }
243 243
         }
244 244
     }
245
-    
245
+
246 246
     /**
247 247
      * Sets the Parent window.
248
-     * 
248
+     *
249 249
      * @param window Parent window
250 250
      */
251 251
     public void setWindow(final Window window) {

+ 13
- 13
src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java View File

@@ -48,8 +48,8 @@ public final class ColourPickerDialog extends StandardDialog {
48 48
 
49 49
     /**
50 50
      * Creates a new instance of ColourPickerDialog.
51
-     * 
52
-     * @since 0.6   
51
+     *
52
+     * @since 0.6
53 53
      */
54 54
     public ColourPickerDialog() {
55 55
         this(true, true);
@@ -57,9 +57,9 @@ public final class ColourPickerDialog extends StandardDialog {
57 57
 
58 58
     /**
59 59
      * Creates a new instance of ColourPickerDialog.
60
-     * 
60
+     *
61 61
      * @param window Parent window
62
-     * 
62
+     *
63 63
      * @since 0.6
64 64
      */
65 65
     public ColourPickerDialog(final Window window) {
@@ -68,7 +68,7 @@ public final class ColourPickerDialog extends StandardDialog {
68 68
 
69 69
     /**
70 70
      * Creates a new instance of ColourPickerDialog.
71
-     * 
71
+     *
72 72
      * @param showIRC show irc colours
73 73
      * @param showHex show hex colours
74 74
      */
@@ -79,11 +79,11 @@ public final class ColourPickerDialog extends StandardDialog {
79 79
 
80 80
     /**
81 81
      * Creates a new instance of ColourPickerDialog.
82
-     * 
82
+     *
83 83
      * @param showIRC show irc colours
84 84
      * @param showHex show hex colours
85 85
      * @param window Parent window
86
-     * 
86
+     *
87 87
      * @since 0.6
88 88
      */
89 89
     public ColourPickerDialog(final boolean showIRC, final boolean showHex,
@@ -100,16 +100,16 @@ public final class ColourPickerDialog extends StandardDialog {
100 100
         setWindow(window);
101 101
     }
102 102
 
103
-    /** 
104
-     * Creates and shows a new Colour picker dialog. 
103
+    /**
104
+     * Creates and shows a new Colour picker dialog.
105 105
      * @return Colour picker dialog
106 106
      */
107 107
     public static ColourPickerDialog showColourPicker() {
108 108
         return showColourPicker(true, true);
109 109
     }
110 110
 
111
-    /** 
112
-     * Creates and shows a new Colour picker dialog. 
111
+    /**
112
+     * Creates and shows a new Colour picker dialog.
113 113
      * @return Colour picker dialog
114 114
      * @param showIRC show irc colours
115 115
      * @param showHex show hex colours
@@ -121,7 +121,7 @@ public final class ColourPickerDialog extends StandardDialog {
121 121
         return cpd;
122 122
     }
123 123
 
124
-    /** 
124
+    /**
125 125
      * Adds an actions listener to this dialog.
126 126
      *
127 127
      * @param listener the listener to add
@@ -132,7 +132,7 @@ public final class ColourPickerDialog extends StandardDialog {
132 132
 
133 133
     /**
134 134
      * Sets the Parent window.
135
-     * 
135
+     *
136 136
      * @param window Parent window
137 137
      */
138 138
     public void setWindow(final Window window) {

+ 24
- 24
src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerPanel.java View File

@@ -316,30 +316,30 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
316 316
         repaint(previewRect);
317 317
     }
318 318
 
319
-    /** 
319
+    /**
320 320
      * {@inheritDoc}
321
-     * 
322
-     * @param e Mouse event 
321
+     *
322
+     * @param e Mouse event
323 323
      */
324 324
     @Override
325 325
     public void mouseClicked(final MouseEvent e) {
326 326
     // Do nothing
327 327
     }
328 328
 
329
-    /** 
329
+    /**
330 330
      * {@inheritDoc}
331
-     * 
332
-     * @param e Mouse event 
331
+     *
332
+     * @param e Mouse event
333 333
      */
334 334
     @Override
335 335
     public void mousePressed(final MouseEvent e) {
336 336
     // Do nothing
337 337
     }
338 338
 
339
-    /** 
339
+    /**
340 340
      * {@inheritDoc}
341
-     * 
342
-     * @param e Mouse event 
341
+     *
342
+     * @param e Mouse event
343 343
      */
344 344
     @Override
345 345
     public void mouseReleased(final MouseEvent e) {
@@ -369,50 +369,50 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
369 369
         }
370 370
     }
371 371
 
372
-    /** 
372
+    /**
373 373
      * {@inheritDoc}
374
-     * 
375
-     * @param e Mouse event 
374
+     *
375
+     * @param e Mouse event
376 376
      */
377 377
     @Override
378 378
     public void mouseEntered(final MouseEvent e) {
379 379
     // Do nothing
380 380
     }
381 381
 
382
-    /** 
382
+    /**
383 383
      * {@inheritDoc}
384
-     * 
385
-     * @param e Mouse event 
384
+     *
385
+     * @param e Mouse event
386 386
      */
387 387
     @Override
388 388
     public void mouseExited(final MouseEvent e) {
389 389
     // Do nothing
390 390
     }
391 391
 
392
-    /** 
392
+    /**
393 393
      * {@inheritDoc}
394
-     * 
395
-     * @param e Mouse event 
394
+     *
395
+     * @param e Mouse event
396 396
      */
397 397
     @Override
398 398
     public void mouseDragged(final MouseEvent e) {
399 399
         mouseMotion(e);
400 400
     }
401 401
 
402
-    /** 
402
+    /**
403 403
      * {@inheritDoc}
404
-     * 
405
-     * @param e Mouse event 
404
+     *
405
+     * @param e Mouse event
406 406
      */
407 407
     @Override
408 408
     public void mouseMoved(final MouseEvent e) {
409 409
         mouseMotion(e);
410 410
     }
411 411
 
412
-    /** 
412
+    /**
413 413
      * {@inheritDoc}
414
-     * 
415
-     * @param e Mouse event 
414
+     *
415
+     * @param e Mouse event
416 416
      */
417 417
     @Override
418 418
     public void mouseWheelMoved(final MouseWheelEvent e) {

+ 13
- 13
src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java View File

@@ -74,21 +74,21 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
74 74
     public OptionalColourChooser() {
75 75
         this("", false, true, true);
76 76
     }
77
-    
78
-    /** 
77
+
78
+    /**
79 79
      * Creates a new instance of ColourChooser.
80
-     * 
80
+     *
81 81
      * @param window Parent window
82
-     * 
82
+     *
83 83
      * @since 0.6
84 84
      */
85 85
     public OptionalColourChooser(final Window window) {
86 86
         this("", false, true, true, window);
87 87
     }
88
-    
88
+
89 89
     /**
90 90
      * Creates a new instance of ColourChooser.
91
-     * 
91
+     *
92 92
      * @param initialColour Snitial colour
93 93
      * @param initialState Initial state
94 94
      * @param ircColours Show irc colours
@@ -102,13 +102,13 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
102 102
 
103 103
     /**
104 104
      * Creates a new instance of ColourChooser.
105
-     * 
105
+     *
106 106
      * @param initialColour Snitial colour
107 107
      * @param initialState Initial state
108 108
      * @param ircColours Show irc colours
109 109
      * @param hexColours Show hex colours
110 110
      * @param window Parent window
111
-     * 
111
+     *
112 112
      * @since 0.6
113 113
      */
114 114
     public OptionalColourChooser(final String initialColour,
@@ -188,9 +188,9 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
188 188
         }
189 189
     }
190 190
 
191
-    /** 
191
+    /**
192 192
      * {@inheritDoc}.
193
-     * 
193
+     *
194 194
      * @param e Action event
195 195
      */
196 196
     @Override
@@ -213,7 +213,7 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
213 213
     /**
214 214
      * Adds an action listener to this optional colour chooser. Action
215 215
      * listeners are notified whenever the state changes in some way.
216
-     * 
216
+     *
217 217
      * @param l The listener to be added
218 218
      */
219 219
     public void addActionListener(final ActionListener l) {
@@ -228,10 +228,10 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
228 228
             listener.actionPerformed(new ActionEvent(this, 1, "stuffChanged"));
229 229
         }
230 230
     }
231
-    
231
+
232 232
     /**
233 233
      * Sets the Parent window.
234
-     * 
234
+     *
235 235
      * @param window Parent window
236 236
      */
237 237
     public void setWindow(final Window window) {

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java View File

@@ -97,7 +97,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
97 97
      */
98 98
     public DurationDisplay(final Window window, final long duration) {
99 99
         super();
100
-        
100
+
101 101
         this.window = window;
102 102
         this.duration = (int) (duration / 1000);
103 103
         listeners = new ListenerList();

+ 4
- 4
src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationListener.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -29,7 +29,7 @@ public interface DurationListener {
29 29
 
30 30
     /**
31 31
      * Indicates the duration has been updated.
32
-     * 
32
+     *
33 33
      * @param newDuration Updated duration
34 34
      */
35 35
     void durationUpdated(final int newDuration);

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java View File

@@ -100,7 +100,7 @@ public final class CurrentOptionsPanel extends JPanel implements
100 100
 
101 101
     /**
102 102
      * Adds an option to the current options pane.
103
-     * 
103
+     *
104 104
      * @param configName config option name
105 105
      * @param displayName config option display name
106 106
      * @param panel parent panel

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java View File

@@ -96,7 +96,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
96 96
         ActionManager.getActionManager().registerListener(this,
97 97
                 CoreActionType.CLIENT_CLOSING);
98 98
 
99
-        setInputHandler(new SwingInputHandler(getInputField(), 
99
+        setInputHandler(new SwingInputHandler(getInputField(),
100 100
                 owner.getCommandParser(), this));
101 101
 
102 102
         identity = IdentityManager.getChannelConfig(owner.getServer().

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java View File

@@ -372,7 +372,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
372 372
     public void configChanged(final String domain, final String key) {
373 373
         super.configChanged(domain, key);
374 374
 
375
-        if ("ui".equals(domain) && getContainer().getConfigManager() != null 
375
+        if ("ui".equals(domain) && getContainer().getConfigManager() != null
376 376
                 && getInputField() != null && !UIUtilities.isGTKUI()) {
377 377
             if ("inputbackgroundcolour".equals(key)
378 378
                     || "backgroundcolour".equals(key)) {

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java View File

@@ -77,7 +77,7 @@ import net.miginfocom.swing.MigLayout;
77 77
  */
78 78
 public abstract class TextFrame extends JPanel implements Window,
79 79
         ConfigChangeListener, TextPaneListener, FrameCloseListener {
80
-    
80
+
81 81
     /**
82 82
      * A version number for this class. It should be changed whenever the class
83 83
      * structure is changed (or anything else that would prevent serialized
@@ -483,7 +483,7 @@ public abstract class TextFrame extends JPanel implements Window,
483 483
             updateColours();
484 484
         }
485 485
     }
486
-    
486
+
487 487
     /** {@inheritDoc} */
488 488
     @Override
489 489
     public void windowClosing(final FrameContainer window) {

+ 8
- 8
src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java View File

@@ -40,20 +40,20 @@ import javax.swing.text.BadLocationException;
40 40
  */
41 41
 public class TextAreaInputField extends JTextArea implements InputField,
42 42
         PropertyChangeListener {
43
-    
43
+
44 44
     /**
45 45
      * A version number for this class. It should be changed whenever the class
46 46
      * structure is changed (or anything else that would prevent serialized
47 47
      * objects being unserialized with the new class).
48 48
      */
49 49
     private static final long serialVersionUID = 2;
50
-    
50
+
51 51
     /** Colour picker. */
52
-    protected ColourPickerDialog colourPicker;    
52
+    protected ColourPickerDialog colourPicker;
53 53
 
54 54
     /**
55 55
      * Creates a new text area with the specified number of rows and columns.
56
-     * 
56
+     *
57 57
      * @param rows The number of rows to use
58 58
      * @param columns The number of columns to use
59 59
      */
@@ -65,7 +65,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
65 65
 
66 66
     /**
67 67
      * Creates a new text area containing the specified text.
68
-     * 
68
+     *
69 69
      * @param text The text to contain initially
70 70
      */
71 71
     public TextAreaInputField(final String text) {
@@ -73,7 +73,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
73 73
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
74 74
                 .addPropertyChangeListener(this);
75 75
     }
76
-    
76
+
77 77
     /** {@inheritDoc} */
78 78
     @Override
79 79
     public void addActionListener(final ActionListener listener) {
@@ -81,7 +81,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
81 81
     }
82 82
 
83 83
     /** {@inheritDoc} */
84
-    @Override    
84
+    @Override
85 85
     public void removeActionListener(final ActionListener listener) {
86 86
         // Ignore request - we don't handle returns for text areas
87 87
     }
@@ -97,7 +97,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
97 97
                 @Override
98 98
                 public void actionPerformed(final ActionEvent actionEvent) {
99 99
                     try {
100
-                        getDocument().insertString(getCaretPosition(), 
100
+                        getDocument().insertString(getCaretPosition(),
101 101
                                 actionEvent.getActionCommand(), null);
102 102
                     } catch (BadLocationException ex) {
103 103
                         //Ignore, wont happen

+ 7
- 7
src/com/dmdirc/addons/ui_swing/components/renderers/ActionComparisonCellRenderer.java View File

@@ -33,34 +33,34 @@ import javax.swing.JList;
33 33
  * Renders an action comparison in plain english.
34 34
  */
35 35
 public final class ActionComparisonCellRenderer extends DefaultListCellRenderer {
36
-    
36
+
37 37
     /**
38 38
      * A version number for this class. It should be changed whenever the class
39 39
      * structure is changed (or anything else that would prevent serialized
40 40
      * objects being unserialized with the new class).
41 41
      */
42 42
     private static final long serialVersionUID = 1;
43
-    
43
+
44 44
     /** Creates a new instance of ActionComparisonCellRenderer. */
45 45
     public ActionComparisonCellRenderer() {
46 46
         super();
47 47
     }
48
-    
48
+
49 49
     /** {@inheritDoc} */
50 50
     @Override
51 51
     public Component getListCellRendererComponent(final JList list,
52 52
             final Object value, final int index, final boolean isSelected,
53 53
             final boolean cellHasFocus) {
54
-        
54
+
55 55
         super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
56
-        
56
+
57 57
         if (value == null) {
58 58
             setText("Any");
59 59
         } else {
60 60
             setText(((ActionComparison) value).getName());
61 61
         }
62
-        
62
+
63 63
         return this;
64 64
     }
65
-    
65
+
66 66
 }

+ 8
- 8
src/com/dmdirc/addons/ui_swing/components/renderers/ActionConditionCellRenderer.java View File

@@ -31,19 +31,19 @@ import javax.swing.table.DefaultTableCellRenderer;
31 31
  * Renders an action condition in plain english.
32 32
  */
33 33
 public final class ActionConditionCellRenderer extends DefaultTableCellRenderer {
34
-    
34
+
35 35
     /**
36 36
      * A version number for this class. It should be changed whenever the class
37 37
      * structure is changed (or anything else that would prevent serialized
38 38
      * objects being unserialized with the new class).
39 39
      */
40 40
     private static final long serialVersionUID = 2;
41
-    
41
+
42 42
     /** Creates a new instance of ActionConditionCellRenderer. */
43 43
     public ActionConditionCellRenderer() {
44 44
         super();
45 45
     }
46
-    
46
+
47 47
     /** {@inheritDoc} */
48 48
     @Override
49 49
     public void setValue(final Object value) {
@@ -51,16 +51,16 @@ public final class ActionConditionCellRenderer extends DefaultTableCellRenderer
51 51
             setText("Any");
52 52
             return;
53 53
         }
54
-        
54
+
55 55
         final ActionCondition condition = (ActionCondition) value;
56
-        
57
-        if (condition.getComparison() == CoreActionComparison.INT_EQUALS 
58
-                || condition.getComparison() == CoreActionComparison.INT_GREATER 
56
+
57
+        if (condition.getComparison() == CoreActionComparison.INT_EQUALS
58
+                || condition.getComparison() == CoreActionComparison.INT_GREATER
59 59
                 || condition.getComparison() == CoreActionComparison.INT_LESS) {
60 60
             setText(condition.getComparison().getName() + " " + condition.getTarget());
61 61
         } else {
62 62
             setText(value.toString());
63 63
         }
64 64
     }
65
-    
65
+
66 66
 }

+ 6
- 6
src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeRenderer.java View File

@@ -35,28 +35,28 @@ import javax.swing.JList;
35 35
  * Displays actions types and headers in a pretty fashion.
36 36
  */
37 37
 public final class ActionTypeRenderer extends DefaultListCellRenderer {
38
-    
38
+
39 39
     /**
40 40
      * A version number for this class. It should be changed whenever the class
41 41
      * structure is changed (or anything else that would prevent serialized
42 42
      * objects being unserialized with the new class).
43 43
      */
44 44
     private static final long serialVersionUID = 1;
45
-    
45
+
46 46
     /**
47 47
      * Creates a new instance of ActionTypeRenderer.
48 48
      */
49 49
     public ActionTypeRenderer() {
50 50
         super();
51 51
     }
52
-    
52
+
53 53
     /** {@inheritDoc} */
54 54
     @Override
55 55
     public Component getListCellRendererComponent(final JList list,
56 56
             final Object value, final int index, final boolean isSelected,
57 57
             final boolean cellHasFocus) {
58 58
         super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
59
-        
59
+
60 60
         if (value == null) {
61 61
             setText("");
62 62
         } else if (value instanceof String && !((String) value).isEmpty()) {
@@ -68,8 +68,8 @@ public final class ActionTypeRenderer extends DefaultListCellRenderer {
68 68
         } else {
69 69
             setText(value.toString());
70 70
         }
71
-        
71
+
72 72
         return this;
73 73
     }
74
-    
74
+
75 75
 }

+ 5
- 5
src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeTableCellRenderer.java View File

@@ -33,24 +33,24 @@ import javax.swing.table.DefaultTableCellRenderer;
33 33
  * Displays actions types and headers in a pretty fashion.
34 34
  */
35 35
 public final class ActionTypeTableCellRenderer extends DefaultTableCellRenderer {
36
-    
36
+
37 37
     /**
38 38
      * A version number for this class. It should be changed whenever the class
39 39
      * structure is changed (or anything else that would prevent serialized
40 40
      * objects being unserialized with the new class).
41 41
      */
42 42
     private static final long serialVersionUID = 1;
43
-    
43
+
44 44
     /**
45 45
      * Creates a new instance of ActionTypeRenderer.
46 46
      */
47 47
     public ActionTypeTableCellRenderer() {
48 48
         super();
49 49
     }
50
-    
50
+
51 51
     /** {@inheritDoc} */
52 52
     @Override
53
-    public void setValue(final Object value) {        
53
+    public void setValue(final Object value) {
54 54
         if (value == null) {
55 55
             setText("");
56 56
         } else if (value instanceof String && !((String) value).isEmpty()) {
@@ -63,5 +63,5 @@ public final class ActionTypeTableCellRenderer extends DefaultTableCellRenderer
63 63
             setText(value.toString());
64 64
         }
65 65
     }
66
-    
66
+
67 67
 }

+ 5
- 5
src/com/dmdirc/addons/ui_swing/components/renderers/AddOptionCellRenderer.java View File

@@ -35,7 +35,7 @@ import javax.swing.JList;
35 35
  * Add option combo box cell renderer.
36 36
  */
37 37
 public final class AddOptionCellRenderer extends DefaultListCellRenderer {
38
-    
38
+
39 39
     /**
40 40
      * A version number for this class. It should be changed whenever the class
41 41
      * structure is changed (or anything else that would prevent serialized
@@ -52,10 +52,10 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
52 52
      */
53 53
     public AddOptionCellRenderer(final SettingsPanel settingsPanel) {
54 54
         super();
55
-        
55
+
56 56
         this.settingsPanel = settingsPanel;
57 57
     }
58
-    
58
+
59 59
     /** {@inheritDoc} */
60 60
     @Override
61 61
     public Component getListCellRendererComponent(
@@ -63,7 +63,7 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
63 63
             final Object value,
64 64
             final int index,
65 65
             final boolean isSelected,
66
-            final boolean cellHasFocus) {       
66
+            final boolean cellHasFocus) {
67 67
         super.getListCellRendererComponent(list, value, index, isSelected,
68 68
                 cellHasFocus);
69 69
 
@@ -78,7 +78,7 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
78 78
         } else {
79 79
             setText(setting.getTitle());
80 80
         }
81
-        
81
+
82 82
         return this;
83 83
     }
84 84
 }

+ 4
- 4
src/com/dmdirc/addons/ui_swing/components/renderers/ArrayCellRenderer.java View File

@@ -30,24 +30,24 @@ import javax.swing.table.DefaultTableCellRenderer;
30 30
  * Renders an array as an inline string.
31 31
  */
32 32
 public final class ArrayCellRenderer extends DefaultTableCellRenderer {
33
-    
33
+
34 34
     /**
35 35
      * A version number for this class. It should be changed whenever the class
36 36
      * structure is changed (or anything else that would prevent serialized
37 37
      * objects being unserialized with the new class).
38 38
      */
39 39
     private static final long serialVersionUID = 1;
40
-    
40
+
41 41
     /** Creates a new instance of ArrayCellRenderer. */
42 42
     public ArrayCellRenderer() {
43 43
         super();
44 44
     }
45
-    
45
+
46 46
     /** {@inheritDoc} */
47 47
     @Override
48 48
     public void setValue(final Object value) {
49 49
         final String response = Arrays.toString((String[]) value);
50 50
         setText(response.substring(1, response.length() - 1));
51 51
     }
52
-    
52
+
53 53
 }

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/renderers/CertificateChainEntryCellRenderer.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 8
- 8
src/com/dmdirc/addons/ui_swing/components/renderers/DateCellRenderer.java View File

@@ -30,25 +30,25 @@ import javax.swing.table.DefaultTableCellRenderer;
30 30
  * List cell renderer for dates.
31 31
  */
32 32
 public final class DateCellRenderer extends DefaultTableCellRenderer {
33
-    
33
+
34 34
     /**
35 35
      * A version number for this class. It should be changed whenever the class
36 36
      * structure is changed (or anything else that would prevent serialized
37 37
      * objects being unserialized with the new class).
38 38
      */
39 39
     private static final long serialVersionUID = 1;
40
-    
40
+
41 41
     /** Creates a new instance of DateCellRenderer. */
42 42
     public DateCellRenderer() {
43 43
         super();
44 44
     }
45
-    
45
+
46 46
     /** {@inheritDoc} */
47 47
     @Override
48 48
     public void setValue(final Object value) {
49 49
         setText("" + duration((new Date().getTime() - ((Date) value).getTime()) / 1000));
50 50
     }
51
-    
51
+
52 52
     /**
53 53
      * Get the duration in seconds as a string.
54 54
      *
@@ -61,13 +61,13 @@ public final class DateCellRenderer extends DefaultTableCellRenderer {
61 61
         final long hours = secondsInput / 3600;
62 62
         final long minutes = secondsInput / 60 % 60;
63 63
         //final long seconds = secondsInput % 60;
64
-        
65
-        if (hours > 0) { 
64
+
65
+        if (hours > 0) {
66 66
             result.append(hours).append("h ");
67 67
         }
68
-        
68
+
69 69
         result.append(minutes).append("m");
70
-        
70
+
71 71
         return result.toString();
72 72
     }
73 73
 }

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/renderers/ErrorLevelIconCellRenderer.java View File

@@ -31,19 +31,19 @@ import javax.swing.table.DefaultTableCellRenderer;
31 31
 
32 32
 /** List cell renderer for dates. */
33 33
 public final class ErrorLevelIconCellRenderer extends DefaultTableCellRenderer {
34
-    
34
+
35 35
     /**
36 36
      * A version number for this class. It should be changed whenever the class
37 37
      * structure is changed (or anything else that would prevent serialized
38 38
      * objects being unserialized with the new class).
39 39
      */
40 40
     private static final long serialVersionUID = 1;
41
-    
41
+
42 42
     /** Creates a new instance of ErrorLevelIconCellRenderer. */
43 43
     public ErrorLevelIconCellRenderer() {
44 44
         super();
45 45
     }
46
-    
46
+
47 47
     /** {@inheritDoc} */
48 48
     @Override
49 49
     public void setValue(final Object value) {

+ 7
- 7
src/com/dmdirc/addons/ui_swing/components/renderers/ExtendedListModeCellRenderer.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -53,22 +53,22 @@ public class ExtendedListModeCellRenderer extends JPanel implements ListCellRend
53 53
             final Object value, final int index, final boolean isSelected,
54 54
             final boolean cellHasFocus) {
55 55
         final ChannelListModeItem listMode = (ChannelListModeItem) value;
56
-        
56
+
57 57
         removeAll();
58 58
         setLayout(new MigLayout("fill, ins 0"));
59
-        
59
+
60 60
         if (isSelected) {
61 61
             setBackground(list.getSelectionBackground());
62 62
         } else {
63 63
             setBackground(list.getBackground());
64 64
         }
65
-        
65
+
66 66
         add(new JLabel(listMode.getItem()), "split 2, growx, pushx, gapleft 3");
67 67
         add(new JLabel(new Date(listMode.getTime() * 1000).toString()),
68 68
                 "right, wrap, gapright 3");
69 69
         add(new JLabel(listMode.getOwner()), "growx, pushx, wrap, gapleft 3");
70 70
         add(new JSeparator(), "growx, pushx");
71
-        
71
+
72 72
         return this;
73 73
     }
74 74
 }

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/renderers/FontListCellRenderer.java View File

@@ -23,7 +23,7 @@ package com.dmdirc.addons.ui_swing.components.renderers;
23 23
 
24 24
 import java.awt.Component;
25 25
 import java.awt.Font;
26
-    
26
+
27 27
 import javax.swing.DefaultListCellRenderer;
28 28
 import javax.swing.JList;
29 29
 

+ 2
- 2
src/com/dmdirc/addons/ui_swing/components/renderers/ListModeCellRenderer.java View File

@@ -50,7 +50,7 @@ public class ListModeCellRenderer extends DefaultListCellRenderer {
50 50
             final Object value, final int index, final boolean isSelected,
51 51
             final boolean cellHasFocus) {
52 52
         super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
53
-        
53
+
54 54
         if (value == null) {
55 55
             setText("");
56 56
         } else if (value instanceof ChannelListModeItem) {
@@ -58,7 +58,7 @@ public class ListModeCellRenderer extends DefaultListCellRenderer {
58 58
         } else {
59 59
             setText(value.toString());
60 60
         }
61
-        
61
+
62 62
         return this;
63 63
     }
64 64
 }

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/renderers/TopicCellRenderer.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/renderers/URIHandlerCellRenderer.java View File

@@ -70,7 +70,7 @@ public class URIHandlerCellRenderer extends DefaultTableCellRenderer {
70 70
         } else {
71 71
             handler = "Custom command: " + handler;
72 72
         }
73
-        
73
+
74 74
         setValue(handler);
75 75
 
76 76
         return this;

+ 5
- 5
src/com/dmdirc/addons/ui_swing/components/renderers/UpdateComponentTableCellRenderer.java View File

@@ -1,16 +1,16 @@
1 1
 /*
2 2
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
- * 
3
+ *
4 4
  * Permission is hereby granted, free of charge, to any person obtaining a copy
5 5
  * of this software and associated documentation files (the "Software"), to deal
6 6
  * in the Software without restriction, including without limitation the rights
7 7
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8 8
  * copies of the Software, and to permit persons to whom the Software is
9 9
  * furnished to do so, subject to the following conditions:
10
- * 
10
+ *
11 11
  * The above copyright notice and this permission notice shall be included in
12 12
  * all copies or substantial portions of the Software.
13
- * 
13
+ *
14 14
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15 15
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16 16
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -47,7 +47,7 @@ public class UpdateComponentTableCellRenderer extends DefaultTableCellRenderer {
47 47
             final Object value, final boolean isSelected,
48 48
             final boolean hasFocus, final int row, final int column) {
49 49
         super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
50
-        
50
+
51 51
         if (value == null) {
52 52
             setValue("Unknown");
53 53
         } else if (value instanceof UpdateComponent) {
@@ -55,7 +55,7 @@ public class UpdateComponentTableCellRenderer extends DefaultTableCellRenderer {
55 55
         } else {
56 56
             setValue(value.toString());
57 57
         }
58
-        
58
+
59 59
         return this;
60 60
     }
61 61
 }

+ 0
- 0
src/com/dmdirc/addons/ui_swing/components/renderers/UpdateStatusTableCellRenderer.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save