Parcourir la source

More deprecations go byebye

Change-Id: I4d171421aee23c200e65c1eec89fa21974d42160
Reviewed-on: http://gerrit.dmdirc.com/2160
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.6.7rc1
Chris Smith il y a 13 ans
Parent
révision
2f4649f388

+ 0
- 11
src/com/dmdirc/commandparser/BaseCommandInfo.java Voir le fichier

@@ -57,17 +57,6 @@ public class BaseCommandInfo implements CommandInfo {
57 57
         return name;
58 58
     }
59 59
 
60
-    /**
61
-     * {@inheritDoc}
62
-     *
63
-     * @deprecated All commands should be shown in help messages
64
-     */
65
-    @Override
66
-    @Deprecated
67
-    public boolean showInHelp() {
68
-        return true;
69
-    }
70
-
71 60
     /** {@inheritDoc} */
72 61
     @Override
73 62
     public String getHelp() {

+ 0
- 9
src/com/dmdirc/commandparser/CommandInfo.java Voir le fichier

@@ -34,15 +34,6 @@ public interface CommandInfo {
34 34
      */
35 35
     String getName();
36 36
 
37
-    /**
38
-     * Returns whether or not this command should be shown in help messages.
39
-     *
40
-     * @return True iff the command should be shown, false otherwise
41
-     * @deprecated All commands should be shown in help messages
42
-     */
43
-    @Deprecated
44
-    boolean showInHelp();
45
-
46 37
     /**
47 38
      * Returns a string representing the help message for this command.
48 39
      * <p>

+ 0
- 11
src/com/dmdirc/commandparser/commands/server/RawServerCommand.java Voir le fichier

@@ -67,17 +67,6 @@ public class RawServerCommand extends Command implements CommandInfo {
67 67
         return myName;
68 68
     }
69 69
 
70
-    /**
71
-     * {@inheritDoc}
72
-     *
73
-     * @deprecated All commands should be shown in help messages
74
-     */
75
-    @Override
76
-    @Deprecated
77
-    public boolean showInHelp() {
78
-        return true;
79
-    }
80
-
81 70
     /** {@inheritDoc} */
82 71
     @Override
83 72
     public CommandType getType() {

+ 3
- 5
test/com/dmdirc/commandparser/commands/HelpTest.java Voir le fichier

@@ -59,18 +59,16 @@ public class HelpTest {
59 59
     public static List<Object[]> data() throws InvalidIdentityFileException {
60 60
         final List<Object[]> res = new LinkedList<Object[]>();
61 61
 
62
-        IdentityManager.load();
62
+        IdentityManager.getIdentityManager().initialise();
63 63
         CommandManager.getCommandManager().initCommands();
64 64
 
65 65
         for (CommandType type : CommandType.values()) {
66 66
             for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {
67
-                if (command.showInHelp()) {
68
-                    res.add(new Object[]{command});
69
-                }
67
+                res.add(new Object[]{command});
70 68
             }
71 69
         }
72 70
 
73 71
         return res;
74 72
     }
75
-    
73
+
76 74
 }

Chargement…
Annuler
Enregistrer