Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer)

pkg/analysis_server/lib/src/services/index/store/split_store.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 services.src.index.store.split_store;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:typed_data';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/provisional/index/index_core.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/index_store.dart';
 import 'package:analysis_server/src/services/index/indexable_element.dart';
 import 'package:analysis_server/src/services/index/store/codec.dart';
 import 'package:analysis_server/src/services/index/store/collection.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/ast.dart' show CompilationUnit;
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
 
 /**
  * The implementation of [IndexObjectManager] for indexing
  * [CompilationUnitElement]s.
  */
 class DartUnitIndexObjectManager extends IndexObjectManager {
@@ skipping 312 matching lines @@
     int flags = stream.readInt();
     return new LocationData.forData(
         elementId1, elementId2, elementId3, offset, length, flags);
   }
 
   IndexNode _readNode(_DataInputStream stream) {
     // check version
     {
       int version = stream.readInt();
       if (version != _VERSION) {
-        throw new StateError(
-            'Version $_VERSION expected, but $version found.');
+        throw new StateError('Version $_VERSION expected, but $version found.');
       }
     }
     // context
     int contextId = stream.readInt();
     AnalysisContext context = contextCodec.decode(contextId);
     if (context == null) {
       return null;
     }
     // relations
     Map<RelationKeyData, List<LocationData>> relations =
@@ skipping 796 matching lines @@
   }
 
   _TopElementData._(
       this.name, this.elementId1, this.elementId2, this.elementId3);
 
   IndexableObject getElement(
       AnalysisContext context, ElementCodec elementCodec) {
     return elementCodec.decode(context, elementId1, elementId2, elementId3);
   }
 }