Rename NavigationHolder to NavigationCollector.

pkg/analysis_server/lib/src/domains/analysis/navigation_dart.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 domains.analysis.navigation_dart;
 
 import 'package:analysis_server/analysis/navigation/navigation_core.dart';
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * A computer for navigation regions in a Dart [CompilationUnit].
  */
 class DartNavigationComputer implements NavigationContributor {
   @override
-  void computeNavigation(NavigationHolder holder, AnalysisContext context,
+  void computeNavigation(NavigationCollector collector, AnalysisContext context,
       Source source, int offset, int length) {
     List<Source> libraries = context.getLibrariesContaining(source);
     if (libraries.isNotEmpty) {
       CompilationUnit unit =
           context.getResolvedCompilationUnit2(source, libraries.first);
       if (unit != null) {
-        _DartNavigationHolder dartHolder = new _DartNavigationHolder(holder);
+        _DartNavigationCollector dartCollector =
+            new _DartNavigationCollector(collector);
         _DartNavigationComputerVisitor visitor =
-            new _DartNavigationComputerVisitor(dartHolder);
+            new _DartNavigationComputerVisitor(dartCollector);
         if (offset == null || length == null) {
           unit.accept(visitor);
         } else {
           _DartRangeAstVisitor partVisitor =
               new _DartRangeAstVisitor(offset, offset + length, visitor);
           unit.accept(partVisitor);
         }
       }
     }
   }
 }
 
 class _DartNavigationComputerVisitor extends RecursiveAstVisitor {
-  final _DartNavigationHolder computer;
+  final _DartNavigationCollector computer;
 
   _DartNavigationComputerVisitor(this.computer);
 
   @override
   visitAssignmentExpression(AssignmentExpression node) {
     _safelyVisit(node.leftHandSide);
     computer._addRegionForToken(node.operator, node.bestElement);
     _safelyVisit(node.rightHandSide);
   }
 
@@ skipping 162 matching lines @@
   }
 
   void _safelyVisit(AstNode node) {
     if (node != null) {
       node.accept(this);
     }
   }
 }
 
 /**
- * A Dart specific wrapper around [NavigationHolder].
+ * A Dart specific wrapper around [NavigationCollector].
  */
-class _DartNavigationHolder {
-  final NavigationHolder holder;
+class _DartNavigationCollector {
+  final NavigationCollector collector;
 
-  _DartNavigationHolder(this.holder);
+  _DartNavigationCollector(this.collector);
 
   void _addRegion(int offset, int length, Element element) {
     if (element is FieldFormalParameterElement) {
       element = (element as FieldFormalParameterElement).field;
     }
     if (element == null || element == DynamicElementImpl.instance) {
       return;
     }
     if (element.location == null) {
       return;
     }
     protocol.ElementKind kind =
         protocol.newElementKind_fromEngine(element.kind);
     protocol.Location location = protocol.newLocation_fromElement(element);
     if (location == null) {
       return;
     }
-    holder.addRegion(offset, length, kind, location);
+    collector.addRegion(offset, length, kind, location);
   }
 
   void _addRegion_nodeStart_nodeEnd(AstNode a, AstNode b, Element element) {
     int offset = a.offset;
     int length = b.end - offset;
     _addRegion(offset, length, element);
   }
 
   void _addRegion_tokenStart_nodeEnd(Token a, AstNode b, Element element) {
     int offset = a.offset;
@@ skipping 41 matching lines @@
     }
     // The node starts or ends in the range.
     if (isInRange(node.offset) || isInRange(node.end)) {
       node.accept(visitor);
       return;
     }
     // Go deeper.
     super.visitNode(node);
   }
 }