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

Unified Diff: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/NotificationAnalysisOverridesProcessor.java

Issue 474193003: Make more use of generated code in Java analysis server. (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/internal/remote/processor/NotificationAnalysisOverridesProcessor.java
diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/NotificationAnalysisOverridesProcessor.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/NotificationAnalysisOverridesProcessor.java
index 6addaf761df8278d8ba92d8bc92f6c1b93b6d19a..8f28ec8facaddbd1cabe8d6d2c94dc4d072f6b6e 100644
--- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/NotificationAnalysisOverridesProcessor.java
+++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/NotificationAnalysisOverridesProcessor.java
@@ -13,16 +13,11 @@
*/
package com.google.dart.server.internal.remote.processor;
-import com.google.common.collect.Lists;
import com.google.dart.server.AnalysisServerListener;
-import com.google.dart.server.OverrideMember;
-import com.google.dart.server.generated.types.Element;
-import com.google.dart.server.internal.OverrideMemberImpl;
+import com.google.dart.server.generated.types.OverrideMember;
import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import java.util.Iterator;
import java.util.List;
/**
@@ -43,27 +38,11 @@ public class NotificationAnalysisOverridesProcessor extends NotificationProcesso
public void process(JsonObject response) throws Exception {
JsonObject paramsObject = response.get("params").getAsJsonObject();
String file = paramsObject.get("file").getAsString();
- JsonArray occurrencesJsonArray = paramsObject.get("overrides").getAsJsonArray();
+ JsonArray overridesJsonArray = paramsObject.get("overrides").getAsJsonArray();
// compute occurrences and notify listener
- getListener().computedOverrides(file, constructOverridesArray(occurrencesJsonArray));
- }
-
- private OverrideMember[] constructOverridesArray(JsonArray occurrencesJsonArray) {
- Iterator<JsonElement> overridesIterator = occurrencesJsonArray.iterator();
- List<OverrideMember> overridesList = Lists.newArrayList();
- while (overridesIterator.hasNext()) {
- JsonObject overridesObject = overridesIterator.next().getAsJsonObject();
- int offset = overridesObject.get("offset").getAsInt();
- int length = overridesObject.get("length").getAsInt();
- JsonObject superclassObject = safelyGetAsJsonObject(overridesObject, "superclassElement");
- Element superclassElement = null;
- if (superclassObject != null) {
- superclassElement = constructElement(superclassObject);
- }
- overridesList.add(new OverrideMemberImpl(offset, length, superclassElement));
- }
-
- // create overrides object
- return overridesList.toArray(new OverrideMember[overridesList.size()]);
+ List<OverrideMember> overriddenMemberList = OverrideMember.fromJsonArray(overridesJsonArray);
+ getListener().computedOverrides(
+ file,
+ overriddenMemberList.toArray(new OverrideMember[overriddenMemberList.size()]));
}
}

Powered by Google App Engine
This is Rietveld 408576698