AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's rename those enum policy constants based on how they work,

Browse Source 
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
This commit is contained in:
Ray Greenwell
2011-03-08 01:01:06 +00:00
parent b1d7577599
commit 55f031304c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/io/Streamer.java
+8 -7
View File
@@ -266,18 +266,18 @@ public abstract class Streamer
// create streamers for enum types // create streamers for enum types
if (target.isEnum()) { if (target.isEnum()) {
// if not NEW and we have a ByteEnum, stream using that // if not ORDINAL and we have a ByteEnum, stream using that
if (ENUM_POLICY != EnumPolicy.NEW) { if (ENUM_POLICY != EnumPolicy.ORDINAL) {
if (ByteEnum.class.isAssignableFrom(target)) { if (ByteEnum.class.isAssignableFrom(target)) {
return new ByteEnumStreamer(target); return new ByteEnumStreamer(target);
} }
} }
// otherwise, if OLD and not a ByteEnum, stream by name // 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); return new NameEnumStreamer(target);
} else { } 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()); List<?> universe = ImmutableList.copyOf(target.getEnumConstants());
int size = universe.size(); int size = universe.size();
if (size <= (1 << (Byte.SIZE - 1))) { if (size <= (1 << (Byte.SIZE - 1))) {
@@ -934,17 +934,18 @@ public abstract class Streamer
*/ */
protected enum EnumPolicy 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. * Create the static enum policy by checking the com.threerings.io.enumPolicy system prop.
*/ */
public static EnumPolicy create () public static EnumPolicy create ()
{ {
String policy = System.getProperty("com.threerings.io.enumPolicy");
try { try {
return valueOf(System.getProperty("com.threerings.io.enumPolicy", OLD.name())); return valueOf(policy);
} catch (Exception e) { } catch (Exception e) {
return OLD; return NAME_WITH_BYTE_ENUM;
} }
} }
} }