From 9e708b70a9b5e8e7a9135ee1d609645879c40f13 Mon Sep 17 00:00:00 2001
From: TomyLobo <tomylobo@nurfuerspam.de>
Date: Sun, 20 Oct 2013 16:21:10 +0200
Subject: [PATCH] Fixed some warnings.

---
 .../com/sk89q/worldedit/ArbitraryShape.java   | 69 +++++++++----------
 .../commands/GenerationCommands.java          |  2 +-
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/sk89q/worldedit/ArbitraryShape.java b/src/main/java/com/sk89q/worldedit/ArbitraryShape.java
index 58b79f003..601b34b3e 100644
--- a/src/main/java/com/sk89q/worldedit/ArbitraryShape.java
+++ b/src/main/java/com/sk89q/worldedit/ArbitraryShape.java
@@ -34,6 +34,7 @@ public abstract class ArbitraryShape {
     private int cacheOffsetX;
     private int cacheOffsetY;
     private int cacheOffsetZ;
+    @SuppressWarnings("FieldCanBeLocal")
     private int cacheSizeX;
     private int cacheSizeY;
     private int cacheSizeZ;
@@ -72,9 +73,9 @@ public abstract class ArbitraryShape {
     /**
      * Override this function to specify the shape to generate.
      *
-     * @param x
-     * @param y
-     * @param z
+     * @param x X coordinate to be queried
+     * @param y Y coordinate to be queried
+     * @param z Z coordinate to be queried
      * @param defaultMaterial The material returned by the pattern for the current block.
      * @return material to place or null to not place anything.
      */
@@ -136,7 +137,7 @@ public abstract class ArbitraryShape {
     /**
      * Generates the shape.
      *
-     * @param editSession
+     * @param editSession The EditSession to use.
      * @param pattern The pattern to generate default materials from.
      * @param hollow Specifies whether to generate a hollow shape.
      * @return number of affected blocks.
@@ -164,38 +165,36 @@ public abstract class ArbitraryShape {
                 continue;
             }
 
-            if (hollow) {
-                boolean draw = false;
-                do {
-                    if (!isInsideCached(x + 1, y, z, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                    if (!isInsideCached(x - 1, y, z, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                    if (!isInsideCached(x, y + 1, z, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                    if (!isInsideCached(x, y - 1, z, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                    if (!isInsideCached(x, y, z + 1, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                    if (!isInsideCached(x, y, z - 1, pattern)) {
-                        draw = true;
-                        break;
-                    }
-                } while (false);
-
-                if (!draw) {
-                    continue;
+            boolean draw = false;
+            do {
+                if (!isInsideCached(x + 1, y, z, pattern)) {
+                    draw = true;
+                    break;
                 }
+                if (!isInsideCached(x - 1, y, z, pattern)) {
+                    draw = true;
+                    break;
+                }
+                if (!isInsideCached(x, y + 1, z, pattern)) {
+                    draw = true;
+                    break;
+                }
+                if (!isInsideCached(x, y - 1, z, pattern)) {
+                    draw = true;
+                    break;
+                }
+                if (!isInsideCached(x, y, z + 1, pattern)) {
+                    draw = true;
+                    break;
+                }
+                if (!isInsideCached(x, y, z - 1, pattern)) {
+                    draw = true;
+                    break;
+                }
+            } while (false);
+
+            if (!draw) {
+                continue;
             }
 
             if (editSession.setBlock(position, material)) {
diff --git a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
index c26b23af2..6c9ec388c 100644
--- a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java
@@ -269,7 +269,7 @@ public class GenerationCommands {
         
         int size = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : 10;
         TreeGenerator.TreeType type = args.argsLength() > 1 ?
-                type = TreeGenerator.lookup(args.getString(1))
+                TreeGenerator.lookup(args.getString(1))
                 : TreeGenerator.TreeType.TREE;
         double density = args.argsLength() > 2 ? args.getDouble(2) / 100 : 0.05;