Make IndexableObjectKind parameterized.

pkg/analysis_server/lib/src/services/index/indexable_element.dart

 // Copyright (c) 2015, 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 src.services.index;
 
 import 'dart:collection';
 
 import 'package:analysis_server/plugin/index/index_core.dart';
 import 'package:analyzer/src/generated/element.dart';
@@ skipping 13 matching lines @@
   /**
    * Initialize a newly created wrapper to wrap the given [element].
    */
   IndexableElement(this.element) {
     if (element == null) {
       throw new ArgumentError.notNull('element');
     }
   }
 
   @override
+  String get filePath {
+    return element.source?.fullName;
+  }
+
+  @override
   int get hashCode => element.hashCode;
 
   @override
-  IndexableObjectKind get kind => IndexableElementKind.forElement(element);
+  IndexableElementKind get kind => IndexableElementKind.forElement(element);
 
   @override
   int get offset {
     if (element is ConstructorElement) {
       return element.enclosingElement.nameOffset;
     }
     return element.nameOffset;
   }
 
   @override
-  String get filePath {
-    return element.source?.fullName;
-  }
-
-  @override
   bool operator ==(Object object) =>
       object is IndexableElement && element == object.element;
 
   @override
   String toString() => element.toString();
 }
 
 /**
  * The kind associated with an [IndexableElement].
  */
-class IndexableElementKind implements IndexableObjectKind {
+class IndexableElementKind implements IndexableObjectKind<IndexableElement> {
   /**
    * A table mapping element kinds to the corresponding indexable element kind.
    */
   static final Map<ElementKind, IndexableElementKind> _kindMap =
       new HashMap<ElementKind, IndexableElementKind>();
 
   /**
    * A table mapping the index of a constructor (in the lexically-ordered list
    * of constructors associated with a class) to the indexable element kind used
    * to represent it.
@@ skipping 23 matching lines @@
   int get constructorIndex {
     for (int index in _constructorKinds.keys) {
       if (_constructorKinds[index] == this) {
         return index;
       }
     }
     return -1;
   }
 
   @override
-  IndexableObject decode(AnalysisContext context, String filePath, int offset) {
+  IndexableElement decode(
+      AnalysisContext context, String filePath, int offset) {
     List<Source> unitSources = context.getSourcesWithFullName(filePath);
     for (Source unitSource in unitSources) {
       List<Source> libSources = context.getLibrariesContaining(unitSource);
       for (Source libSource in libSources) {
         CompilationUnitElement unitElement =
             context.getCompilationUnitElement(unitSource, libSource);
         if (unitElement == null) {
           return null;
         }
         if (elementKind == ElementKind.LIBRARY) {
@@ skipping 18 matching lines @@
             }
           }
           return new IndexableElement(element);
         }
       }
     }
     return null;
   }
 
   @override
-  int encodeHash(StringToInt stringToInt, IndexableObject indexable) {
-    Element element = (indexable as IndexableElement).element;
+  int encodeHash(StringToInt stringToInt, IndexableElement indexable) {
+    Element element = indexable.element;
     String elementName = element.displayName;
     int elementNameId = stringToInt(elementName);
-    if (indexable is IndexableElement) {
-      LibraryElement libraryElement = indexable.element.library;
-      if (libraryElement != null) {
-        String libraryPath = libraryElement.source.fullName;
-        int libraryPathId = stringToInt(libraryPath);
-        return JenkinsSmiHash.combine(libraryPathId, elementNameId);
-      }
+    LibraryElement libraryElement = element.library;
+    if (libraryElement != null) {
+      String libraryPath = libraryElement.source.fullName;
+      int libraryPathId = stringToInt(libraryPath);
+      return JenkinsSmiHash.combine(libraryPathId, elementNameId);
     }
     return elementNameId;
   }
 
   /**
    * Return the indexable element kind representing the given [element].
    */
   static IndexableElementKind forElement(Element element) {
     if (element is ConstructorElement) {
       ClassElement classElement = element.enclosingElement;
       int constructorIndex = classElement.constructors.indexOf(element);
       return _constructorKinds.putIfAbsent(constructorIndex,
           () => new IndexableElementKind._(ElementKind.CONSTRUCTOR));
     }
     ElementKind elementKind = element.kind;
     return _kindMap.putIfAbsent(
         elementKind, () => new IndexableElementKind._(elementKind));
   }
 }