Tidy up PR and fixed wrong javadoc

Author: Joo200

worldguard-core/src/main/java/com/sk89q/worldguard/commands/CommandInputContext.java

@@ -26,7 +26,7 @@
 import javax.annotation.Nullable;
 import java.util.Map;
 
-public class CommandInputContext {
+public abstract class CommandInputContext<T extends Exception> {
     protected final Actor sender;
     protected final String input;
 
@@ -56,30 +56,32 @@ public String getUserInput() {
      * @return Player
      * @throws InvalidFlagFormat if the sender is not a player
      */
-    public LocalPlayer getPlayerSender() throws InvalidFlagFormat {
+    public LocalPlayer getPlayerSender() throws T {
         if (sender.isPlayer() && sender instanceof LocalPlayer) {
             return (LocalPlayer) sender;
         } else {
-            throw new InvalidFlagFormat("Not a player");
+            throw createException("Not a player");
         }
     }
 
-    public Integer getUserInputAsInt() throws InvalidFlagFormat {
+    public Integer getUserInputAsInt() throws T {
         try {
             return Integer.parseInt(input);
         } catch (NumberFormatException e) {
-            throw new InvalidFlagFormat("Not a number: " + input);
+            throw createException("Not a number: " + input);
         }
     }
 
-    public Double getUserInputAsDouble() throws InvalidFlagFormat {
+    public Double getUserInputAsDouble() throws T {
         try {
             return Double.parseDouble(input);
         } catch (NumberFormatException e) {
-            throw new InvalidFlagFormat("Not a number: " + input);
+            throw createException("Not a number: " + input);
         }
     }
 
+    protected abstract T createException(String str);
+
     /**
      * Get an object from the context by key name.
      * May return null if the object does not exist in the context.

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/CustomDomainContext.java

@@ -26,7 +26,7 @@
 import javax.annotation.Nullable;
 import java.util.Map;
 
-public final class CustomDomainContext extends CommandInputContext {
+public final class CustomDomainContext extends CommandInputContext<InvalidDomainFormat> {
 
     private CustomDomainContext(Actor sender, String input, Map<String, Object> values) {
         super(sender, input, values);
@@ -38,16 +38,16 @@ public static CustomDomainContext.CustomDomainContextBuilder create() {
     }
 
     /**
-     * Create a copy of this FlagContext, with optional substitutions for values
+     * Create a copy of this CustomDomainContext, with optional substitutions for values
      *
-     * If any supplied variable is null, it will be ignored.
-     * If a map is supplied, it will override this FlagContext's values of the same key,
-     * but unprovided keys will not be overriden and will be returned as shallow copies.
+     * <p>If any supplied variable is null, it will be ignored.
+     * If a map is supplied, it will override this CustomDomainContext's values of the same key,
+     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
      *
-     * @param commandSender CommandSender for the new FlagContext to run under
-     * @param s String of the user input for the new FlagContext
-     * @param values map of values to override from the current FlagContext
-     * @return a copy of this FlagContext
+     * @param commandSender CommandSender for the new CustomDomainContext to run under
+     * @param s String of the user input for the new CustomDomainContext
+     * @param values map of values to override from the current CustomDomainContext
+     * @return a copy of this CustomDomainContext
      */
     public CustomDomainContext copyWith(@Nullable Actor commandSender, @Nullable String s, @Nullable Map<String, Object> values) {
         Map<String, Object> map = Maps.newHashMap();
@@ -58,6 +58,11 @@ public CustomDomainContext copyWith(@Nullable Actor commandSender, @Nullable Str
         return new CustomDomainContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
     }
 
+    @Override
+    protected InvalidDomainFormat createException(String str) {
+        return new InvalidDomainFormat(str);
+    }
+
     public static class CustomDomainContextBuilder {
         private Actor sender;
         private String input;

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/DomainRegistry.java

@@ -49,7 +49,7 @@ public interface DomainRegistry extends Iterable<DomainFactory<?>> {
      * no exception will be thrown.</p>
      *
      * @param domains a collection of domain factories
-     * @throws IllegalStateException If it is not the right time to register new flags
+     * @throws IllegalStateException If it is not the right time to register new domains
      */
     void registerAll(Map<String, DomainFactory<?>> domains);
 

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/UnknownDomain.java

@@ -35,7 +35,7 @@ public UnknownDomain(String name) {
 
     @Override
     public void parseInput(CustomDomainContext context) throws InvalidDomainFormat {
-        throw new InvalidDomainFormat("The plugin that registered this flag is not currently installed");
+        throw new InvalidDomainFormat("The plugin that registered this domain is not currently installed");
     }
 
     @Override

worldguard-core/src/main/java/com/sk89q/worldguard/internal/permission/RegionPermissionModel.java

@@ -179,7 +179,7 @@ public boolean mayRemoveOwners(ProtectedRegion region) {
     }
 
     /**
-     * Checks to see if the given sender has permission to modify a custom region
+     * Checks to see if the given sender has permission to set or modify a custom domain
      *
      * @param region the region
      * @param isOwnerLevel whether the domain level is owner (else member)

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagContext.java

@@ -27,7 +27,7 @@
 import javax.annotation.Nullable;
 import java.util.Map;
 
-public final class FlagContext extends CommandInputContext {
+public final class FlagContext extends CommandInputContext<InvalidFlagFormat> {
 
     private FlagContext(Actor sender, String input, Map<String, Object> values) {
         super(sender, input, values);
@@ -40,9 +40,9 @@ public static FlagContext.FlagContextBuilder create() {
     /**
      * Create a copy of this FlagContext, with optional substitutions for values
      *
-     * If any supplied variable is null, it will be ignored.
+     * <p>If any supplied variable is null, it will be ignored.
      * If a map is supplied, it will override this FlagContext's values of the same key,
-     * but unprovided keys will not be overriden and will be returned as shallow copies.
+     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
      *
      * @param commandSender CommandSender for the new FlagContext to run under
      * @param s String of the user input for the new FlagContext
@@ -58,6 +58,11 @@ public FlagContext copyWith(@Nullable Actor commandSender, @Nullable String s, @
         return new FlagContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
     }
 
+    @Override
+    protected InvalidFlagFormat createException(String str) {
+        return new InvalidFlagFormat(str);
+    }
+
     public static class FlagContextBuilder {
         private Actor sender;
         private String input;