Tweak for AnalysisDomainHandler.

pkg/analysis_server/lib/src/domain_analysis.dart

Index: pkg/analysis_server/lib/src/domain_analysis.dart
diff --git a/pkg/analysis_server/lib/src/domain_analysis.dart b/pkg/analysis_server/lib/src/domain_analysis.dart
index f19fc0f694d6676bbfe18f7a4d4673decc9097bf..4e51432e5220875436e96728fa5734b42f47ddc8 100644
--- a/pkg/analysis_server/lib/src/domain_analysis.dart
+++ b/pkg/analysis_server/lib/src/domain_analysis.dart
@@ -12,7 +12,6 @@ import 'package:analysis_server/src/computer/error.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_services/constants.dart';
-import 'package:analysis_services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 
@@ -28,16 +27,9 @@ class AnalysisDomainHandler implements RequestHandler {
   final AnalysisServer server;
 
   /**
-   * The [SearchEngine] for this server.
-   */
-  SearchEngine searchEngine;
-
-  /**
    * Initialize a newly created handler to handle requests for the given [server].
    */
-  AnalysisDomainHandler(this.server) {
-    searchEngine = server.searchEngine;
-  }
+  AnalysisDomainHandler(this.server);
 
   /**
    * Implement the `analysis.getErrors` request.
@@ -171,30 +163,28 @@ class AnalysisDomainHandler implements RequestHandler {
   Response updateContent(Request request) {
     var changes = new HashMap<String, ContentChange>();
     RequestDatum filesDatum = request.getRequiredParameter(FILES);
-    Response errorResponse;
     for (String file in filesDatum.keys) {
       RequestDatum changeDatum = filesDatum[file];
       ContentChange change = new ContentChange();
       switch (changeDatum[TYPE].asString()) {
-        case 'add':
+        case ANALYSIS_OVERLAY_ADD:
           change.contentOrReplacement = changeDatum[CONTENT].asString();
           break;
-        case 'change':
+        case ANALYSIS_OVERLAY_CHANGE:
           change.offset = changeDatum[OFFSET].asInt();
           change.length = changeDatum[LENGTH].asInt();
           change.contentOrReplacement = changeDatum[REPLACEMENT].asString();
           break;
-        case 'remove':
+        case ANALYSIS_OVERLAY_REMOVE:
           break;
         default:
-          return new Response.invalidParameter(request,
-              changeDatum[TYPE].path, 'be one of "add", "change", or "remove"');
+          return new Response.invalidParameter(
+              request,
+              changeDatum[TYPE].path,
+              'be one of "add", "change", or "remove"');
       }
       changes[file] = change;
     }
-    if (errorResponse != null) {
-      return errorResponse;
-    }
     server.updateContent(changes);
     return new Response(request.id);
   }