Attachment 197305 Details for Bug 343558 – Keep the current Methods "valid", and add a null check

[patch] Keep the current Methods "valid", and add a null check

jemERbug155pTry3a.txt (text/plain), 4.44 KB, created by Carl Anderson

on 2011-06-03 10:21:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2011-06-03 10:21:56 EDT

Size: 4.44 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jem.workbench
>Index: workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java,v
>retrieving revision 1.8
>diff -u -r1.8 JDOMSearchHelper.java
>--- workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java	17 May 2006 20:13:58 -0000	1.8
>+++ workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java	3 Jun 2011 14:20:18 -0000
>@@ -148,7 +148,12 @@
> 		return result;
> 	}
> 	private static boolean needsToResolveName(IType type, String simpleName, boolean isForReflection) {
>-		return !(type.isBinary() || (!isForReflection && simpleName.indexOf(PERIOD) > -1) || isPrimitiveOrVoid(simpleName));
>+		boolean retVal = false;
>+		if (type != null)
>+		{
>+			retVal = !(type.isBinary() || (!isForReflection && simpleName.indexOf(PERIOD) > -1) || isPrimitiveOrVoid(simpleName));
>+		}
>+		return retVal;
> 	}
> 	/**
> 	 * Returns the qualified name for the simple name within the scope of the type.
>#P org.eclipse.jem
>Index: mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 MethodImpl.java
>--- mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java	15 Sep 2005 20:28:03 -0000	1.2
>+++ mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java	3 Jun 2011 14:20:22 -0000
>@@ -44,8 +44,7 @@
> import org.eclipse.jem.java.Method;
> 
> 
>-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
>-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
>+import org.eclipse.jem.internal.java.adapters.*;
> 
> /**
>  * @generated
>@@ -1043,7 +1042,13 @@
> 				case JavaRefPackage.METHOD__PARAMETERS:
> 					return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
> 				case JavaRefPackage.METHOD__JAVA_CLASS:
>-					return eBasicSetContainer(null, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
>+					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);
> 			}
>@@ -1129,5 +1134,23 @@
> 		return eDynamicGet(eFeature, resolve);
> 	}
> 
>+	/**
>+	   * 
>+	   * 
>+	   */
>+	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);
>+	  }
>+
> }
> 
>Index: mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java,v
>retrieving revision 1.4.6.1
>diff -u -r1.4.6.1 JavaClassImpl.java
>--- mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java	1 Oct 2009 22:01:28 -0000	1.4.6.1
>+++ mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java	3 Jun 2011 14:20:22 -0000
>@@ -255,7 +255,15 @@
> 
> 	protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {
> 		Iterator it1, it2;
>-		it2 = getExtendedLookupIterator();
>+		// copy over the contents
>+		List extendedLookupClasses = new ArrayList();
>+		EList extendedLookupEList = null;
>+		if (isInterface())
>+			extendedLookupEList = getImplementsInterfaces();
>+		else
>+			extendedLookupEList = getESuperTypes();
>+		extendedLookupClasses.addAll(extendedLookupEList);
>+		it2 = extendedLookupClasses.iterator();
> 		JavaClassImpl javaClass;
> 		while (it2.hasNext()) {
> 			javaClass = (JavaClassImpl) it2.next();

Actions: View | Diff

Attachments on bug 343558: 193836 | 197303 | 197305