Version 0.8.10.4

dart/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ProxyConditionalAnalysisError.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 13 matching lines @@
  * to find out if the error should actually be reported. In this case, these errors are conditional
  * on the non-existence of an {@code @proxy} annotation.
  * <p>
  * If we have other conditional error codes in the future, we should have this class implement some
  * ConditionalErrorCode so that after resolution, a list of ConditionalErrorCode can be visited
  * instead of multiple lists of *ConditionalErrorCodes.
  */
 public class ProxyConditionalAnalysisError {
 
   /**
-   * The name of the proxy annotation, from the meta pub package.
+   * The name of the proxy annotation, from dart:core.
    */
   private static final String PROXY_ANNOTATION_NAME = "proxy";
 
   /**
-   * The name of the meta library name, from the meta pub package.
-   */
-  private static final String META_LIBRARY_NAME = "meta";
-
-  /**
    * Return {@code true} if the given element represents a class that has the proxy annotation.
    * 
    * @param element the class being tested
    * @return {@code true} if the given element represents a class that has the proxy annotation
    */
   private static boolean classHasProxyAnnotation(Element element) {
     if (element instanceof ClassElement) {
       ClassElement classElement = (ClassElement) element;
       ElementAnnotation[] annotations = classElement.getMetadata();
       for (ElementAnnotation annotation : annotations) {
         Element elementAnnotation = annotation.getElement();
         if (elementAnnotation != null) {
           LibraryElement lib = elementAnnotation.getLibrary();
-          if (elementAnnotation.getName().equals(PROXY_ANNOTATION_NAME) && lib != null
-              && lib.getName().equals(META_LIBRARY_NAME)) {
+          if (lib != null && lib.isDartCore()
+              && elementAnnotation.getName().equals(PROXY_ANNOTATION_NAME)) {
             return true;
           }
         }
       }
     }
     return false;
   }
 
   /**
    * The enclosing {@link ClassElement}, this is what will determine if the error code should, or
@@ skipping 30 matching lines @@
   /**
    * Return {@code true} iff the enclosing class has the proxy annotation.
    * 
    * @return {@code true} iff the enclosing class has the proxy annotation
    */
   public boolean shouldIncludeErrorCode() {
     return !classHasProxyAnnotation(enclosingElement);
   }
 
 }