| Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.java
|
| diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.java
|
| index f5e939a353f1c9d279a2cc66cd9a7faa1ac3dfdd..839767970287003ce1c6748f3e0c17fb45d49128 100644
|
| --- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.java
|
| +++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.java
|
| @@ -19,10 +19,15 @@ package com.google.dart.server.generated.types;
|
| import java.util.Arrays;
|
| import java.util.List;
|
| import java.util.Map;
|
| +import com.google.common.collect.Lists;
|
| +import com.google.dart.server.utilities.general.JsonUtilities;
|
| import com.google.dart.server.utilities.general.ObjectUtilities;
|
| import com.google.gson.JsonArray;
|
| +import com.google.gson.JsonElement;
|
| import com.google.gson.JsonObject;
|
| import com.google.gson.JsonPrimitive;
|
| +import java.util.ArrayList;
|
| +import java.util.Iterator;
|
| import org.apache.commons.lang3.StringUtils;
|
|
|
| /**
|
| @@ -33,11 +38,10 @@ import org.apache.commons.lang3.StringUtils;
|
| @SuppressWarnings("unused")
|
| public class TypeHierarchyItem {
|
|
|
| - /**
|
| - * An empty array of {@link TypeHierarchyItem}s.
|
| - */
|
| public static final TypeHierarchyItem[] EMPTY_ARRAY = new TypeHierarchyItem[0];
|
|
|
| + public static final List<TypeHierarchyItem> EMPTY_LIST = Lists.newArrayList();
|
| +
|
| /**
|
| * The class element represented by this item.
|
| */
|
| @@ -110,6 +114,29 @@ public class TypeHierarchyItem {
|
| return false;
|
| }
|
|
|
| + public static TypeHierarchyItem fromJson(JsonObject jsonObject) {
|
| + Element classElement = Element.fromJson(jsonObject.get("classElement").getAsJsonObject());
|
| + String displayName = jsonObject.get("displayName") == null ? null : jsonObject.get("displayName").getAsString();
|
| + Element memberElement = jsonObject.get("memberElement") == null ? null : Element.fromJson(jsonObject.get("memberElement").getAsJsonObject());
|
| + Integer superclass = jsonObject.get("superclass") == null ? null : jsonObject.get("superclass").getAsInt();
|
| + Integer[] interfaces = JsonUtilities.decodeIntegerArray(jsonObject.get("interfaces").getAsJsonArray());
|
| + Integer[] mixins = JsonUtilities.decodeIntegerArray(jsonObject.get("mixins").getAsJsonArray());
|
| + Integer[] subclasses = JsonUtilities.decodeIntegerArray(jsonObject.get("subclasses").getAsJsonArray());
|
| + return new TypeHierarchyItem(classElement, displayName, memberElement, superclass, interfaces, mixins, subclasses);
|
| + }
|
| +
|
| + public static List<TypeHierarchyItem> fromJsonArray(JsonArray jsonArray) {
|
| + if (jsonArray == null) {
|
| + return EMPTY_LIST;
|
| + }
|
| + ArrayList<TypeHierarchyItem> list = new ArrayList<TypeHierarchyItem>(jsonArray.size());
|
| + Iterator<JsonElement> iterator = jsonArray.iterator();
|
| + while (iterator.hasNext()) {
|
| + list.add(fromJson(iterator.next().getAsJsonObject()));
|
| + }
|
| + return list;
|
| + }
|
| +
|
| /**
|
| * The class element represented by this item.
|
| */
|
|
|