From 2cec661ff0ae9cc88a1908e71247de86d22f4145 Mon Sep 17 00:00:00 2001
From: Joel Leitch <joel.leitch@gmail.com>
Date: Tue, 20 Jan 2009 01:00:59 +0000
Subject: [PATCH] Removing some unnecessary code.

---
 .../com/google/gson/DefaultTypeAdapters.java  | 22 ++-----------------
 .../google/gson/MappedObjectConstructor.java  |  6 -----
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java b/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java
index 30d6ae03..51e6aaea 100644
--- a/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java
+++ b/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java
@@ -16,8 +16,6 @@
 
 package com.google.gson;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -165,7 +163,6 @@ final class DefaultTypeAdapters {
   private static ParameterizedTypeHandlerMap<InstanceCreator<?>> createDefaultInstanceCreators() {
     ParameterizedTypeHandlerMap<InstanceCreator<?>> map =
         new ParameterizedTypeHandlerMap<InstanceCreator<?>>();
-    map.register(Enum.class, ENUM_TYPE_ADAPTER);
     map.register(Map.class, MAP_TYPE_ADAPTER);
 
     // Add Collection type instance creators
@@ -271,8 +268,8 @@ final class DefaultTypeAdapters {
   }
 
   @SuppressWarnings("unchecked")
-  private static class EnumTypeAdapter<T extends Enum<T>> implements JsonSerializer<T>,
-      JsonDeserializer<T>, InstanceCreator<Enum<?>> {
+  private static class EnumTypeAdapter<T extends Enum<T>>
+      implements JsonSerializer<T>, JsonDeserializer<T> {
     public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) {
       return new JsonPrimitive(src.name());
     }
@@ -283,21 +280,6 @@ final class DefaultTypeAdapters {
       return (T) Enum.valueOf((Class<T>) classOfT, json.getAsString());
     }
 
-    public Enum<?> createInstance(Type type) {
-      Class<Enum<?>> enumClass = (Class<Enum<?>>) type;
-      try {
-        Method valuesMethod = enumClass.getMethod("values");
-        Enum<?>[] enums = (Enum<?>[]) valuesMethod.invoke(null);
-        return enums[0];
-      } catch (NoSuchMethodException e) {
-        throw new RuntimeException(e);
-      } catch (IllegalAccessException e) {
-        throw new RuntimeException(e);
-      } catch (InvocationTargetException e) {
-        throw new RuntimeException(e);
-      }
-    }
-
     @Override
     public String toString() {
       return EnumTypeAdapter.class.getSimpleName();
diff --git a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
index 1f5b4178..5f82fbeb 100644
--- a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
+++ b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java
@@ -46,12 +46,6 @@ final class MappedObjectConstructor implements ObjectConstructor {
       InstanceCreator<T> creator = (InstanceCreator<T>) instanceCreatorMap.getHandlerFor(typeOfT);
       return creator.createInstance(typeOfT);
     }
-    TypeInfo typeInfo = new TypeInfo(typeOfT);
-    if (typeInfo.isEnum()) {
-      InstanceCreator<T> creator =
-          (InstanceCreator<T>) instanceCreatorMap.getHandlerFor(Enum.class);
-      return creator.createInstance(typeOfT);
-    }
     return (T) constructWithNoArgConstructor(typeOfT);
   }