diff options
author | Stephan Herrmann | 2010-05-05 07:35:22 +0000 |
---|---|---|
committer | Stephan Herrmann | 2010-05-05 07:35:22 +0000 |
commit | 6aca7cff7e9e9904a5478422a91ab4fa1b8751b5 (patch) | |
tree | b0ce035520a1d6b249ec1c011accf6029bbdf3bb | |
parent | 0e873de88881e373b3a4fdad6c764b813383d9c0 (diff) | |
download | org.eclipse.objectteams-6aca7cff7e9e9904a5478422a91ab4fa1b8751b5.tar.gz org.eclipse.objectteams-6aca7cff7e9e9904a5478422a91ab4fa1b8751b5.tar.xz org.eclipse.objectteams-6aca7cff7e9e9904a5478422a91ab4fa1b8751b5.zip |
Fix regression in OTJavaTypeSearchTests#testRoleReferenceInPredicate
- need to be able to find guard predicate in Java Model.
-rw-r--r-- | org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementNotifier.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementNotifier.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementNotifier.java index abd8419fe..2a4091003 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementNotifier.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/SourceElementNotifier.java @@ -59,6 +59,7 @@ import org.eclipse.objectteams.otdt.internal.core.compiler.ast.AbstractMethodMap import org.eclipse.objectteams.otdt.internal.core.compiler.ast.CallinMappingDeclaration; import org.eclipse.objectteams.otdt.internal.core.compiler.ast.CalloutMappingDeclaration; import org.eclipse.objectteams.otdt.internal.core.compiler.ast.FieldAccessSpec; +import org.eclipse.objectteams.otdt.internal.core.compiler.ast.GuardPredicateDeclaration; import org.eclipse.objectteams.otdt.internal.core.compiler.ast.LiftingTypeReference; import org.eclipse.objectteams.otdt.internal.core.compiler.ast.MethodSpec; import org.eclipse.objectteams.otdt.internal.core.compiler.statemachine.transformer.MethodSignatureEnhancer; @@ -989,7 +990,8 @@ protected void notifySourceElementRequestor(TypeDeclaration typeDeclaration, boo case 1 : methodIndex++; //{ObjectTeams: don't convert generated methods: - if (nextMethodDeclaration.isGenerated) break; + if (nextMethodDeclaration.isGenerated && !(nextMethodDeclaration instanceof GuardPredicateDeclaration)) + break; // SH} notifySourceElementRequestor(nextMethodDeclaration, typeDeclaration, currentPackage); break; |