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

(-)src/org/eclipse/gmf/gmfgraph/provider/CanvasItemProvider.java (-2 / +14 lines)
Lines 15-20 Link Here
15
import org.eclipse.emf.common.notify.AdapterFactory;
15
import org.eclipse.emf.common.notify.AdapterFactory;
16
import org.eclipse.emf.common.notify.Notification;
16
import org.eclipse.emf.common.notify.Notification;
17
import org.eclipse.emf.common.util.ResourceLocator;
17
import org.eclipse.emf.common.util.ResourceLocator;
18
import org.eclipse.emf.ecore.EClass;
19
import org.eclipse.emf.ecore.EObject;
18
import org.eclipse.emf.ecore.EStructuralFeature;
20
import org.eclipse.emf.ecore.EStructuralFeature;
19
import org.eclipse.emf.edit.command.CommandParameter;
21
import org.eclipse.emf.edit.command.CommandParameter;
20
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
22
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
Lines 232-240 Link Here
232
	}
234
	}
233
235
234
	private static boolean equalsChildParameters(CommandParameter first, CommandParameter second){
236
	private static boolean equalsChildParameters(CommandParameter first, CommandParameter second){
235
		return first.getFeature().equals(second.getFeature()) && first.getValue().equals(second.getValue());
237
		if (!first.getFeature().equals(second.getFeature())){
238
			return false;
239
		}
240
		assert first.getValue() instanceof EObject;
241
		assert second.getValue() instanceof EObject;
242
		
243
		EClass firstEClass = ((EObject)first.getValue()).eClass();
244
		EClass secondEClass = ((EObject)second.getValue()).eClass();
245
		
246
		assert firstEClass.getEPackage().getNsURI().equals(secondEClass.getEPackage().getNsURI());
247
		return firstEClass.getClassifierID() == secondEClass.getClassifierID(); 
236
	}
248
	}
237
249
	
238
	/**
250
	/**
239
	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
251
	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
240
	 * <!-- begin-user-doc -->
252
	 * <!-- begin-user-doc -->

Return to bug 143222