mirror
/
DMDirc-Plugins
mirror of https://github.com/DMDirc/Plugins.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 7 Wiki Activity
Browse Source

Extend BaseCommand not Command.

pull/500/head
Chris Smith 7 years ago
parent
d787fc3472
commit
86555906cc
28 changed files with 88 additions and 103 deletions
Split View Show Diff Stats
  1. 3
    4
      audio/src/main/java/com/dmdirc/addons/audio/AudioCommand.java
  2. 3
    4
      audio/src/main/java/com/dmdirc/addons/audio/BeepCommand.java
  3. 3
    4
      calc/src/main/java/com/dmdirc/addons/calc/CalcCommand.java
  4. 4
    5
      conditional_execute/src/main/java/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java
  5. 2
    2
      contactlist/src/main/java/com/dmdirc/addons/contactlist/ContactListCommand.java
  6. 4
    5
      dcc/src/main/java/com/dmdirc/addons/dcc/DCCCommand.java
  7. 3
    4
      dcop/src/main/java/com/dmdirc/addons/dcop/DcopCommand.java
  8. 5
    6
      debug/src/main/java/com/dmdirc/addons/debug/Debug.java
  9. 4
    6
      dns/src/main/java/com/dmdirc/addons/dns/DNSCommand.java
  10. 6
    9
      exec/src/main/java/com/dmdirc/addons/exec/ExecCommand.java
  11. 2
    2
      freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java
  12. 2
    2
      logging/src/main/java/com/dmdirc/addons/logging/LoggingCommand.java
  13. 4
    6
      nma/src/main/java/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java
  14. 3
    5
      notifications/src/main/java/com/dmdirc/addons/notifications/NotificationCommand.java
  15. 5
    4
      nowplaying/src/main/java/com/dmdirc/addons/nowplaying/NowPlayingCommand.java
  16. 3
    2
      osd/src/main/java/com/dmdirc/addons/osd/OsdCommand.java
  17. 2
    2
      osx_integration/src/main/java/com/dmdirc/addons/osx_integration/DockBounceCommand.java
  18. 3
    4
      parserdebug/src/main/java/com/dmdirc/addons/parserdebug/ParserDebugCommand.java
  19. 2
    2
      redirect/src/main/java/com/dmdirc/addons/redirect/RedirectCommand.java
  20. 7
    6
      scriptplugin/src/main/java/com/dmdirc/addons/scriptplugin/ScriptCommand.java
  21. 2
    2
      systray/src/main/java/com/dmdirc/addons/systray/PopupCommand.java
  22. 4
    5
      time/src/main/java/com/dmdirc/addons/time/TimerCommand.java
  23. 2
    2
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java
  24. 2
    2
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/Input.java
  25. 2
    2
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopInCommand.java
  26. 2
    2
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java
  27. 2
    2
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ServerSettings.java
  28. 2
    2
      windowflashing/src/main/java/com/dmdirc/addons/windowflashing/FlashWindow.java

+ 3
- 4
audio/src/main/java/com/dmdirc/addons/audio/AudioCommand.java View File 

@@ -26,20 +26,19 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33
34 
-import java.io.File;
35 
-
36 34 
 import javax.annotation.Nonnull;
37 35 
 import javax.inject.Inject;
36 
+import java.io.File;
38 37
39 38 
 /**
40 39 
  * The Audio Command allows playing of audio files.
41 40 
  */
42 
-public class AudioCommand extends Command {
41 
+public class AudioCommand extends BaseCommand {
43 42
44 43 
     /** A command info object for this command. */
45 44 
     public static final CommandInfo INFO = new BaseCommandInfo("audio",

+ 3
- 4
audio/src/main/java/com/dmdirc/addons/audio/BeepCommand.java View File 

@@ -26,20 +26,19 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33
34 
-import java.awt.Toolkit;
35 
-
36 34 
 import javax.annotation.Nonnull;
37 35 
 import javax.inject.Inject;
36 
+import java.awt.*;
38 37
39 38 
 /**
40 39 
  * The Beep Command emits a beep
41 40 
  */
42 
-public class BeepCommand extends Command {
41 
+public class BeepCommand extends BaseCommand {
43 42
44 43 
     /** A command info object for this command. */
45 44 
     public static final CommandInfo INFO = new BaseCommandInfo("beep",

+ 3
- 4
calc/src/main/java/com/dmdirc/addons/calc/CalcCommand.java View File 

@@ -26,21 +26,20 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33
34 
-import java.text.ParseException;
35 
-
36 34 
 import javax.annotation.Nonnull;
37 35 
 import javax.inject.Inject;
36 
+import java.text.ParseException;
38 37
39 38 
 /**
40 39 
  * A command which allows users to evaluate various mathematical expressions, and perform basic
41 40 
  * calculations.
42 41 
  */
43 
-public class CalcCommand extends Command {
42 
+public class CalcCommand extends BaseCommand {
44 43
45 44 
     /** A command info object for this command. */
46 45 
     public static final CommandInfo INFO = new BaseCommandInfo("calc",

+ 4
- 5
conditional_execute/src/main/java/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java View File 

@@ -25,23 +25,22 @@ package com.dmdirc.addons.conditional_execute;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.InputModel;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33
34 
-import java.util.HashMap;
35 
-import java.util.Map;
36 
-
37 34 
 import javax.annotation.Nonnull;
38 35 
 import javax.inject.Inject;
36 
+import java.util.HashMap;
37 
+import java.util.Map;
39 38
40 39 
 /**
41 40 
  * The ConditionalExecute command allows the user to conditionally execute a command based on
42 41 
  * external and pre-determined conditions.
43 42 
  */
44 
-public class ConditionalExecuteCommand extends Command {
43 
+public class ConditionalExecuteCommand extends BaseCommand {
45 44
46 45 
     /** A command info object for this command. */
47 46 
     public static final BaseCommandInfo INFO = new BaseCommandInfo("conditionalexecute",

+ 2
- 2
contactlist/src/main/java/com/dmdirc/addons/contactlist/ContactListCommand.java View File 

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
31 31 
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
32 32 
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -41,7 +41,7 @@ import javax.inject.Inject;
41 41 
 /**
42 42 
  * Generates a contact list for the channel the command is used in.
43 43 
  */
44 
-public class ContactListCommand extends Command implements IntelligentCommand {
44 
+public class ContactListCommand extends BaseCommand implements IntelligentCommand {
45 45
46 46 
     /** A command info object for this command. */
47 47 
     public static final CommandInfo INFO = new BaseCommandInfo("contactlist",

+ 4
- 5
dcc/src/main/java/com/dmdirc/addons/dcc/DCCCommand.java View File 

@@ -35,7 +35,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
35 35 
 import com.dmdirc.commandparser.CommandArguments;
36 36 
 import com.dmdirc.commandparser.CommandInfo;
37 37 
 import com.dmdirc.commandparser.CommandType;
38 
-import com.dmdirc.commandparser.commands.Command;
38 
+import com.dmdirc.commandparser.commands.BaseCommand;
39 39 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
40 40 
 import com.dmdirc.commandparser.commands.context.CommandContext;
41 41 
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
@@ -51,18 +51,17 @@ import com.dmdirc.ui.input.TabCompleterFactory;
51 51 
 import com.dmdirc.ui.input.TabCompletionType;
52 52 
 import com.dmdirc.ui.messages.BackBufferFactory;
53 53
54 
-import java.awt.Window;
55 
-import java.io.File;
56 
-
57 54 
 import javax.annotation.Nonnull;
58 55 
 import javax.inject.Inject;
59 56 
 import javax.swing.JFileChooser;
60 57 
 import javax.swing.JOptionPane;
58 
+import java.awt.Window;
59 
+import java.io.File;
61 60
62 61 
 /**
63 62 
  * This command allows starting dcc chats/file transfers.
64 63 
  */
65 
-public class DCCCommand extends Command implements IntelligentCommand {
64 
+public class DCCCommand extends BaseCommand implements IntelligentCommand {
66 65
67 66 
     /** A command info object for this command. */
68 67 
     public static final CommandInfo INFO = new BaseCommandInfo("dcc",

+ 3
- 4
dcop/src/main/java/com/dmdirc/addons/dcop/DcopCommand.java View File 

@@ -26,20 +26,19 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33
34 
-import java.util.List;
35 
-
36 34 
 import javax.annotation.Nonnull;
37 35 
 import javax.inject.Inject;
36 
+import java.util.List;
38 37
39 38 
 /**
40 39 
  * The dcop command retrieves information from a dcop application.
41 40 
  */
42 
-public class DcopCommand extends Command {
41 
+public class DcopCommand extends BaseCommand {
43 42
44 43 
     /** A command info object for this command. */
45 44 
     public static final CommandInfo INFO = new BaseCommandInfo("dcop",

+ 5
- 6
debug/src/main/java/com/dmdirc/addons/debug/Debug.java View File 

@@ -26,13 +26,16 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
31 31 
 import com.dmdirc.commandparser.commands.context.CommandContext;
32 32 
 import com.dmdirc.interfaces.CommandController;
33 33 
 import com.dmdirc.interfaces.WindowModel;
34 34 
 import com.dmdirc.ui.input.AdditionalTabTargets;
35 35
36 
+import javax.annotation.Nonnull;
37 
+import javax.inject.Inject;
38 
+import javax.inject.Singleton;
36 39 
 import java.util.ArrayList;
37 40 
 import java.util.Arrays;
38 41 
 import java.util.Collection;
 
@@ -41,15 +44,11 @@ import java.util.Map;
41 44 
 import java.util.Set;
42 45 
 import java.util.stream.Collectors;
43 46
44 
-import javax.annotation.Nonnull;
45 
-import javax.inject.Inject;
46 
-import javax.inject.Singleton;
47 
-
48 47 
 /**
49 48 
  * Provides various handy ways to test or debug the client.
50 49 
  */
51 50 
 @Singleton
52 
-public class Debug extends Command implements IntelligentCommand {
51 
+public class Debug extends BaseCommand implements IntelligentCommand {
53 52
54 53 
     /** A command info object for this command. */
55 54 
     public static final CommandInfo INFO = new BaseCommandInfo("debug",

+ 4
- 6
dns/src/main/java/com/dmdirc/addons/dns/DNSCommand.java View File 

@@ -26,13 +26,14 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 
-
34 33 
 import com.google.common.net.InetAddresses;
35 34
35 
+import javax.annotation.Nonnull;
36 
+import javax.inject.Inject;
36 37 
 import java.net.InetAddress;
37 38 
 import java.net.UnknownHostException;
38 39 
 import java.util.ArrayList;
 
@@ -40,13 +41,10 @@ import java.util.Collection;
40 41 
 import java.util.Timer;
41 42 
 import java.util.TimerTask;
42 43
43 
-import javax.annotation.Nonnull;
44 
-import javax.inject.Inject;
45 
-
46 44 
 /**
47 45 
  * Performs DNS lookups for nicknames, hostnames or IPs.
48 46 
  */
49 
-public class DNSCommand extends Command {
47 
+public class DNSCommand extends BaseCommand {
50 48
51 49 
     /** A command info object for this command. */
52 50 
     public static final CommandInfo INFO = new BaseCommandInfo("dns",

+ 6
- 9
exec/src/main/java/com/dmdirc/addons/exec/ExecCommand.java View File 

@@ -25,31 +25,28 @@ package com.dmdirc.addons.exec;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.WindowModel;
32 32 
 import com.dmdirc.util.CommandUtils;
33 33 
 import com.dmdirc.util.LogUtils;
34 34 
 import com.dmdirc.util.io.StreamUtils;
35 
-
36 35 
 import com.google.common.io.CharStreams;
36 
+import org.slf4j.Logger;
37 
+import org.slf4j.LoggerFactory;
37 38
39 
+import javax.annotation.Nonnull;
40 
+import javax.inject.Inject;
38 41 
 import java.io.File;
39 42 
 import java.io.IOException;
40 43 
 import java.io.InputStreamReader;
41 44 
 import java.util.List;
42 45
43 
-import javax.annotation.Nonnull;
44 
-import javax.inject.Inject;
45 
-
46 
-import org.slf4j.Logger;
47 
-import org.slf4j.LoggerFactory;
48 
-
49 46 
 /**
50 47 
  * A command which allows users execute scripts.
51 48 
  */
52 
-public class ExecCommand extends Command {
49 
+public class ExecCommand extends BaseCommand {
53 50
54 51 
     private static final Logger LOG = LoggerFactory.getLogger(ExecCommand.class);
55 52 
     /** A command info object for this command. */

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.freedesktop_notifications;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -36,7 +36,7 @@ import javax.inject.Inject;
36 36 
 /**
37 37 
  * The FDNotify Command shows a nice popup on using the FreeDesktop VisualNotifications.
38 38 
  */
39 
-public final class FDNotifyCommand extends Command {
39 
+public final class FDNotifyCommand extends BaseCommand {
40 40
41 41 
     /** A command info object for this command. */
42 42 
     public static final BaseCommandInfo INFO = new BaseCommandInfo("fdnotify",

+ 2
- 2
logging/src/main/java/com/dmdirc/addons/logging/LoggingCommand.java View File 

@@ -25,7 +25,7 @@ package com.dmdirc.addons.logging;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
 
@@ -38,7 +38,7 @@ import javax.inject.Inject;
38 38 
 /**
39 39 
  * The logging command retrieves information from a dcop application.
40 40 
  */
41 
-public class LoggingCommand extends Command implements IntelligentCommand {
41 
+public class LoggingCommand extends BaseCommand implements IntelligentCommand {
42 42
43 43 
     /** Command name. */
44 44 
     private static final String LOGGING = "logging";

+ 4
- 6
nma/src/main/java/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java View File 

@@ -25,23 +25,21 @@ package com.dmdirc.addons.nma;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.WindowModel;
32 32 
 import com.dmdirc.plugins.PluginDomain;
33 
-
34 
-import java.io.IOException;
33 
+import org.slf4j.LoggerFactory;
35 34
36 35 
 import javax.annotation.Nonnull;
37 36 
 import javax.inject.Inject;
38 
-
39 
-import org.slf4j.LoggerFactory;
37 
+import java.io.IOException;
40 38
41 39 
 /**
42 40 
  * Command to raise notifications with NotifyMyAndroid.
43 41 
  */
44 
-public class NotifyMyAndroidCommand extends Command {
42 
+public class NotifyMyAndroidCommand extends BaseCommand {
45 43
46 44 
     private static final org.slf4j.Logger LOG = LoggerFactory.
47 45 
             getLogger(NotifyMyAndroidCommand.class);

+ 3
- 5
notifications/src/main/java/com/dmdirc/addons/notifications/NotificationCommand.java View File 

@@ -26,23 +26,21 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
31 31 
 import com.dmdirc.commandparser.commands.context.CommandContext;
32 32 
 import com.dmdirc.interfaces.CommandController;
33 33 
 import com.dmdirc.interfaces.WindowModel;
34 34 
 import com.dmdirc.ui.input.AdditionalTabTargets;
35 35
36 
-import java.util.Collection;
37 
-
38 36 
 import javax.annotation.Nonnull;
37 
+import java.util.Collection;
39 38
40 39 
 /**
41 40 
  * Notification command, delegating notification to one of the registered notification commands as
42 41 
  * preferred by the end user.
43 42 
  */
44 
-public class NotificationCommand extends Command implements
45 
-        IntelligentCommand {
43 
+public class NotificationCommand extends BaseCommand implements IntelligentCommand {
46 44
47 45 
     /** A command info object for this command. */
48 46 
     public static final CommandInfo INFO = new BaseCommandInfo(

+ 5
- 4
nowplaying/src/main/java/com/dmdirc/addons/nowplaying/NowPlayingCommand.java View File 

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
31 31 
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
32 32 
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -39,16 +39,17 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
39 39 
 import com.dmdirc.plugins.PluginDomain;
40 40 
 import com.dmdirc.ui.input.AdditionalTabTargets;
41 41 
 import com.dmdirc.ui.input.TabCompleterUtils;
42 
+
43 
+import javax.annotation.Nonnull;
44 
+import javax.inject.Inject;
42 45 
 import java.util.Arrays;
43 46 
 import java.util.List;
44 47 
 import java.util.stream.Collectors;
45 
-import javax.annotation.Nonnull;
46 
-import javax.inject.Inject;
47 48
48 49 
 /**
49 50 
  * The now playing command retrieves the currently playing song from a variety of media players.
50 51 
  */
51 
-public class NowPlayingCommand extends Command implements IntelligentCommand {
52 
+public class NowPlayingCommand extends BaseCommand implements IntelligentCommand {
52 53
53 54 
     /** A command info object for this command. */
54 55 
     public static final CommandInfo INFO = new BaseCommandInfo("nowplaying",

+ 3
- 2
osd/src/main/java/com/dmdirc/addons/osd/OsdCommand.java View File 

@@ -25,19 +25,20 @@ package com.dmdirc.addons.osd;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
33 33 
 import com.dmdirc.ui.input.AdditionalTabTargets;
34 34 
 import com.dmdirc.ui.messages.StyledMessageUtils;
35 
+
35 36 
 import javax.annotation.Nonnull;
36 37
37 38 
 /**
38 39 
  * The osd command shows an on screen message.
39 40 
  */
40 
-public class OsdCommand extends Command implements IntelligentCommand {
41 
+public class OsdCommand extends BaseCommand implements IntelligentCommand {
41 42
42 43 
     /** A command info object for this command. */
43 44 
     public static final BaseCommandInfo INFO = new BaseCommandInfo("osd",

+ 2
- 2
osx_integration/src/main/java/com/dmdirc/addons/osx_integration/DockBounceCommand.java View File 

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.Apple;
26 26 
 import com.dmdirc.commandparser.BaseCommandInfo;
27 27 
 import com.dmdirc.commandparser.CommandArguments;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.interfaces.CommandController;
32 32 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -37,7 +37,7 @@ import javax.inject.Inject;
37 37 
 /**
38 38 
  * A command to bounce the icon in the OSX dock.
39 39 
  */
40 
-public class DockBounceCommand extends Command {
40 
+public class DockBounceCommand extends BaseCommand {
41 41
42 42 
     /**
43 43 
      * Information about this command.

+ 3
- 4
parserdebug/src/main/java/com/dmdirc/addons/parserdebug/ParserDebugCommand.java View File 

@@ -25,7 +25,7 @@ package com.dmdirc.addons.parserdebug;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.CommandOptions;
30 30 
 import com.dmdirc.commandparser.commands.context.CommandContext;
31 31 
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
@@ -34,16 +34,15 @@ import com.dmdirc.interfaces.Connection;
34 34 
 import com.dmdirc.interfaces.WindowModel;
35 35 
 import com.dmdirc.parser.interfaces.Parser;
36 36
37 
-import java.util.Optional;
38 
-
39 37 
 import javax.annotation.Nonnull;
40 38 
 import javax.inject.Inject;
39 
+import java.util.Optional;
41 40
42 41 
 /**
43 42 
  * The ParserDebug Command allows controlling of which parsers spam debug info.
44 43 
  */
45 44 
 @CommandOptions(allowOffline = false)
46 
-public final class ParserDebugCommand extends Command {
45 
+public final class ParserDebugCommand extends BaseCommand {
47 46
48 47 
     /** A command info object for this command. */
49 48 
     public static final BaseCommandInfo INFO = new BaseCommandInfo(

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.redirect;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
30 30 
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
31 31 
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -45,7 +45,7 @@ import javax.inject.Inject;
45 45 
  * The redirect command allows the user to redirect the output from another command that would
46 46 
  * normally echo results locally to a query or channel window instead.
47 47 
  */
48 
-public class RedirectCommand extends Command implements IntelligentCommand {
48 
+public class RedirectCommand extends BaseCommand implements IntelligentCommand {
49 49
50 50 
     /** A command info object for this command. */
51 51 
     public static final BaseCommandInfo INFO = new BaseCommandInfo("redirect",

+ 7
- 6
scriptplugin/src/main/java/com/dmdirc/addons/scriptplugin/ScriptCommand.java View File 

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
27 27 
 import com.dmdirc.commandparser.CommandArguments;
28 28 
 import com.dmdirc.commandparser.CommandInfo;
29 29 
 import com.dmdirc.commandparser.CommandType;
30 
-import com.dmdirc.commandparser.commands.Command;
30 
+import com.dmdirc.commandparser.commands.BaseCommand;
31 31 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
32 32 
 import com.dmdirc.commandparser.commands.context.CommandContext;
33 33 
 import com.dmdirc.config.GlobalConfig;
 
@@ -36,20 +36,21 @@ import com.dmdirc.interfaces.WindowModel;
36 36 
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
37 37 
 import com.dmdirc.plugins.PluginDomain;
38 38 
 import com.dmdirc.ui.input.AdditionalTabTargets;
39 
+
40 
+import javax.annotation.Nonnull;
41 
+import javax.inject.Inject;
42 
+import javax.script.ScriptEngineManager;
43 
+import javax.script.ScriptException;
39 44 
 import java.io.File;
40 45 
 import java.io.FileWriter;
41 46 
 import java.io.IOException;
42 47 
 import java.util.Map;
43 48 
 import java.util.stream.Collectors;
44 
-import javax.annotation.Nonnull;
45 
-import javax.inject.Inject;
46 
-import javax.script.ScriptEngineManager;
47 
-import javax.script.ScriptException;
48 49
49 50 
 /**
50 51 
  * The Script Command allows controlling of the script plugin.
51 52 
  */
52 
-public class ScriptCommand extends Command implements IntelligentCommand {
53 
+public class ScriptCommand extends BaseCommand implements IntelligentCommand {
53 54
54 55 
     /** A command info object for this command. */
55 56 
     public static final CommandInfo INFO = new BaseCommandInfo("script",

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.systray;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -36,7 +36,7 @@ import javax.inject.Inject;
36 36 
 /**
37 37 
  * The /popup command allows the user to show a popup message from the system tray icon.
38 38 
  */
39 
-public class PopupCommand extends Command {
39 
+public class PopupCommand extends BaseCommand {
40 40
41 41 
     /** A command info object for this command. */
42 42 
     public static final BaseCommandInfo INFO = new BaseCommandInfo("popup",

+ 4
- 5
time/src/main/java/com/dmdirc/addons/time/TimerCommand.java View File 

@@ -26,25 +26,24 @@ import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandType;
29 
-import com.dmdirc.commandparser.commands.Command;
29 
+import com.dmdirc.commandparser.commands.BaseCommand;
30 30 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
31 31 
 import com.dmdirc.commandparser.commands.context.CommandContext;
32 32 
 import com.dmdirc.interfaces.CommandController;
33 33 
 import com.dmdirc.interfaces.WindowModel;
34 34 
 import com.dmdirc.ui.input.AdditionalTabTargets;
35 35
36 
+import javax.annotation.Nonnull;
37 
+import javax.inject.Inject;
36 38 
 import java.util.Map.Entry;
37 39 
 import java.util.Set;
38 40 
 import java.util.stream.Collectors;
39 41
40 
-import javax.annotation.Nonnull;
41 
-import javax.inject.Inject;
42 
-
43 42 
 /**
44 43 
  * The timer command allows users to schedule commands to occur after a certain interval, or to
45 44 
  * repeatedly occur with a specified delay.
46 45 
  */
47 
-public class TimerCommand extends Command implements IntelligentCommand {
46 
+public class TimerCommand extends BaseCommand implements IntelligentCommand {
48 47
49 48 
     /** A command info object for this command. */
50 49 
     public static final CommandInfo INFO = new BaseCommandInfo("timer",

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java View File 

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandArguments;
29 29 
 import com.dmdirc.commandparser.CommandInfo;
30 30 
 import com.dmdirc.commandparser.CommandType;
31 
-import com.dmdirc.commandparser.commands.Command;
31 
+import com.dmdirc.commandparser.commands.BaseCommand;
32 32 
 import com.dmdirc.commandparser.commands.CommandOptions;
33 33 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
34 34 
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 
@@ -45,7 +45,7 @@ import javax.inject.Inject;
45 45 
  * Opens the channel settings window for the channel.
46 46 
  */
47 47 
 @CommandOptions(allowOffline = false)
48 
-public class ChannelSettings extends Command implements IntelligentCommand {
48 
+public class ChannelSettings extends BaseCommand implements IntelligentCommand {
49 49
50 50 
     /** A command info object for this command. */
51 51 
     public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/Input.java View File 

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandArguments;
29 29 
 import com.dmdirc.commandparser.CommandInfo;
30 30 
 import com.dmdirc.commandparser.CommandType;
31 
-import com.dmdirc.commandparser.commands.Command;
31 
+import com.dmdirc.commandparser.commands.BaseCommand;
32 32 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
33 33 
 import com.dmdirc.commandparser.commands.context.CommandContext;
34 34 
 import com.dmdirc.interfaces.CommandController;
 
@@ -43,7 +43,7 @@ import javax.inject.Inject;
43 43 
  *
44 44 
  * @since 0.6.4
45 45 
  */
46 
-public class Input extends Command implements IntelligentCommand {
46 
+public class Input extends BaseCommand implements IntelligentCommand {
47 47
48 48 
     /** A command info object for this command. */
49 49 
     public static final CommandInfo INFO = new BaseCommandInfo("input",

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopInCommand.java View File 

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
29 29 
 import com.dmdirc.commandparser.CommandArguments;
30 30 
 import com.dmdirc.commandparser.CommandInfo;
31 31 
 import com.dmdirc.commandparser.CommandType;
32 
-import com.dmdirc.commandparser.commands.Command;
32 
+import com.dmdirc.commandparser.commands.BaseCommand;
33 33 
 import com.dmdirc.commandparser.commands.context.CommandContext;
34 34 
 import com.dmdirc.interfaces.CommandController;
35 35 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -40,7 +40,7 @@ import javax.inject.Inject;
40 40 
 /**
41 41 
  * Command to pop in windows.
42 42 
  */
43 
-public class PopInCommand extends Command {
43 
+public class PopInCommand extends BaseCommand {
44 44
45 45 
     /** A command info object for this command. */
46 46 
     public static final CommandInfo INFO = new BaseCommandInfo("popin",

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java View File 

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
29 29 
 import com.dmdirc.commandparser.CommandArguments;
30 30 
 import com.dmdirc.commandparser.CommandInfo;
31 31 
 import com.dmdirc.commandparser.CommandType;
32 
-import com.dmdirc.commandparser.commands.Command;
32 
+import com.dmdirc.commandparser.commands.BaseCommand;
33 33 
 import com.dmdirc.commandparser.commands.context.CommandContext;
34 34 
 import com.dmdirc.interfaces.CommandController;
35 35 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -40,7 +40,7 @@ import javax.inject.Inject;
40 40 
 /**
41 41 
  * Command to pop out windows.
42 42 
  */
43 
-public class PopOutCommand extends Command {
43 
+public class PopOutCommand extends BaseCommand {
44 44
45 45 
     /** A command info object for this command. */
46 46 
     public static final CommandInfo INFO = new BaseCommandInfo("popout",

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/commands/ServerSettings.java View File 

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.BaseCommandInfo;
28 28 
 import com.dmdirc.commandparser.CommandArguments;
29 29 
 import com.dmdirc.commandparser.CommandInfo;
30 30 
 import com.dmdirc.commandparser.CommandType;
31 
-import com.dmdirc.commandparser.commands.Command;
31 
+import com.dmdirc.commandparser.commands.BaseCommand;
32 32 
 import com.dmdirc.commandparser.commands.CommandOptions;
33 33 
 import com.dmdirc.commandparser.commands.IntelligentCommand;
34 34 
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -44,7 +44,7 @@ import javax.inject.Inject;
44 44 
  * Opens the server settings window for the server.
45 45 
  */
46 46 
 @CommandOptions(allowOffline = false)
47 
-public class ServerSettings extends Command implements IntelligentCommand {
47 
+public class ServerSettings extends BaseCommand implements IntelligentCommand {
48 48
49 49 
     /** A command info object for this command. */
50 50 
     public static final CommandInfo INFO = new BaseCommandInfo("serversettings",

+ 2
- 2
windowflashing/src/main/java/com/dmdirc/addons/windowflashing/FlashWindow.java View File 

@@ -25,7 +25,7 @@ package com.dmdirc.addons.windowflashing;
25 25 
 import com.dmdirc.commandparser.BaseCommandInfo;
26 26 
 import com.dmdirc.commandparser.CommandArguments;
27 27 
 import com.dmdirc.commandparser.CommandType;
28 
-import com.dmdirc.commandparser.commands.Command;
28 
+import com.dmdirc.commandparser.commands.BaseCommand;
29 29 
 import com.dmdirc.commandparser.commands.context.CommandContext;
30 30 
 import com.dmdirc.interfaces.CommandController;
31 31 
 import com.dmdirc.interfaces.WindowModel;
 
@@ -36,7 +36,7 @@ import javax.inject.Inject;
36 36 
 /**
37 37 
  * Command to flash an inactive window under Windows.
38 38 
  */
39 
-public class FlashWindow extends Command {
39 
+public class FlashWindow extends BaseCommand {
40 40
41 41 
     /** A command info object for this command. */
42 42 
     public static final BaseCommandInfo INFO = new BaseCommandInfo(

Write Preview
Loading…
Cancel
Save