From 55f031304cd38383f8605d380566941333055994 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Tue, 8 Mar 2011 01:01:06 +0000 Subject: [PATCH] Let's rename those enum policy constants based on how they work, not whether they're old or new. OLD -> NAME_WITH_BYTE_ENUM NEW -> ORDINAL NEW_WITH_BYTE_ENUM -> ORDINAL_WITH_BYTE_ENUM git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6523 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/main/java/com/threerings/io/Streamer.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/threerings/io/Streamer.java b/src/main/java/com/threerings/io/Streamer.java index 7a23b6dba..ce7b410c1 100644 --- a/src/main/java/com/threerings/io/Streamer.java +++ b/src/main/java/com/threerings/io/Streamer.java @@ -266,18 +266,18 @@ public abstract class Streamer // create streamers for enum types if (target.isEnum()) { - // if not NEW and we have a ByteEnum, stream using that - if (ENUM_POLICY != EnumPolicy.NEW) { + // if not ORDINAL and we have a ByteEnum, stream using that + if (ENUM_POLICY != EnumPolicy.ORDINAL) { if (ByteEnum.class.isAssignableFrom(target)) { return new ByteEnumStreamer(target); } } // otherwise, if OLD and not a ByteEnum, stream by name - if (ENUM_POLICY == EnumPolicy.OLD) { + if (ENUM_POLICY == EnumPolicy.NAME_WITH_BYTE_ENUM) { return new NameEnumStreamer(target); } else { - // if NEW, or NEW_WITH_BYTE_ENUM and not a ByteEnum, stream by ordinal (optimized!) + // if ORDINAL, or ORDINAL_WITH_BYTE_ENUM and not a ByteEnum, stream by ordinal List universe = ImmutableList.copyOf(target.getEnumConstants()); int size = universe.size(); if (size <= (1 << (Byte.SIZE - 1))) { @@ -934,17 +934,18 @@ public abstract class Streamer */ protected enum EnumPolicy { - OLD, NEW, NEW_WITH_BYTE_ENUM; + NAME_WITH_BYTE_ENUM, ORDINAL, ORDINAL_WITH_BYTE_ENUM; /** * Create the static enum policy by checking the com.threerings.io.enumPolicy system prop. */ public static EnumPolicy create () { + String policy = System.getProperty("com.threerings.io.enumPolicy"); try { - return valueOf(System.getProperty("com.threerings.io.enumPolicy", OLD.name())); + return valueOf(policy); } catch (Exception e) { - return OLD; + return NAME_WITH_BYTE_ENUM; } } }