Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java

Issue 482573004: Change analysis server protocol to omit empty lists when optional. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java
diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java
index 17aef534c789491b4f834da4820c1b2a52282d86..061c105f3f7acc08dbd5224b11d8d7fee6aa9657 100644
--- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java
+++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/NavigationRegion.java
@@ -82,7 +82,7 @@ public class NavigationRegion {
public static NavigationRegion fromJson(JsonObject jsonObject) {
Integer offset = jsonObject.get("offset").getAsInt();
Integer length = jsonObject.get("length").getAsInt();
- List<Element> targets = Element.fromJsonArray(jsonObject.get("targets").getAsJsonArray());
+ List<Element> targets = jsonObject.get("targets") == null ? null : Element.fromJsonArray(jsonObject.get("targets").getAsJsonArray());
return new NavigationRegion(offset, length, targets);
}
@@ -124,11 +124,13 @@ public class NavigationRegion {
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("offset", offset);
jsonObject.addProperty("length", length);
- JsonArray jsonArrayTargets = new JsonArray();
- for(Element elt : targets) {
- jsonArrayTargets.add(elt.toJson());
+ if (targets != null) {
+ JsonArray jsonArrayTargets = new JsonArray();
+ for(Element elt : targets) {
+ jsonArrayTargets.add(elt.toJson());
+ }
+ jsonObject.add("targets", jsonArrayTargets);
}
- jsonObject.add("targets", jsonArrayTargets);
return jsonObject;
}

Powered by Google App Engine
This is Rietveld 408576698