| Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverriddenMember.java
|
| diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverriddenMember.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverriddenMember.java
|
| index fb475e8f732710e086f2c38b579666400eea61ca..cd7758755039676a746907f721fa650b8ae58988 100644
|
| --- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverriddenMember.java
|
| +++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverriddenMember.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 OverriddenMember {
|
|
|
| - /**
|
| - * An empty array of {@link OverriddenMember}s.
|
| - */
|
| public static final OverriddenMember[] EMPTY_ARRAY = new OverriddenMember[0];
|
|
|
| + public static final List<OverriddenMember> EMPTY_LIST = Lists.newArrayList();
|
| +
|
| /**
|
| * The element that is being overridden.
|
| */
|
| @@ -67,6 +71,24 @@ public class OverriddenMember {
|
| return false;
|
| }
|
|
|
| + public static OverriddenMember fromJson(JsonObject jsonObject) {
|
| + Element element = Element.fromJson(jsonObject.get("element").getAsJsonObject());
|
| + String className = jsonObject.get("className").getAsString();
|
| + return new OverriddenMember(element, className);
|
| + }
|
| +
|
| + public static List<OverriddenMember> fromJsonArray(JsonArray jsonArray) {
|
| + if (jsonArray == null) {
|
| + return EMPTY_LIST;
|
| + }
|
| + ArrayList<OverriddenMember> list = new ArrayList<OverriddenMember>(jsonArray.size());
|
| + Iterator<JsonElement> iterator = jsonArray.iterator();
|
| + while (iterator.hasNext()) {
|
| + list.add(fromJson(iterator.next().getAsJsonObject()));
|
| + }
|
| + return list;
|
| + }
|
| +
|
| /**
|
| * The name of the class in which the member is defined.
|
| */
|
|
|