Make commands and categories implement Comparable

Revxrsal · Apr 22, 2022 · a64c70d · a64c70d
1 parent 8fe6d51
commit a64c70d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/common/src/main/java/revxrsal/commands/command/CommandCategory.java b/common/src/main/java/revxrsal/commands/command/CommandCategory.java
@@ -20,7 +20,7 @@
  *     <li>Subactions, such as {@link Default}.</li>
  * </ul>
  */
-public interface CommandCategory extends PermissionHolder {
+public interface CommandCategory extends PermissionHolder, Comparable<CommandCategory> {
 
     /**
      * Returns the name of this category

diff --git a/common/src/main/java/revxrsal/commands/command/ExecutableCommand.java b/common/src/main/java/revxrsal/commands/command/ExecutableCommand.java
@@ -13,14 +13,15 @@
 import revxrsal.commands.core.CommandPath;
 import revxrsal.commands.process.ResponseHandler;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Represents a command which can be executed with specific arguments,
  * flags or switches.
  */
-public interface ExecutableCommand extends CommandAnnotationHolder, PermissionHolder {
+public interface ExecutableCommand extends CommandAnnotationHolder, PermissionHolder, Comparable<ExecutableCommand> {
 
     /**
      * Returns the name of the command

diff --git a/common/src/main/java/revxrsal/commands/core/BaseCommandCategory.java b/common/src/main/java/revxrsal/commands/core/BaseCommandCategory.java
@@ -101,4 +101,7 @@ private class CategoryPermission implements CommandPermission {
         }
     }
 
+    @Override public int compareTo(@NotNull CommandCategory o) {
+        return path.compareTo(o.getPath());
+    }
 }
diff --git a/common/src/main/java/revxrsal/commands/core/CommandExecutable.java b/common/src/main/java/revxrsal/commands/core/CommandExecutable.java
@@ -115,4 +115,8 @@ public void setPermission(@NotNull CommandPermission permission) {
                 ", name='" + name + '\'' +
                 '}';
     }
+
+    @Override public int compareTo(@NotNull ExecutableCommand o) {
+        return path.compareTo(o.getPath());
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        @Override public int compareTo(@NotNull CommandCategory o) {
+            return path.compareTo(o.getPath());
+        }
     }