From bb3fdcc8800b15e819eb52e1fe054ef48af10eeb Mon Sep 17 00:00:00 2001 From: Joo200 Date: Sun, 22 Jan 2023 12:06:05 +0100 Subject: [PATCH] Renamed InvalidFlagFormat to InvalidFlagFormatException --- .../commands/CommandInputContext.java | 1 - .../commands/region/RegionCommands.java | 6 ++-- .../commands/region/RegionCommandsBase.java | 10 ++----- .../protection/flags/BooleanFlag.java | 4 +-- .../protection/flags/CommandStringFlag.java | 2 +- .../protection/flags/DoubleFlag.java | 2 +- .../protection/flags/EntityTypeFlag.java | 4 +-- .../worldguard/protection/flags/EnumFlag.java | 4 +-- .../worldguard/protection/flags/Flag.java | 4 +-- .../protection/flags/FlagContext.java | 6 ++-- .../protection/flags/GameModeTypeFlag.java | 4 +-- .../protection/flags/IntegerFlag.java | 2 +- .../protection/flags/InvalidFlagFormat.java | 4 +++ .../flags/InvalidFlagFormatException.java | 28 +++++++++++++++++++ .../protection/flags/LocationFlag.java | 6 ++-- .../worldguard/protection/flags/MapFlag.java | 4 +-- .../protection/flags/RegistryFlag.java | 4 +-- .../worldguard/protection/flags/SetFlag.java | 2 +- .../protection/flags/StateFlag.java | 4 +-- .../protection/flags/StringFlag.java | 2 +- .../protection/flags/TimestampFlag.java | 6 ++-- .../worldguard/protection/flags/UUIDFlag.java | 4 +-- .../protection/flags/VectorFlag.java | 4 +-- .../protection/flags/WeatherTypeFlag.java | 4 +-- .../flags/registry/UnknownFlag.java | 6 ++-- .../util/WorldGuardExceptionConverter.java | 4 +-- 26 files changed, 79 insertions(+), 52 deletions(-) create mode 100644 worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormatException.java 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 index 7c6de508..82fd27d7 100644 --- 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 @@ package com.sk89q.worldguard.commands; 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 index 10418495..da85a001 100644 --- 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.FlagValueCalculator; 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 final class RegionCommands extends RegionCommandsBase { // 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 final class RegionCommands extends RegionCommandsBase { // 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 index 16304896..40c386af 100644 --- 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.util.formatting.text.format.TextColor; 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 @@ class RegionCommandsBase { * @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 setFlag(ProtectedRegion region, Flag flag, Actor sender, String value) throws InvalidFlagFormat { + protected static V setFlag(ProtectedRegion region, Flag 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 index 3d5145c9..dcb26e76 100644 --- 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 class BooleanFlag extends Flag { } @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 class BooleanFlag extends Flag { || 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 index dd3afc60..d5f0cf27 100644 --- 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 class CommandStringFlag extends Flag { } @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 index 81b04697..2f7389ca 100644 --- 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 class DoubleFlag extends NumberFlag { } @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 index 67be8c8c..dfd671c3 100644 --- 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 @@ public class EntityTypeFlag extends Flag { } @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 index 7c7a4c54..d553fd6b 100644 --- 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 class EnumFlag> extends Flag { } @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 index 1cd145b9..bd044335 100644 --- 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 abstract class Flag { * * @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 index 3283de3a..43f5fd81 100644 --- 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 com.sk89q.worldguard.commands.CommandInputContext; import javax.annotation.Nullable; import java.util.Map; -public final class FlagContext extends CommandInputContext { +public final class FlagContext extends CommandInputContext { private FlagContext(Actor sender, String input, Map values) { super(sender, input, values); @@ -59,8 +59,8 @@ public final class FlagContext extends CommandInputContext { } @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 index 3b8db1e0..a0ce3a07 100644 --- 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 @@ public class GameModeTypeFlag extends Flag { } @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 index a9bafe36..78c4cabc 100644 --- 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 class IntegerFlag extends NumberFlag { } @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 index d5d2d46a..87d1d6ee 100644 --- 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 new file mode 100644 index 00000000..807b7452 --- /dev/null +++ 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 + * 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 . + */ + +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 index 4f6b6c39..03a3358a 100644 --- 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 class LocationFlag extends Flag { } @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 class LocationFlag extends Flag { 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 class LocationFlag extends Flag { } 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 index 4472b95e..5147d8a0 100644 --- 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 class MapFlag extends Flag> { } @Override - public Map parseInput(final FlagContext context) throws InvalidFlagFormat { + public Map parseInput(final FlagContext context) throws InvalidFlagFormatException { final String input = context.getUserInput(); if (input.isEmpty()) { @@ -83,7 +83,7 @@ public class MapFlag extends Flag> { 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 index cb7bf057..81af639f 100644 --- 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 class RegistryFlag extends Flag { } @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 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 index e850e395..31438b69 100644 --- 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 class SetFlag extends Flag> { } @Override - public Set parseInput(FlagContext context) throws InvalidFlagFormat { + public Set 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 index 8e21589d..72180664 100644 --- 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 class StateFlag extends Flag { } @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 class StateFlag extends Flag { } 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 index 080e2571..2a48380d 100644 --- 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 class StringFlag extends Flag { } @Override - public String parseInput(FlagContext context) throws InvalidFlagFormat { + public String parseInput(FlagContext context) throws InvalidFlagFormatException { String lines = context.getUserInput().replaceAll("(? { } @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 class TimestampFlag extends Flag { } 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 index 40d20a99..7667bb61 100644 --- 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,7 +33,7 @@ public class UUIDFlag extends Flag { } @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(); @@ -41,7 +41,7 @@ public class UUIDFlag extends Flag { 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 index 80683f09..5a43646e 100644 --- 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 class VectorFlag extends Flag { } @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 class VectorFlag extends Flag { } } - 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 index c103baf1..0d9d8b90 100644 --- 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 @@ public class WeatherTypeFlag extends Flag { } @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 index 29996043..8a21a8c6 100644 --- 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 @@ -21,7 +21,7 @@ package com.sk89q.worldguard.protection.flags.registry; 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 javax.annotation.Nullable; @@ -32,8 +32,8 @@ public class UnknownFlag extends Flag { } @Override - public Object parseInput(FlagContext context) throws InvalidFlagFormat { - throw new InvalidFlagFormat("The plugin that registered this flag is not currently installed"); + public Object parseInput(FlagContext context) throws InvalidFlagFormatException { + throw new InvalidFlagFormatException("The plugin that registered this flag is not currently installed"); } @Override 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 index f508951c..7978877e 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java @@ -26,7 +26,7 @@ import com.sk89q.worldedit.internal.command.exception.ExceptionMatch; import com.sk89q.worldedit.util.auth.AuthorizationException; import com.sk89q.worldedit.util.formatting.component.InvalidComponentException; import com.sk89q.worldguard.WorldGuard; -import com.sk89q.worldguard.domains.registry.InvalidDomainFormat; +import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException; import com.sk89q.worldguard.protection.managers.storage.StorageException; import com.sk89q.worldguard.protection.util.UnresolvedNamesException; @@ -93,7 +93,7 @@ public class WorldGuardExceptionConverter extends ExceptionConverterHelper { } @ExceptionMatch - public void convert(InvalidDomainFormat e) throws CommandException { + public void convert(InvalidDomainFormatException e) throws CommandException { throw newCommandException(e.getMessage(), e); }