Attachment 203297 Details for Bug 357552 – fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] fix

Bug_357552.patch (text/plain), 3.77 KB, created by Stephan Herrmann

on 2011-09-13 16:01:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2011-09-13 16:01:57 EDT

Size: 3.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/objectteams/otdt/internal/core/CalloutToFieldMapping.java
>===================================================================
>--- model/org/eclipse/objectteams/otdt/internal/core/CalloutToFieldMapping.java	(revision 1867)
>+++ model/org/eclipse/objectteams/otdt/internal/core/CalloutToFieldMapping.java	(working copy)
>@@ -250,9 +250,9 @@
>     }
>     @Override
>     protected void getBaseMethodsForHandle(StringBuffer buff) {
>-    	JavaElement.escapeMementoName(buff, this.baseFieldHandle.getSelector());
>+    	escapeMementoName(buff, this.baseFieldHandle.getSelector());
>     	buff.append(JavaElement.JEM_METHOD);
>-    	JavaElement.escapeMementoName(buff, this.baseFieldHandle.getFieldType());
>+    	escapeMementoName(buff, this.baseFieldHandle.getFieldType());
>     }
>     // ==== retreive from memento:
>     public static IFieldAccessSpec createFieldData(MementoTokenizer memento, boolean isSetter) {
>Index: model/org/eclipse/objectteams/otdt/internal/core/CallinMapping.java
>===================================================================
>--- model/org/eclipse/objectteams/otdt/internal/core/CallinMapping.java	(revision 1867)
>+++ model/org/eclipse/objectteams/otdt/internal/core/CallinMapping.java	(working copy)
>@@ -28,7 +28,6 @@
> import org.eclipse.jdt.core.ITypeParameter;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
>-import org.eclipse.jdt.internal.core.JavaElement;
> import org.eclipse.objectteams.otdt.core.ICallinMapping;
> import org.eclipse.objectteams.otdt.core.IMethodSpec;
> import org.eclipse.objectteams.otdt.core.IOTType;
>@@ -98,7 +97,7 @@
>     // ==== memento generation: ====
>     @Override
>     protected void getNameForHandle(StringBuffer buff) {
>-   		JavaElement.escapeMementoName(buff, this.name);
>+   		escapeMementoName(buff, this.name);
>    		buff.append(OTJavaElement.OTEM_METHODMAPPING);
>     }
>     protected char getMappingKindChar() {
>Index: model/org/eclipse/objectteams/otdt/internal/core/MethodMapping.java
>===================================================================
>--- model/org/eclipse/objectteams/otdt/internal/core/MethodMapping.java	(revision 1867)
>+++ model/org/eclipse/objectteams/otdt/internal/core/MethodMapping.java	(working copy)
>@@ -159,14 +159,14 @@
>     abstract protected void getBaseMethodsForHandle(StringBuffer buff);
> 	
>     protected void getMethodForHandle(IMethodSpec method, StringBuffer buff) {
>-    	JavaElement.escapeMementoName(buff, method.getSelector());
>+    	escapeMementoName(buff, method.getSelector());
>     	if (this.hasSignature) {
>     		for (String argType : method.getArgumentTypes()) {
>     			buff.append(JavaElement.JEM_METHOD);
>-    			JavaElement.escapeMementoName(buff, argType);
>+    			escapeMementoName(buff, argType);
>     		}
>     		buff.append(JavaElement.JEM_METHOD);
>-    		JavaElement.escapeMementoName(buff, method.getReturnType());
>+    		escapeMementoName(buff, method.getReturnType());
>     	}
>     	buff.append(OTJavaElement.OTEM_METHODMAPPING);
>     }
>Index: model/org/eclipse/jdt/internal/core/JavaElement.java
>===================================================================
>--- model/org/eclipse/jdt/internal/core/JavaElement.java	(revision 1867)
>+++ model/org/eclipse/jdt/internal/core/JavaElement.java	(working copy)
>@@ -130,9 +130,8 @@
> 		return getElementName().equals(other.getElementName()) &&
> 				this.parent.equals(other.parent);
> 	}
>-//{ObjectTeams: was protected non-static
>-	public static void escapeMementoName(StringBuffer buffer, String mementoName) {
>-// SH}
>+
>+	protected void escapeMementoName(StringBuffer buffer, String mementoName) {
> 		for (int i = 0, length = mementoName.length(); i < length; i++) {
> 			char character = mementoName.charAt(i);
> 			switch (character) {

Actions: View | Diff

Attachments on bug 357552: 203297