package:observe fix various api issues

pkg/observe/lib/transform.dart

 // Copyright (c) 2013, 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.
 
 /**
  * Code transform for @observable. The core transformation is relatively
  * straightforward, and essentially like an editor refactoring.
  */
 library observe.transform;
 
@@ skipping 120 matching lines @@
         span: _getSpan(file, cls));
   }
 
   // We'd like to track whether observable was declared explicitly, otherwise
   // report a warning later below. Because we don't have type analysis (only
   // syntactic understanding of the code), we only report warnings that are
   // known to be true.
   var declaresObservable = false;
   if (cls.extendsClause != null) {
     var id = _getSimpleIdentifier(cls.extendsClause.superclass.name);
-    if (id.name == 'ObservableBase') {
-      code.edit(id.offset, id.end, 'ChangeNotifierBase');
+    if (id.name == 'Observable') {
+      code.edit(id.offset, id.end, 'ChangeNotifier');
       declaresObservable = true;
-    } else if (id.name == 'ChangeNotifierBase') {
+    } else if (id.name == 'ChangeNotifier') {
       declaresObservable = true;
     } else if (id.name != 'HtmlElement' && id.name != 'CustomElement'
         && id.name != 'Object') {
       // TODO(sigmund): this is conservative, consider using type-resolution to
       // improve this check.
       declaresObservable = true;
     }
   }
 
   if (cls.withClause != null) {
     for (var type in cls.withClause.mixinTypes) {
       var id = _getSimpleIdentifier(type.name);
-      if (id.name == 'ObservableMixin') {
-        code.edit(id.offset, id.end, 'ChangeNotifierMixin');
+      if (id.name == 'Observable') {
+        code.edit(id.offset, id.end, 'ChangeNotifier');
         declaresObservable = true;
         break;
-      } else if (id.name == 'ChangeNotifierMixin') {
+      } else if (id.name == 'ChangeNotifier') {
         declaresObservable = true;
         break;
       } else {
         // TODO(sigmund): this is conservative, consider using type-resolution
         // to improve this check.
         declaresObservable = true;
       }
     }
   }
 
@@ skipping 15 matching lines @@
           logger.warning('Static fields can no longer be observable. '
               'Observable fields should be put in an observable objects.',
               span: _getSpan(file, member));
         }
         continue;
       }
       if (_hasObservable(member)) {
         if (!declaresObservable) {
           logger.warning('Observable fields should be put in an observable '
               'objects. Please declare that this class extends from '
-              'ObservableBase, includes ObservableMixin, or implements '
+              'Observable, includes Observable, or implements '
               'Observable.',
               span: _getSpan(file, member));
         }
         _transformFields(file, member, code, logger);
 
         var names = member.fields.variables.map((v) => v.name.name);
 
         getters.addAll(names);
         if (!_isReadOnly(member.fields)) {
           setters.addAll(names);
@@ skipping 174 matching lines @@
 
 Token _findFieldSeperator(Token token) {
   while (token != null) {
     if (token.type == TokenType.COMMA || token.type == TokenType.SEMICOLON) {
       break;
     }
     token = token.next;
   }
   return token;
 }