Attachment #197303 for bug #343558

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.

Lines 61-67 Link Here

(-)workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java (-1 / +2 lines)
61	super.start(context);	61	super.start(context);
62	INSTANCE = this;	62	INSTANCE = this;
63	JavaContext.setReflectionAdapterFactoryClass(JavaJDOMAdapterFactory.class);	63	JavaContext.setReflectionAdapterFactoryClass(JavaJDOMAdapterFactory.class);
64	JEMUtilPlugin.getPluginResourceSet().getAdapterFactories().add(new JavaJDKAdapterFactory());	64	JEMUtilPlugin.getPluginResourceSet().getAdapterFactories().add(new JavaJDKAdapterFactory());
		65	System.out.println("org.eclipse.jem.workbench_1.2.6.v200910300330patched0418.jar was loaded");
65	}	66	}
66		67
67	}	68	}




import org.eclipse.jem.java.Method;


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

/**
 * @generated

				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 eBasicSetContainer((InternalEObject)newContainer, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
				default:
					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
			}

		return eDynamicGet(eFeature, resolve);
	}

	/**
	   * <!-- begin-user-doc -->
	   * <!-- end-user-doc -->
	   */
	public void setEType(EClassifier newEType)
	{
		EClassifier newContainer = newEType;
		if (eType != null && newEType == null)
		{
			ReadAdaptor readAdaptor = getReadAdapter();
			if (readAdaptor instanceof JavaReflectionAdaptor)
			{
				newContainer = ((JavaReflectionAdaptor)readAdaptor).createJavaClassRef(((JavaHelpers)eType).getJavaName());
			}
		}
	    super.setEType(newContainer);
	  }

}


Lines 255-261 Link Here

(-)mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java (-1 / +9 lines)
255		255
256	protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {	256	protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {
257	Iterator it1, it2;	257	Iterator it1, it2;
258	it2 = getExtendedLookupIterator();	258	// copy over the contents
		259	List extendedLookupClasses = new ArrayList();
		260	EList extendedLookupEList = null;
		261	if (isInterface())
		262	extendedLookupEList = getImplementsInterfaces();
		263	else
		264	extendedLookupEList = getESuperTypes();
		265	extendedLookupClasses.addAll(extendedLookupEList);
		266	it2 = extendedLookupClasses.iterator();
259	JavaClassImpl javaClass;	267	JavaClassImpl javaClass;
260	while (it2.hasNext()) {	268	while (it2.hasNext()) {
261	javaClass = (JavaClassImpl) it2.next();	269	javaClass = (JavaClassImpl) it2.next();

Lines 47-53 Link Here

(-)mofjava/org/eclipse/jem/internal/core/JEMPlugin.java (-1 / +2 lines)
47	*/	47	*/
48	public void start(BundleContext context) throws Exception {	48	public void start(BundleContext context) throws Exception {
49	super.start(context);	49	super.start(context);
50	logger = EclipseLogger.getEclipseLogger(this);	50	logger = EclipseLogger.getEclipseLogger(this);
		51	System.out.println("org.eclipse.jem_1.2.4.v200910020100patched0520.jar was loaded");
51	}	52	}
52		53
53	public Logger getLogger() {	54	public Logger getLogger() {

Return to bug 343558

Lines 44-51 Link Here

(-)mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java (-3 / +26 lines)
44	import org.eclipse.jem.java.Method;	44	import org.eclipse.jem.java.Method;
45		45
46		46
47	import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;	47	import org.eclipse.jem.internal.java.adapters.*;
48	import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
49		48
50	/**	49	/**
51	* @generated	50	* @generated
Lines 1043-1049 Link Here
1043	case JavaRefPackage.METHOD__PARAMETERS:	1042	case JavaRefPackage.METHOD__PARAMETERS:
1044	return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);	1043	return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
1045	case JavaRefPackage.METHOD__JAVA_CLASS:	1044	case JavaRefPackage.METHOD__JAVA_CLASS:
1046	return eBasicSetContainer(null, JavaRefPackage.METHOD__JAVA_CLASS, msgs);	1045	JavaClass newContainer = null;
		1046	ReadAdaptor readAdaptor = getReadAdapter();
		1047	if (readAdaptor instanceof JavaReflectionAdaptor && otherEnd instanceof JavaClass)
		1048	{
		1049	newContainer = ((JavaReflectionAdaptor)readAdaptor).createJavaClassRef(((JavaClass)otherEnd).getJavaName());
		1050	}
		1051	return eBasicSetContainer((InternalEObject)newContainer, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
1047	default:	1052	default:
1048	return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);	1053	return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
1049	}	1054	}
Lines 1129-1133 Link Here
1129	return eDynamicGet(eFeature, resolve);	1134	return eDynamicGet(eFeature, resolve);
1130	}	1135	}
1131		1136
		1137	/**
		1138	* <!-- begin-user-doc -->
		1139	* <!-- end-user-doc -->
		1140	*/
		1141	public void setEType(EClassifier newEType)
		1142	{
		1143	EClassifier newContainer = newEType;
		1144	if (eType != null && newEType == null)
		1145	{
		1146	ReadAdaptor readAdaptor = getReadAdapter();
		1147	if (readAdaptor instanceof JavaReflectionAdaptor)
		1148	{
		1149	newContainer = ((JavaReflectionAdaptor)readAdaptor).createJavaClassRef(((JavaHelpers)eType).getJavaName());
		1150	}
		1151	}
		1152	super.setEType(newContainer);
		1153	}
		1154
1132	}	1155	}
1133		1156