Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2011-03-02 08:33:43 +0000
committerStephan Herrmann2011-03-02 08:33:43 +0000
commit51786b525815d371de6393d05fd23452e731650f (patch)
treea89ced946c57da62a9d30ef28a8de677cf299681
parent88eb15ff1d8140c9bad4217d55f67b56b0234d09 (diff)
downloadorg.eclipse.objectteams-51786b525815d371de6393d05fd23452e731650f.tar.gz
org.eclipse.objectteams-51786b525815d371de6393d05fd23452e731650f.tar.xz
org.eclipse.objectteams-51786b525815d371de6393d05fd23452e731650f.zip
tentative fix in new method for regressions all over the place.
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
index c64c99f2d..9bd4a078a 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java
@@ -58,6 +58,7 @@ import org.eclipse.objectteams.otdt.core.OTModelManager;
import org.eclipse.objectteams.otdt.internal.core.MappingElementInfo;
import org.eclipse.objectteams.otdt.internal.core.MethodMapping;
import org.eclipse.objectteams.otdt.internal.core.SourceMethodMappingInfo;
+import org.eclipse.objectteams.otdt.internal.core.compiler.statemachine.transformer.MethodSignatureEnhancer;
import org.eclipse.objectteams.otdt.internal.core.util.FieldData;
import org.eclipse.objectteams.otdt.internal.core.util.MethodData;
@@ -460,7 +461,13 @@ private SourceMethodElementInfo createMethodInfo(MethodInfo methodInfo, SourceMe
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=334783
// Process the parameter annotations from the arguments
if (methodInfo.node != null && methodInfo.node.arguments != null) {
- info.arguments = acceptMethodParameters(methodInfo.node.arguments, handle, methodInfo);
+//{ObjectTeams: don't expose enhancement args:
+/* orig:
+ info.arguments = acceptMethodParameters(methodInfo.node.arguments, handle, methodInfo);
+ :giro */
+ Argument[] sourceArguments = MethodSignatureEnhancer.getSourceArguments(methodInfo.node);
+ info.arguments = acceptMethodParameters(sourceArguments, handle, methodInfo);
+// SH}
}
return info;
}

Back to the top