Attachment #193917 for bug #343562

View | Details | Raw Unified | Return to bug 343562
Collapse All | Expand All




import org.eclipse.emf.ecore.impl.EOperationImpl;
import org.eclipse.emf.ecore.util.*;

import org.eclipse.jem.internal.java.adapters.*;
import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
import org.eclipse.jem.java.*;

/**

			case JavaRefPackage.METHOD__PARAMETERS:
				return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
			case JavaRefPackage.METHOD__JAVA_CLASS:
				JavaClass newContainer = null;
				ReadAdaptor readAdaptor = getReadAdapter();
				if (readAdaptor instanceof JavaReflectionAdaptor && otherEnd instanceof JavaClass)
				{
					newContainer = ((JavaReflectionAdaptor)readAdaptor).createJavaClassRef(((JavaClass)otherEnd).getJavaName());
				}
				return basicSetJavaClass(newContainer, msgs);
		}
		return super.eInverseRemove(otherEnd, featureID, msgs);
	}

Lines 148-154 Link Here

(-)workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java (-1 / +6 lines)
148	return result;	148	return result;
149	}	149	}
150	private static boolean needsToResolveName(IType type, String simpleName, boolean isForReflection) {	150	private static boolean needsToResolveName(IType type, String simpleName, boolean isForReflection) {
151	return !(type.isBinary() \|\| (!isForReflection && simpleName.indexOf(PERIOD) > -1) \|\| isPrimitiveOrVoid(simpleName));	151	boolean retVal = false;
		152	if (type != null)
		153	{
		154	retVal = !(type.isBinary() \|\| (!isForReflection && simpleName.indexOf(PERIOD) > -1) \|\| isPrimitiveOrVoid(simpleName));
		155	}
		156	return retVal;
152	}	157	}
153	/**	158	/**
154	* Returns the qualified name for the simple name within the scope of the type.	159	* Returns the qualified name for the simple name within the scope of the type.

Return to bug 343562

Lines 27-34 Link Here

(-)mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java (-3 / +8 lines)
27	import org.eclipse.emf.ecore.impl.EOperationImpl;	27	import org.eclipse.emf.ecore.impl.EOperationImpl;
28	import org.eclipse.emf.ecore.util.*;	28	import org.eclipse.emf.ecore.util.*;
29		29
30	import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;	30	import org.eclipse.jem.internal.java.adapters.*;
31	import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
32	import org.eclipse.jem.java.*;	31	import org.eclipse.jem.java.*;
33		32
34	/**	33	/**
Lines 652-658 Link Here
652	case JavaRefPackage.METHOD__PARAMETERS:	651	case JavaRefPackage.METHOD__PARAMETERS:
653	return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);	652	return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
654	case JavaRefPackage.METHOD__JAVA_CLASS:	653	case JavaRefPackage.METHOD__JAVA_CLASS:
655	return basicSetJavaClass(null, msgs);	654	JavaClass newContainer = null;
		655	ReadAdaptor readAdaptor = getReadAdapter();
		656	if (readAdaptor instanceof JavaReflectionAdaptor && otherEnd instanceof JavaClass)
		657	{
		658	newContainer = ((JavaReflectionAdaptor)readAdaptor).createJavaClassRef(((JavaClass)otherEnd).getJavaName());
		659	}
		660	return basicSetJavaClass(newContainer, msgs);
656	}	661	}
657	return super.eInverseRemove(otherEnd, featureID, msgs);	662	return super.eInverseRemove(otherEnd, featureID, msgs);
658	}	663	}