Restore the formatting of many things to upstream WorldEdit - no code changes

This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.

This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b) into this codebase.

Signed-off-by: Byron Marohn <combustible@live.com>

worldedit-core/src/main/java/com/sk89q/worldedit/util/Enums.java

@@ -19,10 +19,10 @@
 
 package com.sk89q.worldedit.util;
 
-import javax.annotation.Nullable;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import javax.annotation.Nullable;
+
 /**
  * Helper methods for enums.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/util/FileDialogUtil.java

@@ -21,13 +21,14 @@ package com.sk89q.worldedit.util;
 
 import com.sk89q.util.StringUtil;
 
-import javax.swing.*;
-import javax.swing.filechooser.FileFilter;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+
 public final class FileDialogUtil {
     private FileDialogUtil() {
     }

worldedit-core/src/main/java/com/sk89q/worldedit/util/GuavaUtil.java

@@ -19,10 +19,10 @@
 
 package com.sk89q.worldedit.util;
 
-import javax.annotation.Nullable;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import javax.annotation.Nullable;
+
 public final class GuavaUtil {
 
     private GuavaUtil() {}

worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java

@@ -23,8 +23,8 @@ import com.google.common.collect.Sets;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Collections;

worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/DoubleArrayList.java

@@ -19,11 +19,11 @@
 
 package com.sk89q.worldedit.util.collection;
 
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 /**

worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/FastListIterator.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.util.collection;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * A fast iterator for lists that uses an internal index integer
  * and caches the size of the list. The size of the list cannot change

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/Dispatcher.java

@@ -19,10 +19,11 @@
 
 package com.sk89q.worldedit.util.command;
 
-import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /**
  * Executes a command based on user input.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/InvalidUsageException.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.util.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Thrown when a command is not used properly.
  *

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/PrimaryAliasComparator.java

@@ -19,10 +19,11 @@
 
 package com.sk89q.worldedit.util.command;
 
-import javax.annotation.Nullable;
 import java.util.Comparator;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
 /**
  * Compares the primary aliases of two {@link CommandMapping} using
  * {@link String#compareTo(String)}.

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/binding/PrimitiveBindings.java

@@ -28,9 +28,10 @@ import com.sk89q.worldedit.util.command.parametric.BindingHelper;
 import com.sk89q.worldedit.util.command.parametric.BindingMatch;
 import com.sk89q.worldedit.util.command.parametric.ParameterException;
 
-import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
 
+import javax.annotation.Nullable;
+
 /**
  * Handles basic Java types such as {@link String}s, {@link Byte}s, etc.
  * 
@@ -86,8 +87,8 @@ public final class PrimitiveBindings extends BindingHelper {
      * @throws ParameterException on error
      */
     @BindingMatch(type = { Boolean.class, boolean.class },
-            behavior = BindingBehavior.CONSUMES,
-            consumedCount = 1)
+                  behavior = BindingBehavior.CONSUMES,
+                  consumedCount = 1)
     public Boolean getBoolean(ArgumentStack context) throws ParameterException {
         return context.nextBoolean();
     }
@@ -117,6 +118,7 @@ public final class PrimitiveBindings extends BindingHelper {
                 throw new ParameterException(String.format(
                         "Expected '%s' to be a number or valid math expression (error: %s)", input, e.getMessage()));
             }
+
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/composition/FlagParser.java

@@ -25,15 +25,16 @@ import com.google.common.collect.Maps;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.FlagParser.FlagData;
 import com.sk89q.worldedit.util.command.argument.MissingArgumentException;
+import com.sk89q.worldedit.util.command.composition.FlagParser.FlagData;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.annotation.Nullable;
+
 public class FlagParser implements CommandExecutor<FlagData> {
 
     private final Map<Character, CommandExecutor<?>> flags = Maps.newHashMap();

worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/EventHandler.java

@@ -19,10 +19,10 @@
 
 package com.sk89q.worldedit.util.eventbus;
 
-import java.lang.reflect.InvocationTargetException;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.lang.reflect.InvocationTargetException;
+
 /**
  * Event handler object for {@link EventBus} that is able to dispatch
  * an event.

worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/HierarchyCache.java

@@ -23,7 +23,11 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.sk89q.worldedit.internal.annotation.RequiresNewerGuava;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 /**
  * Holds a cache of class hierarchy.

worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/MethodEventHandler.java

@@ -19,10 +19,10 @@
 
 package com.sk89q.worldedit.util.eventbus;
 
-import java.lang.reflect.Method;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.lang.reflect.Method;
+
 /**
  * Invokes a {@link Method} to dispatch an event.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/Subscribe.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.util.eventbus;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
 /**
  * Used to mark methods as event handlers.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/Fragment.java

@@ -25,7 +25,7 @@ package com.sk89q.worldedit.util.formatting;
 public class Fragment {
 
     private final StringBuilder builder = new StringBuilder();
-
+    
     public Fragment() {
     }
 
@@ -88,6 +88,5 @@ public class Fragment {
     public String toString() {
         return builder.toString();
     }
-
-
+    
 }

worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/Style.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.util.formatting;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.collect.Maps;
 
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * All supported color values for chat.
  * 

worldedit-core/src/main/java/com/sk89q/worldedit/util/function/LevenshteinDistance.java

@@ -19,12 +19,13 @@
 
 package com.sk89q.worldedit.util.function;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.base.Function;
 
-import javax.annotation.Nullable;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * Provides a Levenshtein distance between a given string and each string

worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.util.io;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
 
@@ -31,8 +33,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.ZipFile;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public final class Closer implements Closeable {
 
     private static final Logger logger = Logger.getLogger(Closer.class.getCanonicalName());

worldedit-core/src/main/java/com/sk89q/worldedit/util/logging/LogFormat.java

@@ -19,11 +19,11 @@
 
 package com.sk89q.worldedit.util.logging;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Date;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 
 /**
  * A standard logging format for WorldEdit.