Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 357552
Collapse All | Expand All

(-)model/org/eclipse/objectteams/otdt/internal/core/CalloutToFieldMapping.java (-2 / +2 lines)
Lines 250-258 Link Here
250 
    }
 250 
    }
251 
    @Override
 251 
    @Override
252 
    protected void getBaseMethodsForHandle(StringBuffer buff) {
 252 
    protected void getBaseMethodsForHandle(StringBuffer buff) {
253 
    	JavaElement.escapeMementoName(buff, this.baseFieldHandle.getSelector());
 253 
    	escapeMementoName(buff, this.baseFieldHandle.getSelector());
254 
    	buff.append(JavaElement.JEM_METHOD);
 254 
    	buff.append(JavaElement.JEM_METHOD);
255 
    	JavaElement.escapeMementoName(buff, this.baseFieldHandle.getFieldType());
 255 
    	escapeMementoName(buff, this.baseFieldHandle.getFieldType());
256 
    }
 256 
    }
257 
    // ==== retreive from memento:
 257 
    // ==== retreive from memento:
258 
    public static IFieldAccessSpec createFieldData(MementoTokenizer memento, boolean isSetter) {
 258 
    public static IFieldAccessSpec createFieldData(MementoTokenizer memento, boolean isSetter) {
(-)model/org/eclipse/objectteams/otdt/internal/core/CallinMapping.java (-2 / +1 lines)
Lines 28-34 Link Here
28 
import org.eclipse.jdt.core.ITypeParameter;
 28 
import org.eclipse.jdt.core.ITypeParameter;
29 
import org.eclipse.jdt.core.JavaModelException;
 29 
import org.eclipse.jdt.core.JavaModelException;
30 
import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
 30 
import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
31 
import org.eclipse.jdt.internal.core.JavaElement;
32 
import org.eclipse.objectteams.otdt.core.ICallinMapping;
 31 
import org.eclipse.objectteams.otdt.core.ICallinMapping;
33 
import org.eclipse.objectteams.otdt.core.IMethodSpec;
 32 
import org.eclipse.objectteams.otdt.core.IMethodSpec;
34 
import org.eclipse.objectteams.otdt.core.IOTType;
 33 
import org.eclipse.objectteams.otdt.core.IOTType;
Lines 98-104 Link Here
98 
    // ==== memento generation: ====
 97 
    // ==== memento generation: ====
99 
    @Override
 98 
    @Override
100 
    protected void getNameForHandle(StringBuffer buff) {
 99 
    protected void getNameForHandle(StringBuffer buff) {
101 
   		JavaElement.escapeMementoName(buff, this.name);
 100 
   		escapeMementoName(buff, this.name);
102 
   		buff.append(OTJavaElement.OTEM_METHODMAPPING);
 101 
   		buff.append(OTJavaElement.OTEM_METHODMAPPING);
103 
    }
 102 
    }
104 
    protected char getMappingKindChar() {
 103 
    protected char getMappingKindChar() {
(-)model/org/eclipse/objectteams/otdt/internal/core/MethodMapping.java (-3 / +3 lines)
Lines 159-172 Link Here
159 
    abstract protected void getBaseMethodsForHandle(StringBuffer buff);
 159 
    abstract protected void getBaseMethodsForHandle(StringBuffer buff);
160
160
161 
    protected void getMethodForHandle(IMethodSpec method, StringBuffer buff) {
 161 
    protected void getMethodForHandle(IMethodSpec method, StringBuffer buff) {
162 
    	JavaElement.escapeMementoName(buff, method.getSelector());
 162 
    	escapeMementoName(buff, method.getSelector());
163 
    	if (this.hasSignature) {
 163 
    	if (this.hasSignature) {
164 
    		for (String argType : method.getArgumentTypes()) {
 164 
    		for (String argType : method.getArgumentTypes()) {
165 
    			buff.append(JavaElement.JEM_METHOD);
 165 
    			buff.append(JavaElement.JEM_METHOD);
166 
    			JavaElement.escapeMementoName(buff, argType);
 166 
    			escapeMementoName(buff, argType);
167 
    		}
 167 
    		}
168 
    		buff.append(JavaElement.JEM_METHOD);
 168 
    		buff.append(JavaElement.JEM_METHOD);
169 
    		JavaElement.escapeMementoName(buff, method.getReturnType());
 169 
    		escapeMementoName(buff, method.getReturnType());
170 
    	}
 170 
    	}
171 
    	buff.append(OTJavaElement.OTEM_METHODMAPPING);
 171 
    	buff.append(OTJavaElement.OTEM_METHODMAPPING);
172 
    }
 172 
    }
(-)model/org/eclipse/jdt/internal/core/JavaElement.java (-3 / +2 lines)
Lines 130-138 Link Here
130 
		return getElementName().equals(other.getElementName()) &&
 130 
		return getElementName().equals(other.getElementName()) &&
131 
				this.parent.equals(other.parent);
 131 
				this.parent.equals(other.parent);
132 
	}
 132 
	}
133 
//{ObjectTeams: was protected non-static
 133 

            

            

              134
              
	public static void escapeMementoName(StringBuffer buffer, String mementoName) {


              134
              
	protected void escapeMementoName(StringBuffer buffer, String mementoName) {

            

            

              135
              
// SH}


              
              
            

        

          136
          
		for (int i = 0, length = mementoName.length(); i < length; i++) {

          135
          
		for (int i = 0, length = mementoName.length(); i < length; i++) {

        

        

          137
          
			char character = mementoName.charAt(i);

          136
          
			char character = mementoName.charAt(i);

        

        

          138
          
			switch (character) {

          137
          
			switch (character) {

        






  

  Return to bug 357552