Index: pkg/analysis_server/tool/spec/generated/java/types/Implementation.java |
diff --git a/pkg/analysis_server/tool/spec/generated/java/types/OverriddenMember.java b/pkg/analysis_server/tool/spec/generated/java/types/Implementation.java |
similarity index 69% |
copy from pkg/analysis_server/tool/spec/generated/java/types/OverriddenMember.java |
copy to pkg/analysis_server/tool/spec/generated/java/types/Implementation.java |
index 720722a171809209def2207a5861e30d66aec213..251a999a77d9bdca168a6c5fce964dd15107841b 100644 |
--- a/pkg/analysis_server/tool/spec/generated/java/types/OverriddenMember.java |
+++ b/pkg/analysis_server/tool/spec/generated/java/types/Implementation.java |
@@ -32,39 +32,40 @@ import java.util.Iterator; |
import org.apache.commons.lang3.StringUtils; |
/** |
- * A description of a member that is being overridden. |
+ * A description of an element that implements a class or class member. |
* |
* @coverage dart.server.generated.types |
*/ |
@SuppressWarnings("unused") |
-public class OverriddenMember { |
+public class Implementation { |
- public static final OverriddenMember[] EMPTY_ARRAY = new OverriddenMember[0]; |
+ public static final Implementation[] EMPTY_ARRAY = new Implementation[0]; |
- public static final List<OverriddenMember> EMPTY_LIST = Lists.newArrayList(); |
+ public static final List<Implementation> EMPTY_LIST = Lists.newArrayList(); |
/** |
- * The element that is being overridden. |
+ * The element that implements a class or class member. |
*/ |
private final Element element; |
/** |
- * The name of the class in which the member is defined. |
+ * The name of the class in which the class member is implemented. This field is omitted if the |
+ * element itself is a class. |
*/ |
private final String className; |
/** |
- * Constructor for {@link OverriddenMember}. |
+ * Constructor for {@link Implementation}. |
*/ |
- public OverriddenMember(Element element, String className) { |
+ public Implementation(Element element, String className) { |
this.element = element; |
this.className = className; |
} |
@Override |
public boolean equals(Object obj) { |
- if (obj instanceof OverriddenMember) { |
- OverriddenMember other = (OverriddenMember) obj; |
+ if (obj instanceof Implementation) { |
+ Implementation other = (Implementation) obj; |
return |
ObjectUtilities.equals(other.element, element) && |
ObjectUtilities.equals(other.className, className); |
@@ -72,17 +73,17 @@ public class OverriddenMember { |
return false; |
} |
- public static OverriddenMember fromJson(JsonObject jsonObject) { |
+ public static Implementation fromJson(JsonObject jsonObject) { |
Element element = Element.fromJson(jsonObject.get("element").getAsJsonObject()); |
- String className = jsonObject.get("className").getAsString(); |
- return new OverriddenMember(element, className); |
+ String className = jsonObject.get("className") == null ? null : jsonObject.get("className").getAsString(); |
+ return new Implementation(element, className); |
} |
- public static List<OverriddenMember> fromJsonArray(JsonArray jsonArray) { |
+ public static List<Implementation> fromJsonArray(JsonArray jsonArray) { |
if (jsonArray == null) { |
return EMPTY_LIST; |
} |
- ArrayList<OverriddenMember> list = new ArrayList<OverriddenMember>(jsonArray.size()); |
+ ArrayList<Implementation> list = new ArrayList<Implementation>(jsonArray.size()); |
Iterator<JsonElement> iterator = jsonArray.iterator(); |
while (iterator.hasNext()) { |
list.add(fromJson(iterator.next().getAsJsonObject())); |
@@ -91,14 +92,15 @@ public class OverriddenMember { |
} |
/** |
- * The name of the class in which the member is defined. |
+ * The name of the class in which the class member is implemented. This field is omitted if the |
+ * element itself is a class. |
*/ |
public String getClassName() { |
return className; |
} |
/** |
- * The element that is being overridden. |
+ * The element that implements a class or class member. |
*/ |
public Element getElement() { |
return element; |
@@ -115,7 +117,9 @@ public class OverriddenMember { |
public JsonObject toJson() { |
JsonObject jsonObject = new JsonObject(); |
jsonObject.add("element", element.toJson()); |
- jsonObject.addProperty("className", className); |
+ if (className != null) { |
+ jsonObject.addProperty("className", className); |
+ } |
return jsonObject; |
} |