isPrivate, isTopLevel moved to DeclarationMirror

pkg/dartdoc/lib/src/mirrors/dart2js_mirror.dart

 // Copyright (c) 2012, 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 mirrors_dart2js;
 
 import 'dart:io';
 import 'dart:uri';
 
 import '../../../../../lib/compiler/compiler.dart' as diagnostics;
@@ skipping 369 matching lines @@
 // Dart2Js specific extensions of mirror interfaces
 //------------------------------------------------------------------------------
 
 abstract class Dart2JsMirror implements Mirror {
   Dart2JsMirrorSystem get system;
 }
 
 abstract class Dart2JsDeclarationMirror
     implements Dart2JsMirror, DeclarationMirror {
 
+  bool get isTopLevel => owner != null && owner is LibraryMirror;
+
+  bool get isPrivate => _isPrivate(simpleName);
 }
 
-abstract class Dart2JsMemberMirror
-    implements Dart2JsDeclarationMirror, MemberMirror {
+abstract class Dart2JsMemberMirror extends Dart2JsDeclarationMirror
+    implements MemberMirror {
 
 }
 
-abstract class Dart2JsTypeMirror
-    implements Dart2JsDeclarationMirror, TypeMirror {
+abstract class Dart2JsTypeMirror extends Dart2JsDeclarationMirror
+    implements TypeMirror {
 
 }
 
-abstract class Dart2JsElementMirror implements Dart2JsDeclarationMirror {
+abstract class Dart2JsElementMirror extends Dart2JsDeclarationMirror {
   final Dart2JsMirrorSystem system;
   final Element _element;
 
   Dart2JsElementMirror(this.system, this._element) {
     assert (system !== null);
     assert (_element !== null);
   }
 
   String get simpleName => _element.name.slowToString();
 
   String get displayName => simpleName;
 
   SourceLocation get location => new Dart2JsLocation(
       _element.getCompilationUnit().script,
       system.compiler.spanFromElement(_element));
 
   String toString() => _element.toString();
 
   int get hashCode => qualifiedName.hashCode;
 }
 
-abstract class Dart2JsProxyMirror implements Dart2JsDeclarationMirror {
+abstract class Dart2JsProxyMirror extends Dart2JsDeclarationMirror {
   final Dart2JsMirrorSystem system;
 
   Dart2JsProxyMirror(this.system);
 
   String get displayName => simpleName;
 
   int get hashCode => qualifiedName.hashCode;
 }
 
 //------------------------------------------------------------------------------
@@ skipping 51 matching lines @@
 
   Dart2JsLibraryMirror(Dart2JsMirrorSystem system, LibraryElement library)
       : super(system, library);
 
   LibraryElement get _library => _element;
 
   Uri get uri => _library.uri;
 
   DeclarationMirror get owner => null;
 
+  bool get isPrivate => false;
+
   LibraryMirror library() => this;
 
   /**
    * Returns the library name (for libraries with a #library tag) or the script
    * file name (for scripts without a #library tag). The latter case is used to
    * provide a 'library name' for scripts, to use for instance in dartdoc.
    */
   String get simpleName {
     if (_library.libraryTag !== null) {
       // TODO(ahe): Remove StringNode check when old syntax is removed.
@@ skipping 254 matching lines @@
     }
     return list;
   }
 
   bool get isClass => !_class.isInterface();
 
   bool get isInterface => _class.isInterface();
 
   bool get isAbstract => _class.modifiers.isAbstract();
 
-  bool get isPrivate => _isPrivate(simpleName);
-
   bool get isDeclaration => true;
 
   List<TypeMirror> get typeArguments {
     throw new UnsupportedError(
         'Declarations do not have type arguments');
   }
 
   List<TypeVariableMirror> get typeVariables {
     if (_typeVariables == null) {
       _typeVariables = <TypeVariableMirror>[];
@@ skipping 108 matching lines @@
 
   // TODO(johnniwinther): How should a typedef respond to these?
   ClassMirror get superclass => null;
 
   List<ClassMirror> get interfaces => const <ClassMirror>[];
 
   bool get isClass => false;
 
   bool get isInterface => false;
 
-  bool get isPrivate => _isPrivate(simpleName);
-
   bool get isDeclaration => true;
 
   bool get isAbstract => false;
 
   Map<String, MethodMirror> get constructors =>
       const <String, MethodMirror>{};
 
   ClassMirror get defaultType => null;
 }
 
@@ skipping 469 matching lines @@
   DeclarationMirror get owner => _objectMirror;
 
   bool get isTopLevel => _objectMirror is LibraryMirror;
 
   bool get isConstructor => false;
 
   bool get isField => true;
 
   bool get isMethod => false;
 
-  bool get isPrivate => _isPrivate(simpleName);
-
   bool get isStatic => _variable.modifiers.isStatic();
 
   bool get isFinal => _variable.modifiers.isFinal();
 
   bool get isConst => _variable.modifiers.isConst();
 
   TypeMirror get type => _convertTypeToTypeMirror(system,
       _variable.computeType(system.compiler),
       system.compiler.types.dynamicType);
 
   SourceLocation get location {
     var script = _variable.getCompilationUnit().script;
     var node = _variable.variables.parseNode(_diagnosticListener);
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }