From dd43d890285ef0717c8c7a8cb401a2dabd33e159 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 8 Mar 2011 18:30:50 +0000
Subject: [PATCH] A few extra lines of code to support a fourth enum policy:
 name only.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6526 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/main/java/com/threerings/io/Streamer.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/threerings/io/Streamer.java b/src/main/java/com/threerings/io/Streamer.java
index 3df099d3b..299690f3e 100644
--- a/src/main/java/com/threerings/io/Streamer.java
+++ b/src/main/java/com/threerings/io/Streamer.java
@@ -266,18 +266,21 @@ public abstract class Streamer
 
         // create streamers for enum types
         if (target.isEnum()) {
-            // if not ORDINAL and we have a ByteEnum, stream using that
-            if (ENUM_POLICY != EnumPolicy.ORDINAL) {
+            switch (ENUM_POLICY) {
+            case NAME_WITH_BYTE_ENUM:
+            case ORDINAL_WITH_BYTE_ENUM:
                 if (ByteEnum.class.isAssignableFrom(target)) {
                     return new ByteEnumStreamer(target);
                 }
+                break;
             }
-            // otherwise, if by name and not a ByteEnum...
-            if (ENUM_POLICY == EnumPolicy.NAME_WITH_BYTE_ENUM) {
+
+            switch (ENUM_POLICY) {
+            case NAME_WITH_BYTE_ENUM:
+            case NAME:
                 return new NameEnumStreamer(target);
 
-            } else {
-                // if ORDINAL, or ORDINAL_WITH_BYTE_ENUM and not a ByteEnum, stream by ordinal
+            default:
                 List<?> universe = ImmutableList.copyOf(target.getEnumConstants());
                 int size = universe.size();
                 if (size <= (1 << (Byte.SIZE - 1))) {
@@ -937,7 +940,7 @@ public abstract class Streamer
      */
     protected enum EnumPolicy
     {
-        NAME_WITH_BYTE_ENUM, ORDINAL, ORDINAL_WITH_BYTE_ENUM;
+        NAME, NAME_WITH_BYTE_ENUM, ORDINAL, ORDINAL_WITH_BYTE_ENUM;
 
         /**
          * Create the static enum policy by checking the com.threerings.io.enumPolicy system prop.