From 19cfd9edc6b736624d111b8367363dfc4c2dd174 Mon Sep 17 00:00:00 2001 From: Redecouverte Date: Mon, 28 Feb 2011 18:14:44 +0100 Subject: [PATCH] renamed new map to not confuse gson --- .../regions/flags/RegionFlagContainer.java | 14 +++++++------- .../protection/regions/flags/StateRegionFlag.java | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/com/sk89q/worldguard/protection/regions/flags/RegionFlagContainer.java b/src/com/sk89q/worldguard/protection/regions/flags/RegionFlagContainer.java index 39ab514f..1b02dfae 100644 --- a/src/com/sk89q/worldguard/protection/regions/flags/RegionFlagContainer.java +++ b/src/com/sk89q/worldguard/protection/regions/flags/RegionFlagContainer.java @@ -27,13 +27,13 @@ /** - * Holds the flags for a region. + * Holds the sFlags for a region. * * @author sk89q */ public class RegionFlagContainer { - private Map flags = new HashMap(); + private Map sFlags = new HashMap(); private transient Map flagData = new EnumMap(FlagType.class); private transient boolean hasInit = false; @@ -59,7 +59,7 @@ public RegionFlag getFlag(FlagType type) { private void initFlagData() { - Iterator> iter = this.flags.entrySet().iterator(); + Iterator> iter = this.sFlags.entrySet().iterator(); while (iter.hasNext()) { Entry entry = iter.next(); @@ -79,9 +79,9 @@ protected void internalSetValue(String name, String value) { } if (value == null) { - this.flags.remove(name); + this.sFlags.remove(name); } else { - this.flags.put(name, value); + this.sFlags.put(name, value); } } @@ -92,13 +92,13 @@ public boolean equals(Object obj) { } RegionFlagContainer other = (RegionFlagContainer) obj; - return other.flags.equals(this.flags); + return other.sFlags.equals(this.sFlags); } @Override public int hashCode() { int hash = 3; - hash = 97 * hash + (this.flags != null ? this.flags.hashCode() : 0); + hash = 97 * hash + (this.sFlags != null ? this.sFlags.hashCode() : 0); return hash; } diff --git a/src/com/sk89q/worldguard/protection/regions/flags/StateRegionFlag.java b/src/com/sk89q/worldguard/protection/regions/flags/StateRegionFlag.java index 5de07522..a812e902 100644 --- a/src/com/sk89q/worldguard/protection/regions/flags/StateRegionFlag.java +++ b/src/com/sk89q/worldguard/protection/regions/flags/StateRegionFlag.java @@ -28,7 +28,6 @@ public final class StateRegionFlag extends RegionFlag { public StateRegionFlag(RegionFlagContainer container, RegionFlagInfo info, String value) { super(container, info); - System.out.println("new state value : " + value); this.setValue(value); }