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

pkg/analysis_server/lib/src/services/refactoring/rename_unit_member.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.refactoring.rename_unit_member;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol_server.dart'
     show newLocation_fromElement, newLocation_fromMatch;
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/refactoring/rename.dart';
 import 'package:analysis_server/src/services/search/element_visitors.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/ast.dart' show Identifier;
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 
 /**
  * Checks if creating a top-level function with the given [name] in [library]
  * will cause any conflicts.
  */
 Future<RefactoringStatus> validateCreateFunction(
     SearchEngine searchEngine, LibraryElement library, String name) {
   return new _RenameUnitMemberValidator.forCreate(
-      searchEngine, library, ElementKind.FUNCTION, name).validate();
+          searchEngine, library, ElementKind.FUNCTION, name)
+      .validate();
 }
 
 /**
  * Checks if creating a top-level function with the given [name] in [element]
  * will cause any conflicts.
  */
 Future<RefactoringStatus> validateRenameTopLevel(
     SearchEngine searchEngine, Element element, String name) {
   return new _RenameUnitMemberValidator.forRename(searchEngine, element, name)
       .validate();
@@ skipping 215 matching lines @@
                 ? "Renamed {0} will shadow {1} '{2}'."
                 : "Created {0} will shadow {1} '{2}'.",
             elementKind.displayName,
             getElementKindName(member),
             getElementQualifiedName(member));
         result.addError(message, newLocation_fromMatch(memberReference));
       }
     }
   }
 }