Merge pull request #1140 from dart-lang/remove_warnings

remove analysis warnings

Author: devoncarew

lib/src/element_type.dart

@@ -6,7 +6,7 @@
 library dartdoc.element_type;
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 
 import 'model.dart';
 
@@ -23,7 +23,7 @@ class ElementType {
 
   bool get isParameterizedType {
     if (_type is FunctionType) {
-      return (_type as FunctionType).boundTypeParameters.isNotEmpty;
+      return (_type as FunctionType).typeFormals.isNotEmpty;
     } else if (_type is ParameterizedType) {
       return (_type as ParameterizedType).typeArguments.isNotEmpty;
     }
@@ -77,7 +77,7 @@ class ElementType {
   List<ElementType> get typeArguments {
     if (_type is FunctionType) {
       return (_type as FunctionType)
-          .boundTypeParameters
+          .typeFormals
           .map((f) => _getElementTypeFrom(f.type))
           .toList();
     } else {

lib/src/markdown_processor.dart

@@ -9,7 +9,7 @@ library dartdoc.markdown_processor;
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/src/generated/element.dart'
+import 'package:analyzer/dart/element/element.dart'
     show
         LibraryElement,
         Element,

lib/src/model.dart

@@ -9,7 +9,8 @@ import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart'
     show AnnotatedNode, Annotation, Declaration;
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/generated/resolver.dart'
     show Namespace, NamespaceBuilder, InheritanceManager, MemberMap;
 import 'package:analyzer/src/generated/source_io.dart';
@@ -662,8 +663,7 @@ abstract class Documentable {
 
 // TODO: how do we get rid of this class?
 class Dynamic extends ModelElement {
-  Dynamic(DynamicElementImpl element, Library library)
-      : super(element, library);
+  Dynamic(Element element, Library library) : super(element, library);
 
   ModelElement get enclosingElement => throw new UnsupportedError('');
 
@@ -1221,7 +1221,7 @@ abstract class ModelElement implements Comparable, Nameable, Documentable {
   ModelElement(this.element, this.library);
 
   factory ModelElement.from(Element e, Library library) {
-    if (e is DynamicElementImpl) {
+    if (e.kind == ElementKind.DYNAMIC) {
       return new Dynamic(e, library);
     }
     // Also handles enums
@@ -1940,9 +1940,7 @@ class TopLevelVariable extends ModelElement
   }
 
   String get constantValue {
-    var v = (_variable as ConstTopLevelVariableElementImpl)
-        .computeNode()
-        .toSource();
+    var v = _variable.computeNode().toSource();
     if (v == null) return '';
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
     return string.replaceAll(modelType.name, modelType.linkedName);

lib/src/model_utils.dart

@@ -6,7 +6,8 @@ library dartdoc.model_utils;
 
 import 'dart:io';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';