Remove references to Engine classes from protocol.dart

pkg/analysis_server/lib/src/computer/element.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library computer.element;
 
-import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/src/generated/element.dart' as engine;
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;
 
 
 Element elementFromEngine(engine.Element element) {
   String name = element.displayName;
   String elementParameters = _getParametersString(element);
   String elementReturnType = _getReturnTypeString(element);
   return new Element(
-    new ElementKind.fromEngine(element.kind),
-    name,
-    Element.makeFlags(isPrivate: element.isPrivate,
-        isDeprecated: element.isDeprecated,
-        isAbstract: _isAbstract(element),
-        isConst: _isConst(element),
-        isFinal: _isFinal(element),
-        isStatic: _isStatic(element)),
-    location: new Location.fromElement(element),
-    parameters: elementParameters,
-    returnType: elementReturnType);
+      newElementKind_fromEngine(element.kind),
+      name,
+      Element.makeFlags(
+          isPrivate: element.isPrivate,
+          isDeprecated: element.isDeprecated,
+          isAbstract: _isAbstract(element),
+          isConst: _isConst(element),
+          isFinal: _isFinal(element),
+          isStatic: _isStatic(element)),
+      location: newLocation_fromElement(element),
+      parameters: elementParameters,
+      returnType: elementReturnType);
 }
 
 String _getParametersString(engine.Element element) {
   // TODO(scheglov) expose the corresponding feature from ExecutableElement
   if (element is engine.ExecutableElement) {
     var sb = new StringBuffer();
     String closeOptionalString = '';
     for (var parameter in element.parameters) {
       if (sb.isNotEmpty) {
         sb.write(', ');
@@ skipping 65 matching lines @@
 bool _isStatic(engine.Element element) {
   // TODO(scheglov) add isStatic to Element API
   if (element is engine.ExecutableElement) {
     return element.isStatic;
   }
   if (element is engine.PropertyInducingElement) {
     return element.isStatic;
   }
   return false;
 }