View | Details | Raw Unified | Return to bug 343558 | Differences between
and this patch

Collapse All | Expand All

(-)workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java (-1 / +6 lines)
Lines 148-154 Link Here
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.
(-)mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java (-3 / +8 lines)
Lines 44-51 Link Here
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
			}

Return to bug 343558