From 71a6a565720eafabb072c9332619c234c0edc0d8 Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Tue, 6 Aug 2013 20:09:42 -0500 Subject: [PATCH] Fix javac workaround in ItemStackTest --- .../craftbukkit/inventory/ItemStackTest.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java index 2997139406..6140edeec4 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemStackTest.java @@ -316,20 +316,17 @@ public class ItemStackTest extends AbstractTestingBase { static final Material[] COMPOUND_MATERIALS; static final int NAME_PARAMETER = 2; static { - COMPOUND_MATERIALS = new Object() { // Workaround for JDK5 - Material[] value() { - final ItemFactory factory = CraftItemFactory.instance(); - final Map, Material> possibleMaterials = new HashMap, Material>(); - for (final Material material : Material.values()) { - final ItemMeta meta = factory.getItemMeta(material); - if (meta == null || possibleMaterials.containsKey(meta.getClass())) - continue; - possibleMaterials.put(meta.getClass(), material); + final ItemFactory factory = CraftItemFactory.instance(); + final Map, Material> possibleMaterials = new HashMap, Material>(); + ItemMeta meta; + for (final Material material : Material.values()) { + meta = factory.getItemMeta(material); + if (meta == null || possibleMaterials.containsKey(meta.getClass())) + continue; + possibleMaterials.put(meta.getClass(), material); - } - return possibleMaterials.values().toArray(new Material[possibleMaterials.size()]); - } - }.value(); + } + COMPOUND_MATERIALS = possibleMaterials.values().toArray(new Material[possibleMaterials.size()]); } @Parameter(0) public StackProvider provider;