From cbf58103e6ee0aafc8e02b31c8a624a153c9ab6b Mon Sep 17 00:00:00 2001 From: sk89q Date: Fri, 4 Apr 2014 14:11:48 -0700 Subject: [PATCH] Replaced tabs with spaces in .java files. --- .../bukkit/util/CommandRegistration.java | 4 +- .../worldedit/forge/ForgeServerInterface.java | 2 +- .../util/commands/SimpleInjector.java | 46 +++++++++---------- .../worldedit/command/BrushCommands.java | 10 ++-- .../worldedit/command/SelectionCommands.java | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/bukkit/java/com/sk89q/bukkit/util/CommandRegistration.java b/src/bukkit/java/com/sk89q/bukkit/util/CommandRegistration.java index 116ae0f3e..b57041ff1 100644 --- a/src/bukkit/java/com/sk89q/bukkit/util/CommandRegistration.java +++ b/src/bukkit/java/com/sk89q/bukkit/util/CommandRegistration.java @@ -41,9 +41,9 @@ public class CommandRegistration { Bukkit.getServer().getHelpMap().registerHelpTopicFactory(DynamicPluginCommand.class, new DynamicPluginCommandHelpTopic.Factory()); } - protected final Plugin plugin; + protected final Plugin plugin; protected final CommandExecutor executor; - private CommandMap fallbackCommands; + private CommandMap fallbackCommands; public CommandRegistration(Plugin plugin) { this(plugin, plugin); diff --git a/src/forge/java/com/sk89q/worldedit/forge/ForgeServerInterface.java b/src/forge/java/com/sk89q/worldedit/forge/ForgeServerInterface.java index 705899049..78008bebe 100644 --- a/src/forge/java/com/sk89q/worldedit/forge/ForgeServerInterface.java +++ b/src/forge/java/com/sk89q/worldedit/forge/ForgeServerInterface.java @@ -30,7 +30,7 @@ public class ForgeServerInterface extends ServerInterface { } public int resolveItem(String name) { - if (name == null) return 0; + if (name == null) return 0; for (Item item : Item.itemsList) { if (item == null) continue; if (item.getUnlocalizedName() == null) continue; diff --git a/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java b/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java index 50e773a1e..122e0a664 100644 --- a/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java +++ b/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java @@ -24,38 +24,38 @@ import java.util.logging.Logger; public class SimpleInjector implements Injector { private static final Logger logger = Logger.getLogger(SimpleInjector.class.getCanonicalName()); - private Object[] args; - private Class[] argClasses; + private Object[] args; + private Class[] argClasses; - public SimpleInjector(Object... args) { - this.args = args; - argClasses = new Class[args.length]; - for (int i = 0; i < args.length; ++i) { - argClasses[i] = args[i].getClass(); - } - } + public SimpleInjector(Object... args) { + this.args = args; + argClasses = new Class[args.length]; + for (int i = 0; i < args.length; ++i) { + argClasses[i] = args[i].getClass(); + } + } - public Object getInstance(Class clazz) { - try { - Constructor ctr = clazz.getConstructor(argClasses); + public Object getInstance(Class clazz) { + try { + Constructor ctr = clazz.getConstructor(argClasses); ctr.setAccessible(true); - return ctr.newInstance(args); - } catch (NoSuchMethodException e) { + return ctr.newInstance(args); + } catch (NoSuchMethodException e) { logger.severe("Error initializing commands class " + clazz + ": "); e.printStackTrace(); - return null; - } catch (InvocationTargetException e) { + return null; + } catch (InvocationTargetException e) { logger.severe("Error initializing commands class " + clazz + ": "); e.printStackTrace(); - return null; - } catch (InstantiationException e) { + return null; + } catch (InstantiationException e) { logger.severe("Error initializing commands class " + clazz + ": "); e.printStackTrace(); - return null; - } catch (IllegalAccessException e) { + return null; + } catch (IllegalAccessException e) { logger.severe("Error initializing commands class " + clazz + ": "); e.printStackTrace(); - return null; - } - } + return null; + } + } } diff --git a/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/src/main/java/com/sk89q/worldedit/command/BrushCommands.java index a8dbd6ce5..4284325bc 100644 --- a/src/main/java/com/sk89q/worldedit/command/BrushCommands.java +++ b/src/main/java/com/sk89q/worldedit/command/BrushCommands.java @@ -53,11 +53,11 @@ import com.sk89q.worldedit.command.tool.brush.SphereBrush; * @author sk89q */ public class BrushCommands { - private final WorldEdit we; - - public BrushCommands(WorldEdit we) { - this.we = we; - } + private final WorldEdit we; + + public BrushCommands(WorldEdit we) { + this.we = we; + } @Command( aliases = { "sphere", "s" }, diff --git a/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java index 5b6ef04f7..66999da30 100644 --- a/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java +++ b/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java @@ -594,7 +594,7 @@ public class SelectionCommands { @CommandPermissions("worldedit.selection.size") public void size(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { - + if (args.hasFlag('c')) { CuboidClipboard clipboard = session.getClipboard(); Vector size = clipboard.getSize();