Renamed InvalidFlagFormat to InvalidFlagFormatException

Joo200 · Joo200 · commit bb3fdcc8800b · 2023-06-04T18:55:01.000+02:00
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/CommandInputContext.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/CommandInputContext.java
@@ -21,7 +21,6 @@
 
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 
 import javax.annotation.Nullable;
 import java.util.Map;
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java
@@ -59,7 +59,7 @@
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
 import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
 import com.sk89q.worldguard.protection.flags.RegionGroup;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -587,7 +587,7 @@ public void flag(CommandContext args, Actor sender) throws CommandException {
             // the [value] part throws an error.
             try {
                 groupValue = groupFlag.parseInput(FlagContext.create().setSender(sender).setInput(group).setObject("region", existing).build());
-            } catch (InvalidFlagFormat e) {
+            } catch (InvalidFlagFormatException e) {
                 throw new CommandException(e.getMessage());
             }
 
@@ -598,7 +598,7 @@ public void flag(CommandContext args, Actor sender) throws CommandException {
             // Set the flag if [value] was given even if [-g group] was given as well
             try {
                 value = setFlag(existing, foundFlag, sender, value).toString();
-            } catch (InvalidFlagFormat e) {
+            } catch (InvalidFlagFormatException e) {
                 throw new CommandException(e.getMessage());
             }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java
@@ -41,15 +41,11 @@
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.CustomDomain;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.domains.registry.CustomDomainContext;
-import com.sk89q.worldguard.domains.registry.InvalidDomainFormat;
 import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
@@ -419,9 +415,9 @@ protected static void setPlayerSelection(Actor actor, ProtectedRegion region, Wo
      * @param flag the flag
      * @param sender the sender
      * @param value the value
-     * @throws InvalidFlagFormat thrown if the value is invalid
+     * @throws InvalidFlagFormatException thrown if the value is invalid
      */
-    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormat {
+    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormatException {
         V val = flag.parseInput(FlagContext.create().setSender(sender).setInput(value).setObject("region", region).build());
         region.setFlag(flag, val);
         return val;
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java
@@ -33,7 +33,7 @@ public BooleanFlag(String name) {
     }
 
     @Override
-    public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Boolean parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         
         if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes")
@@ -45,7 +45,7 @@ public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {
                 || input.equalsIgnoreCase("0")) {
             return false;
         } else {
-            throw new InvalidFlagFormat("Not a yes/no value: " + input);
+            throw new InvalidFlagFormatException("Not a yes/no value: " + input);
         }
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java
@@ -33,7 +33,7 @@ public CommandStringFlag(String name) {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormat {
+    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         if (!input.startsWith("/")) {
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java
@@ -33,7 +33,7 @@ public DoubleFlag(String name) {
     }
 
     @Override
-    public Double parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Double parseInput(FlagContext context) throws InvalidFlagFormatException {
         return context.getUserInputAsDouble();
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java
@@ -40,12 +40,12 @@ protected EntityTypeFlag(String name) {
     }
 
     @Override
-    public EntityType parseInput(FlagContext context) throws InvalidFlagFormat {
+    public EntityType parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         EntityType entityType = unmarshal(input);
         if (entityType == null) {
-            throw new InvalidFlagFormat("Unknown entity type: " + input);
+            throw new InvalidFlagFormatException("Unknown entity type: " + input);
         }
         return entityType;
     }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java
@@ -74,12 +74,12 @@ public T detectValue(String input) {
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormat {
+    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         try {
             return findValue(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormat("Unknown value '" + input + "' in "
+            throw new InvalidFlagFormatException("Unknown value '" + input + "' in "
                     + enumClass.getName());
         }
     }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java
@@ -181,9 +181,9 @@ public final RegionGroupFlag getRegionGroupFlag() {
      *
      * @param context the {@link FlagContext}
      * @return The coerced type
-     * @throws InvalidFlagFormat Raised if the input is invalid
+     * @throws InvalidFlagFormatException Raised if the input is invalid
      */
-    public abstract T parseInput(FlagContext context) throws InvalidFlagFormat;
+    public abstract T parseInput(FlagContext context) throws InvalidFlagFormatException;
 
     /**
      * Convert a raw type that was loaded (from a YAML file, for example)
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagContext.java b/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<InvalidFlagFormat> {
+public final class FlagContext extends CommandInputContext<InvalidFlagFormatException> {
 
     private FlagContext(Actor sender, String input, Map<String, Object> values) {
         super(sender, input, values);
@@ -59,8 +59,8 @@ public FlagContext copyWith(@Nullable Actor commandSender, @Nullable String s, @
     }
 
     @Override
-    protected InvalidFlagFormat createException(String str) {
-        return new InvalidFlagFormat(str);
+    protected InvalidFlagFormatException createException(String str) {
+        return new InvalidFlagFormatException(str);
     }
 
     public static class FlagContextBuilder {
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/GameModeTypeFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/GameModeTypeFlag.java
@@ -40,12 +40,12 @@ protected GameModeTypeFlag(String name) {
     }
 
     @Override
-    public GameMode parseInput(FlagContext context) throws InvalidFlagFormat {
+    public GameMode parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         GameMode gamemode = unmarshal(input);
         if (gamemode == null) {
-            throw new InvalidFlagFormat("Unknown game mode: " + input);
+            throw new InvalidFlagFormatException("Unknown game mode: " + input);
         }
         return gamemode;
     }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java
@@ -33,7 +33,7 @@ public IntegerFlag(String name) {
     }
 
     @Override
-    public Integer parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Integer parseInput(FlagContext context) throws InvalidFlagFormatException {
         return context.getUserInputAsInt();
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java
@@ -19,6 +19,10 @@
 
 package com.sk89q.worldguard.protection.flags;
 
+/**
+ * @deprecated replaced by {@link InvalidFlagFormatException}. Will be removed in WorldGuard 8
+ */
+@Deprecated(forRemoval = true)
 public class InvalidFlagFormat extends Exception {
     
     private static final long serialVersionUID = 8101615074524004172L;
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormatException.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormatException.java
@@ -0,0 +1,28 @@
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.protection.flags;
+
+public class InvalidFlagFormatException extends InvalidFlagFormat {
+    private static final long serialVersionUID = 8101615074524004172L;
+
+    public InvalidFlagFormatException(String msg) {
+        super(msg);
+    }
+}
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java
@@ -41,7 +41,7 @@ public LocationFlag(String name) {
     }
 
     @Override
-    public Location parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Location parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         Player player = context.getPlayerSender();
 
@@ -76,7 +76,7 @@ public Location parseInput(FlagContext context) throws InvalidFlagFormat {
                             player.printDebug("WARNING: Flag location is outside of region.");
                         } else {
                             // no permission
-                            throw new InvalidFlagFormat("You can't set that flag outside of the region boundaries.");
+                            throw new InvalidFlagFormatException("You can't set that flag outside of the region boundaries.");
                         }
                     }
                     // clamp height to world limits
@@ -86,7 +86,7 @@ public Location parseInput(FlagContext context) throws InvalidFlagFormat {
             }
             return loc;
         }
-        throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
+        throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
     }
 
     @Override
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/MapFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/MapFlag.java
@@ -70,7 +70,7 @@ public Flag<V> getValueFlag() {
     }
 
     @Override
-    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormat {
+    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormatException {
 
         final String input = context.getUserInput();
         if (input.isEmpty()) {
@@ -83,7 +83,7 @@ public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormat
             final char split = str.indexOf('=') == -1 ? ':' : '=';
             final String[] keyVal = str.split(String.valueOf(split));
             if (keyVal.length != 2) {
-                throw new InvalidFlagFormat("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
+                throw new InvalidFlagFormatException("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
             }
 
             final FlagContext key = context.copyWith(null, keyVal[0], null);
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/RegistryFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/RegistryFlag.java
@@ -44,10 +44,10 @@ public RegistryFlag(String name, @Nullable RegionGroup defaultGroup, Registry<T>
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormat {
+    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
         final String key = context.getUserInput().trim().toLowerCase(Locale.ROOT);
         return Optional.ofNullable(registry.get(key))
-                .orElseThrow(() -> new InvalidFlagFormat("Unknown " + registry.getName() + ": " + key));
+                .orElseThrow(() -> new InvalidFlagFormatException("Unknown " + registry.getName() + ": " + key));
     }
 
     public Registry<T> getRegistry() {
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java
@@ -58,7 +58,7 @@ public Flag<T> getType() {
     }
 
     @Override
-    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if (input.isEmpty()) {
             return Sets.newHashSet();
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java
@@ -78,7 +78,7 @@ public boolean preventsAllowOnGlobal() {
     }
 
     @Override
-    public State parseInput(FlagContext context) throws InvalidFlagFormat {
+    public State parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
 
         if (input.equalsIgnoreCase("allow")) {
@@ -88,7 +88,7 @@ public State parseInput(FlagContext context) throws InvalidFlagFormat {
         } else if (input.equalsIgnoreCase("none")) {
             return null;
         } else {
-            throw new InvalidFlagFormat("Expected none/allow/deny but got '" + input + "'");
+            throw new InvalidFlagFormatException("Expected none/allow/deny but got '" + input + "'");
         }
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java
@@ -57,7 +57,7 @@ public String getDefault() {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormat {
+    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
         String lines = context.getUserInput().replaceAll("(?<!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\\\n");
         // Add color codes
         lines = CommandUtils.replaceColorMacros(lines);
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/TimestampFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/TimestampFlag.java
@@ -48,7 +48,7 @@ public TimestampFlag(String name) {
     }
 
     @Override
-    public Instant parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Instant parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if ("now".equalsIgnoreCase(input)) {
             return Instant.now();
@@ -61,10 +61,10 @@ public Instant parseInput(FlagContext context) throws InvalidFlagFormat {
                 } else if (parsed instanceof ZonedDateTime) {
                     return ((ZonedDateTime) parsed).toInstant();
                 } else {
-                    throw new InvalidFlagFormat("Unrecognized input.");
+                    throw new InvalidFlagFormatException("Unrecognized input.");
                 }
             } catch (DateTimeParseException ignored) {
-                throw new InvalidFlagFormat("Expected 'now' or ISO 8601 formatted input.");
+                throw new InvalidFlagFormatException("Expected 'now' or ISO 8601 formatted input.");
             }
         }
     }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/UUIDFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/UUIDFlag.java
@@ -33,15 +33,15 @@ public UUIDFlag(String name) {
     }
 
     @Override
-    public UUID parseInput(FlagContext context) throws InvalidFlagFormat {
+    public UUID parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if ("self".equalsIgnoreCase(input)) {
             return context.getSender().getUniqueId();
         }
         try {
             return UUID.fromString(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormat("Not a valid uuid: " + input);
+            throw new InvalidFlagFormatException("Not a valid uuid: " + input);
         }
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java
@@ -38,7 +38,7 @@ public VectorFlag(String name) {
     }
 
     @Override
-    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
 
         if ("here".equalsIgnoreCase(input)) {
@@ -56,7 +56,7 @@ public Vector3 parseInput(FlagContext context) throws InvalidFlagFormat {
                 }
             }
 
-            throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
+            throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
         }
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/WeatherTypeFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/WeatherTypeFlag.java
@@ -40,12 +40,12 @@ protected WeatherTypeFlag(String name) {
     }
 
     @Override
-    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormat {
+    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         WeatherType weatherType = unmarshal(input);
         if (weatherType == null) {
-            throw new InvalidFlagFormat("Unknown weather type: " + input);
+            throw new InvalidFlagFormatException("Unknown weather type: " + input);
         }
         return weatherType;
     }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/UnknownFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/UnknownFlag.java
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java b/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public BooleanFlag(String name) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {`
	`36`	`+ public Boolean parseInput(FlagContext context) throws InvalidFlagFormatException {`
`37`	`37`	`String input = context.getUserInput();`
`38`	`38`
`39`	`39`	`if (input.equalsIgnoreCase("true") \|\| input.equalsIgnoreCase("yes")`
`@@ -45,7 +45,7 @@ public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {`
`45`	`45`	`\|\| input.equalsIgnoreCase("0")) {`
`46`	`46`	`return false;`
`47`	`47`	`} else {`
`48`		`- throw new InvalidFlagFormat("Not a yes/no value: " + input);`
	`48`	`+ throw new InvalidFlagFormatException("Not a yes/no value: " + input);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public CommandStringFlag(String name) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public String parseInput(FlagContext context) throws InvalidFlagFormat {`
	`36`	`+ public String parseInput(FlagContext context) throws InvalidFlagFormatException {`
`37`	`37`	`String input = context.getUserInput();`
`38`	`38`	`input = input.trim();`
`39`	`39`	`if (!input.startsWith("/")) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public DoubleFlag(String name) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public Double parseInput(FlagContext context) throws InvalidFlagFormat {`
	`36`	`+ public Double parseInput(FlagContext context) throws InvalidFlagFormatException {`
`37`	`37`	`return context.getUserInputAsDouble();`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ protected EntityTypeFlag(String name) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- public EntityType parseInput(FlagContext context) throws InvalidFlagFormat {`
	`43`	`+ public EntityType parseInput(FlagContext context) throws InvalidFlagFormatException {`
`44`	`44`	`String input = context.getUserInput();`
`45`	`45`	`input = input.trim();`
`46`	`46`	`EntityType entityType = unmarshal(input);`
`47`	`47`	`if (entityType == null) {`
`48`		`- throw new InvalidFlagFormat("Unknown entity type: " + input);`
	`48`	`+ throw new InvalidFlagFormatException("Unknown entity type: " + input);`
`49`	`49`	`}`
`50`	`50`	`return entityType;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,12 @@ public T detectValue(String input) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- public T parseInput(FlagContext context) throws InvalidFlagFormat {`
	`77`	`+ public T parseInput(FlagContext context) throws InvalidFlagFormatException {`
`78`	`78`	`String input = context.getUserInput();`
`79`	`79`	`try {`
`80`	`80`	`return findValue(input);`
`81`	`81`	`} catch (IllegalArgumentException e) {`
`82`		`- throw new InvalidFlagFormat("Unknown value '" + input + "' in "`
	`82`	`+ throw new InvalidFlagFormatException("Unknown value '" + input + "' in "`
`83`	`83`	`+ enumClass.getName());`
`84`	`84`	`}`
`85`	`85`	`}`