From 8c36047cbb4f265cfbbf29c507fcab921d948475 Mon Sep 17 00:00:00 2001 From: aumgn Date: Tue, 10 Apr 2012 13:12:24 +0200 Subject: [PATCH] Fix warnings --- src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java | 1 - src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java | 2 -- src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java | 1 - .../java/com/sk89q/worldedit/commands/ClipboardCommands.java | 3 --- .../java/com/sk89q/worldedit/commands/GenerationCommands.java | 1 + src/main/java/com/sk89q/worldedit/commands/ToolCommands.java | 1 + .../java/com/sk89q/worldedit/spout/SpoutConfiguration.java | 1 - src/main/java/com/sk89q/worldedit/spout/SpoutPlayer.java | 1 - src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java | 2 +- src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java | 3 ++- 10 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java b/src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java index f7e9ba692..0e5367c89 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java +++ b/src/main/java/com/sk89q/worldedit/blocks/DispenserBlock.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.HashMap; import java.util.List; import java.util.ArrayList; -import java.util.Map.Entry; /** * Represents dispensers. diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java index f421e8a6a..800ee10ec 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java @@ -26,13 +26,11 @@ import java.util.Map; import com.sk89q.worldedit.bukkit.entity.BukkitEntity; import com.sk89q.worldedit.bukkit.entity.BukkitExpOrb; import com.sk89q.worldedit.bukkit.entity.BukkitItem; -import com.sk89q.worldedit.bukkit.entity.BukkitPainting; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Item; -import org.bukkit.entity.Painting; import org.bukkit.entity.Player; import org.bukkit.Server; import org.bukkit.World; diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 5bdf2ed6c..34c160363 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.WeakHashMap; import com.sk89q.worldedit.LocalEntity; import com.sk89q.worldedit.WorldEdit; diff --git a/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java b/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java index f8213ee7f..82d8cef98 100644 --- a/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java @@ -19,8 +19,6 @@ package com.sk89q.worldedit.commands; -import java.io.File; -import java.io.IOException; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandPermissions; @@ -31,7 +29,6 @@ import com.sk89q.minecraft.util.commands.NestedCommand; import com.sk89q.worldedit.*; import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BlockID; -import com.sk89q.worldedit.data.DataException; import com.sk89q.worldedit.regions.Region; /** diff --git a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java index 115707eeb..f4f3b7bab 100644 --- a/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java @@ -237,6 +237,7 @@ public class GenerationCommands { ) @CommandPermissions("worldedit.generation.forest") @Logging(POSITION) + @SuppressWarnings("deprecation") public void forestGen(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { diff --git a/src/main/java/com/sk89q/worldedit/commands/ToolCommands.java b/src/main/java/com/sk89q/worldedit/commands/ToolCommands.java index 5f53b153a..c3e3662d8 100644 --- a/src/main/java/com/sk89q/worldedit/commands/ToolCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/ToolCommands.java @@ -75,6 +75,7 @@ public class ToolCommands { max = 1 ) @CommandPermissions("worldedit.tool.tree") + @SuppressWarnings("deprecation") public void tree(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { diff --git a/src/main/java/com/sk89q/worldedit/spout/SpoutConfiguration.java b/src/main/java/com/sk89q/worldedit/spout/SpoutConfiguration.java index 20acbbeb5..3793b7774 100644 --- a/src/main/java/com/sk89q/worldedit/spout/SpoutConfiguration.java +++ b/src/main/java/com/sk89q/worldedit/spout/SpoutConfiguration.java @@ -22,7 +22,6 @@ import com.sk89q.util.yaml.YAMLProcessor; import com.sk89q.worldedit.util.YAMLConfiguration; import java.io.File; -import java.util.logging.Logger; /** * @author zml2008 diff --git a/src/main/java/com/sk89q/worldedit/spout/SpoutPlayer.java b/src/main/java/com/sk89q/worldedit/spout/SpoutPlayer.java index 81a7c8337..862cf5d10 100644 --- a/src/main/java/com/sk89q/worldedit/spout/SpoutPlayer.java +++ b/src/main/java/com/sk89q/worldedit/spout/SpoutPlayer.java @@ -34,7 +34,6 @@ import org.spout.api.entity.Entity; import org.spout.api.geo.discrete.Point; import org.spout.api.inventory.ItemStack; import org.spout.api.material.MaterialRegistry; -import org.spout.api.material.source.MaterialData; import org.spout.api.player.Player; public class SpoutPlayer extends LocalPlayer { diff --git a/src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java b/src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java index 2b7429a9f..8cf59b032 100644 --- a/src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java +++ b/src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java @@ -756,7 +756,7 @@ public class SpoutWorld extends LocalWorld { } @Override - public int killEntities(LocalEntity[] entities) { + public int killEntities(LocalEntity... entities) { int amount = 0; for (LocalEntity weEnt : entities) { SpoutEntity entity = (SpoutEntity) weEnt; diff --git a/src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java b/src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java index 0d002b5d7..6bc5daf7b 100644 --- a/src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java +++ b/src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java @@ -40,7 +40,6 @@ import org.spout.api.util.Named; import java.io.*; import java.util.jar.JarFile; -import java.util.logging.Logger; import java.util.zip.ZipEntry; /** @@ -50,6 +49,8 @@ import java.util.zip.ZipEntry; */ public class WorldEditPlugin extends CommonPlugin implements Named { + private static final long serialVersionUID = 4506722000667924884L; + /** * The server interface that all server-related API goes through. */