Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1374)

Unified Diff: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java

Issue 22854024: Rename Identifier.getElement (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: clean-up and fix Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java
diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java
index ed53bc0695212ef6233a22073942e6e7a093a3ec..c24d2843e7aee5cee798b6cecffc5ffac5be87af 100644
--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java
+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/verifier/ErrorVerifier.java
@@ -181,7 +181,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
private static boolean isTypeReference(Expression expr) {
if (expr instanceof Identifier) {
Identifier identifier = (Identifier) expr;
- return identifier.getElement() instanceof ClassElement;
+ return identifier.getStaticElement() instanceof ClassElement;
}
return false;
}
@@ -1027,7 +1027,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
if (constructorInitializer instanceof ConstructorFieldInitializer) {
ConstructorFieldInitializer constructorFieldInitializer = (ConstructorFieldInitializer) constructorInitializer;
SimpleIdentifier fieldName = constructorFieldInitializer.getFieldName();
- Element element = fieldName.getElement();
+ Element element = fieldName.getStaticElement();
if (element instanceof FieldElement) {
FieldElement fieldElement = (FieldElement) element;
INIT_STATE state = fieldElementsMap.get(fieldElement);
@@ -1494,7 +1494,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
//
// Prepare redirected constructor type
//
- ConstructorElement redirectedElement = redirectedNode.getElement();
+ ConstructorElement redirectedElement = redirectedNode.getStaticElement();
if (redirectedElement == null) {
//
// If the element is null, we check for the REDIRECT_TO_MISSING_CONSTRUCTOR case
@@ -1642,7 +1642,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private boolean checkForArgumentDefinitionTestNonParameter(ArgumentDefinitionTest node) {
SimpleIdentifier identifier = node.getIdentifier();
- Element element = identifier.getElement();
+ Element element = identifier.getStaticElement();
if (element != null && !(element instanceof ParameterElement)) {
errorReporter.reportError(
CompileTimeErrorCode.ARGUMENT_DEFINITION_TEST_NON_PARAMETER,
@@ -1815,10 +1815,10 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
// prepare element
Element element = null;
if (expression instanceof Identifier) {
- element = ((Identifier) expression).getElement();
+ element = ((Identifier) expression).getStaticElement();
}
if (expression instanceof PropertyAccess) {
- element = ((PropertyAccess) expression).getPropertyName().getElement();
+ element = ((PropertyAccess) expression).getPropertyName().getStaticElement();
}
// check if element is assignable
if (element instanceof PropertyAccessorElement) {
@@ -2300,7 +2300,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
for (ConstructorInitializer initializer : node.getInitializers()) {
if (initializer instanceof SuperConstructorInvocation) {
SuperConstructorInvocation superInvocation = (SuperConstructorInvocation) initializer;
- ConstructorElement element = superInvocation.getElement();
+ ConstructorElement element = superInvocation.getStaticElement();
if (element.isConst()) {
return false;
}
@@ -2399,7 +2399,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
private boolean checkForConstOrNewWithAbstractClass(InstanceCreationExpression node,
TypeName typeName, InterfaceType type) {
if (type.getElement().isAbstract()) {
- ConstructorElement element = node.getElement();
+ ConstructorElement element = node.getStaticElement();
if (element != null && !element.isFactory()) {
if (((KeywordToken) node.getKeyword()).getKeyword() == Keyword.CONST) {
errorReporter.reportError(StaticWarningCode.CONST_WITH_ABSTRACT_CLASS, typeName);
@@ -2423,7 +2423,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
* @see CompileTimeErrorCode#CONST_WITH_NON_CONST
*/
private boolean checkForConstWithNonConst(InstanceCreationExpression node) {
- ConstructorElement constructorElement = node.getElement();
+ ConstructorElement constructorElement = node.getStaticElement();
if (constructorElement != null && !constructorElement.isConst()) {
errorReporter.reportError(CompileTimeErrorCode.CONST_WITH_NON_CONST, node);
return true;
@@ -2467,7 +2467,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
return false;
}
// should not be a type parameter
- if (name.getElement() instanceof TypeVariableElement) {
+ if (name.getStaticElement() instanceof TypeVariableElement) {
errorReporter.reportError(CompileTimeErrorCode.CONST_WITH_TYPE_PARAMETERS, name);
}
// check type arguments
@@ -2496,7 +2496,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private boolean checkForConstWithUndefinedConstructor(InstanceCreationExpression node) {
// OK if resolved
- if (node.getElement() != null) {
+ if (node.getStaticElement() != null) {
return false;
}
// prepare constructor name
@@ -2768,7 +2768,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private boolean checkForFieldInitializerNotAssignable(ConstructorFieldInitializer node) {
// prepare field element
- Element fieldNameElement = node.getFieldName().getElement();
+ Element fieldNameElement = node.getFieldName().getStaticElement();
if (!(fieldNameElement instanceof FieldElement)) {
return false;
}
@@ -2951,7 +2951,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
return false;
}
// prepare element
- Element element = node.getElement();
+ Element element = node.getStaticElement();
if (!(element instanceof MethodElement || element instanceof PropertyAccessorElement)) {
return false;
}
@@ -3151,7 +3151,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
return false;
}
// prepare member Element
- Element element = name.getElement();
+ Element element = name.getStaticElement();
if (!(element instanceof ExecutableElement)) {
return false;
}
@@ -3623,7 +3623,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private boolean checkForNewWithUndefinedConstructor(InstanceCreationExpression node) {
// OK if resolved
- if (node.getElement() != null) {
+ if (node.getStaticElement() != null) {
return false;
}
// prepare constructor name
@@ -4392,7 +4392,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private boolean checkForStaticAccessToInstanceMember(Expression target, SimpleIdentifier name) {
// prepare member Element
- Element element = name.getElement();
+ Element element = name.getStaticElement();
if (!(element instanceof ExecutableElement)) {
return false;
}
@@ -4797,7 +4797,7 @@ public class ErrorVerifier extends RecursiveASTVisitor<Void> {
*/
private VariableElement getVariableElement(Expression expression) {
if (expression instanceof Identifier) {
- Element element = ((Identifier) expression).getElement();
+ Element element = ((Identifier) expression).getStaticElement();
if (element instanceof VariableElement) {
return (VariableElement) element;
}

Powered by Google App Engine
This is Rietveld 408576698