Refactor region commands and make the necessary ones run in the backg…

…round.
EngineHub · Aug 15, 2014 · 28c538e · 28c538e
1 parent a35cb92
commit 28c538e
Show file tree

Hide file tree

Showing 13 changed files with 1,228 additions and 1,720 deletions.
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java
@@ -30,7 +30,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-class AsyncCommandHelper {
+public class AsyncCommandHelper {
 
     private final ListenableFuture<?> future;
     private final WorldGuardPlugin plugin;

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java
@@ -30,7 +30,7 @@
 /**
  * Command-related utility methods.
  */
-final class CommandUtils {
+public final class CommandUtils {
 
     private CommandUtils() {
     }
@@ -41,7 +41,7 @@ private CommandUtils() {
      * @param owner the owner object
      * @return a name
      */
-    static String getOwnerName(@Nullable Object owner) {
+    public static String getOwnerName(@Nullable Object owner) {
         if (owner == null) {
             return "?";
         } else if (owner instanceof Player) {
@@ -62,7 +62,7 @@ static String getOwnerName(@Nullable Object owner) {
      * @param sender the sender
      * @return a function
      */
-    static Function<String, ?> messageFunction(final CommandSender sender) {
+    public static Function<String, ?> messageFunction(final CommandSender sender) {
         return new Function<String, Object>() {
             @Override
             public Object apply(@Nullable String s) {

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java
@@ -28,14 +28,14 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-class FutureProgressListener implements Runnable {
+public class FutureProgressListener implements Runnable {
 
     private static final Timer timer = new Timer();
     private static final int MESSAGE_DELAY = 1000;
 
     private final MessageTimerTask task;
 
-    FutureProgressListener(CommandSender sender, String message) {
+    public FutureProgressListener(CommandSender sender, String message) {
         checkNotNull(sender);
         checkNotNull(message);
 

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java
@@ -28,7 +28,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-class MessageFutureCallback<V> implements FutureCallback<V> {
+public class MessageFutureCallback<V> implements FutureCallback<V> {
 
     private final WorldGuardPlugin plugin;
     private final CommandSender sender;
@@ -57,15 +57,15 @@ public void onFailure(@Nullable Throwable throwable) {
         sender.sendMessage(ChatColor.RED + failure + ": " + plugin.convertThrowable(throwable));
     }
 
-    static class Builder {
+    public static class Builder {
         private final WorldGuardPlugin plugin;
         private final CommandSender sender;
         @Nullable
         private String success;
         @Nullable
         private String failure;
 
-        Builder(WorldGuardPlugin plugin, CommandSender sender) {
+        public Builder(WorldGuardPlugin plugin, CommandSender sender) {
             checkNotNull(plugin);
             checkNotNull(sender);
 

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java
@@ -25,7 +25,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-class MessageTimerTask extends TimerTask {
+public class MessageTimerTask extends TimerTask {
 
     private final CommandSender sender;
     private final String message;

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java
@@ -19,6 +19,8 @@
 
 package com.sk89q.worldguard.bukkit.commands;
 
+import com.sk89q.worldguard.bukkit.commands.region.MemberCommands;
+import com.sk89q.worldguard.bukkit.commands.region.RegionCommands;
 import org.bukkit.command.CommandSender;
 
 import com.sk89q.minecraft.util.commands.Command;
@@ -35,7 +37,7 @@ public ProtectionCommands(WorldGuardPlugin plugin) {
     }
 
     @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
+    @NestedCommand({RegionCommands.class, MemberCommands.class})
     public void region(CommandContext args, CommandSender sender) {}
 
     @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java