Switch popin/out commands to use new style info objects

Change-Id: Ic1af964f7f363ddc9fe686c35f4f7ed934726cfe
Reviewed-on: http://gerrit.dmdirc.com/2091
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -124,8 +124,8 @@ public class SwingController extends BasePlugin implements UIController {
         registerCommand(new ServerSettings(), ServerSettings.INFO);
         registerCommand(new ChannelSettings(), ChannelSettings.INFO);
         registerCommand(new Input(windowFactory), Input.INFO);
-        registerCommand(new PopOutCommand(this), new PopOutCommandInfo());
-        registerCommand(new PopInCommand(this), new PopInCommandInfo());
+        registerCommand(new PopOutCommand(this), PopOutCommand.INFO);
+        registerCommand(new PopInCommand(this), PopInCommand.INFO);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/commands/PopInCommand.java

@@ -26,7 +26,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -35,6 +38,11 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  */
 public class PopInCommand extends Command {
 
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("popin",
+            "popin - Reattaches the current window to the main client if it"
+                + " has been detached via the popin command.",
+            CommandType.TYPE_GLOBAL);
     /** SwingController associated with this popin Command. */
     private final SwingController controller;
 

src/com/dmdirc/addons/ui_swing/commands/PopInCommandInfo.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2011 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Command to pop out windows.
- */
-public class PopInCommandInfo implements CommandInfo {
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "popin";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "popin - Reattaches the current window to the main client if it"
-                + " has been detached via the popin command.";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-}

src/com/dmdirc/addons/ui_swing/commands/PopOutCommand.java

@@ -26,7 +26,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 
@@ -35,6 +38,11 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  */
 public class PopOutCommand extends Command {
 
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("popout",
+            "popout - Makes the current window pop out of the client as a "
+                + "free floating window on your desktop.",
+            CommandType.TYPE_GLOBAL);
     /** SwingController associated with this popout Command. */
     private final SwingController controller;
 

src/com/dmdirc/addons/ui_swing/commands/PopOutCommandInfo.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2011 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.commands;
-
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-
-/**
- * Command to pop out windows.
- */
-public class PopOutCommandInfo implements CommandInfo {
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return "popout";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean showInHelp() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return "popout - Makes the current window pop out of the client as a "
-                + "free floating window on your desktop.";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return CommandType.TYPE_GLOBAL;
-    }
-
-}