diff options
| author | Stephan Herrmann | 2013-03-14 13:31:57 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2013-03-14 13:31:57 +0000 |
| commit | 396f334c2ff7c977e0f293126ec531997e13ecfd (patch) | |
| tree | b95a92d9feab3903bcd3ed726df14f3b180d061c /org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java | |
| parent | 33409dac2e3c76fa3d586662b269121c5d73c411 (diff) | |
| download | org.eclipse.objectteams-396f334c2ff7c977e0f293126ec531997e13ecfd.tar.gz org.eclipse.objectteams-396f334c2ff7c977e0f293126ec531997e13ecfd.tar.xz org.eclipse.objectteams-396f334c2ff7c977e0f293126ec531997e13ecfd.zip | |
update jdt.core and .tests to I20130313-2000 (4.3 M6)
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java')
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java index 506a1a1ba..0b3660f9c 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,8 @@ * bug 185682 - Increment/decrement operators mark local variables as read * bug 331649 - [compiler][null] consider null annotations for fields * bug 383368 - [compiler][null] syntactic null analysis for field references + * Jesper S Moller - Contributions for + * Bug 378674 - "The method can be declared as static" is wrong *******************************************************************************/ package org.eclipse.jdt.internal.compiler.ast; @@ -195,12 +197,6 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl if (this.receiver.isThis()) { currentScope.resetDeclaringClassMethodStaticFlag(this.binding.declaringClass); } - } else if (this.receiver.isThis()) { - if ((this.receiver.bits & ASTNode.IsImplicitThis) == 0) { - // explicit this receiver, not allowed in static context - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=318682 - currentScope.resetEnclosingMethodStaticFlag(); - } } if (valueRequired || currentScope.compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) { |