Change HashMap declarations back to Map.

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 'dart:collection';
-
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/src/generated/element.dart' as engine;
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;
 
 
 /**
  * Information about an element.
  */
 class Element {
   static const List<Element> EMPTY_ARRAY = const <Element>[];
@@ skipping 55 matching lines @@
     int nameLength = name != null ? name.length : 0;
     String elementParameters = _getParametersString(element);
     String elementReturnType = _getReturnTypeString(element);
     return new Element(ElementKind.valueOfEngine(element.kind), name,
         element.nameOffset, nameLength, element.isPrivate, element.isDeprecated,
         parameters: elementParameters, returnType: elementReturnType, isAbstract:
         _isAbstract(element), isConst: _isConst(element), isFinal: _isFinal(element),
         isStatic: _isStatic(element));
   }
 
-  factory Element.fromJson(HashMap<String, Object> map) {
+  factory Element.fromJson(Map<String, Object> map) {
     ElementKind kind = ElementKind.valueOf(map[KIND]);
     int flags = map[FLAGS];
     return new Element(kind, map[NAME], map[OFFSET], map[LENGTH], _hasFlag(
         flags, FLAG_PRIVATE), _hasFlag(flags, FLAG_DEPRECATED), parameters:
         map[PARAMETERS], returnType: map[RETURN_TYPE], isAbstract: _hasFlag(flags,
         FLAG_ABSTRACT), isConst: _hasFlag(flags, FLAG_CONST), isFinal: _hasFlag(flags,
         FLAG_FINAL), isStatic: _hasFlag(flags, FLAG_STATIC));
   }
 
   int get flags {
     int flags = 0;
     if (isAbstract) flags |= FLAG_ABSTRACT;
     if (isConst) flags |= FLAG_CONST;
     if (isFinal) flags |= FLAG_FINAL;
     if (isStatic) flags |= FLAG_STATIC;
     if (isPrivate) flags |= FLAG_PRIVATE;
     if (isDeprecated) flags |= FLAG_DEPRECATED;
     return flags;
   }
 
-  HashMap<String, Object> toJson() {
-    HashMap<String, Object> json = {
+  Map<String, Object> toJson() {
+    Map<String, Object> json = {
       KIND: kind.name,
       NAME: name,
       OFFSET: offset,
       LENGTH: length,
       FLAGS: flags
     };
     if (parameters != null) {
       json[PARAMETERS] = parameters;
     }
     if (returnType != null) {
@@ skipping 162 matching lines @@
     }
     if (kind == engine.ElementKind.SETTER) {
       return SETTER;
     }
     if (kind == engine.ElementKind.TOP_LEVEL_VARIABLE) {
       return TOP_LEVEL_VARIABLE;
     }
     return UNKNOWN;
   }
 }