| Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverrideMember.java
|
| diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverrideMember.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverrideMember.java
|
| index 4a0acf10a6c969b9d0fef12e8e9c566a21962fcb..cb3642afe7366093070cc274d882febc0ecc8885 100644
|
| --- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverrideMember.java
|
| +++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/OverrideMember.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 OverrideMember {
|
|
|
| - /**
|
| - * An empty array of {@link OverrideMember}s.
|
| - */
|
| public static final OverrideMember[] EMPTY_ARRAY = new OverrideMember[0];
|
|
|
| + public static final List<OverrideMember> EMPTY_LIST = Lists.newArrayList();
|
| +
|
| /**
|
| * The offset of the name of the overriding member.
|
| */
|
| @@ -84,6 +88,26 @@ public class OverrideMember {
|
| return false;
|
| }
|
|
|
| + public static OverrideMember fromJson(JsonObject jsonObject) {
|
| + Integer offset = jsonObject.get("offset").getAsInt();
|
| + Integer length = jsonObject.get("length").getAsInt();
|
| + OverriddenMember superclassMember = jsonObject.get("superclassMember") == null ? null : OverriddenMember.fromJson(jsonObject.get("superclassMember").getAsJsonObject());
|
| + List<OverriddenMember> interfaceMembers = jsonObject.get("interfaceMembers") == null ? null : OverriddenMember.fromJsonArray(jsonObject.get("interfaceMembers").getAsJsonArray());
|
| + return new OverrideMember(offset, length, superclassMember, interfaceMembers);
|
| + }
|
| +
|
| + public static List<OverrideMember> fromJsonArray(JsonArray jsonArray) {
|
| + if (jsonArray == null) {
|
| + return EMPTY_LIST;
|
| + }
|
| + ArrayList<OverrideMember> list = new ArrayList<OverrideMember>(jsonArray.size());
|
| + Iterator<JsonElement> iterator = jsonArray.iterator();
|
| + while (iterator.hasNext()) {
|
| + list.add(fromJson(iterator.next().getAsJsonObject()));
|
| + }
|
| + return list;
|
| + }
|
| +
|
| /**
|
| * The members inherited from interfaces that are overridden by the overriding member. The field is
|
| * omitted if there are no interface members, in which case there must be a superclass member.
|
|
|