Version 1.8.0-dev.4.2
svn merge -c 41788 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@41793 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/pkg/docgen/lib/src/models/class.dart b/pkg/docgen/lib/src/models/class.dart
index 07cfb81..f323eb5 100644
--- a/pkg/docgen/lib/src/models/class.dart
+++ b/pkg/docgen/lib/src/models/class.dart
@@ -168,7 +168,7 @@
/// If [this] is private (or an intermediary mixin class), it will add the
/// subclass to the list of subclasses in the superclasses.
void addSubclass(Class subclass) {
- if (docName == 'dart-core.Object') return;
+ if (docName == 'dart:core.Object') return;
if (!includePrivateMembers && isPrivate || mirror.isNameSynthetic) {
if (_superclass != null) _superclass.addSubclass(subclass);
@@ -182,8 +182,8 @@
/// Check if this [Class] is an error or exception.
bool isError() {
- if (qualifiedName == 'dart-core.Error' ||
- qualifiedName == 'dart-core.Exception')
+ if (qualifiedName == 'dart:core.Error' ||
+ qualifiedName == 'dart:core.Exception')
return true;
for (var interface in interfaces) {
if (interface.isError()) return true;
@@ -215,7 +215,7 @@
/// If a class extends a private superclass, find the closest public
/// superclass of the private superclass.
String validSuperclass() {
- if (_superclass == null) return 'dart-core.Object';
+ if (_superclass == null) return 'dart:core.Object';
if (_superclass.isVisible) return _superclass.qualifiedName;
return _superclass.validSuperclass();
}
diff --git a/pkg/docgen/lib/src/models/doc_gen_type.dart b/pkg/docgen/lib/src/models/doc_gen_type.dart
index 15fd51d..47fc99b 100644
--- a/pkg/docgen/lib/src/models/doc_gen_type.dart
+++ b/pkg/docgen/lib/src/models/doc_gen_type.dart
@@ -20,25 +20,25 @@
/// For example:
/// int size()
/// "return" :
-/// - "outer" : "dart-core.int"
+/// - "outer" : "dart:core.int"
/// "inner" :
///
/// List<String> toList()
/// "return" :
-/// - "outer" : "dart-core.List"
+/// - "outer" : "dart:core.List"
/// "inner" :
-/// - "outer" : "dart-core.String"
+/// - "outer" : "dart:core.String"
/// "inner" :
///
/// Map<String, List<int>>
/// "return" :
-/// - "outer" : "dart-core.Map"
+/// - "outer" : "dart:core.Map"
/// "inner" :
-/// - "outer" : "dart-core.String"
+/// - "outer" : "dart:core.String"
/// "inner" :
-/// - "outer" : "dart-core.List"
+/// - "outer" : "dart:core.List"
/// "inner" :
-/// - "outer" : "dart-core.int"
+/// - "outer" : "dart:core.int"
/// "inner" :
class DocGenType extends MirrorBased {
final TypeMirror mirror;
diff --git a/tools/VERSION b/tools/VERSION
index ffab7bc..9146f20 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 8
PATCH 0
PRERELEASE 4
-PRERELEASE_PATCH 1
+PRERELEASE_PATCH 2
