diff options
| author | eperico | 2011-06-22 15:11:07 +0000 |
|---|---|---|
| committer | eperico | 2011-06-22 15:11:07 +0000 |
| commit | fa7ae643d4915469d0a8c581ae47f8e76bd11acf (patch) | |
| tree | dbf480595535167fb6fef9924a4fb193ee475c83 /plugins | |
| parent | d016c08afa58b82fa6f51e39870080265b419cec (diff) | |
| download | org.eclipse.papyrus-fa7ae643d4915469d0a8c581ae47f8e76bd11acf.tar.gz org.eclipse.papyrus-fa7ae643d4915469d0a8c581ae47f8e76bd11acf.tar.xz org.eclipse.papyrus-fa7ae643d4915469d0a8c581ae47f8e76bd11acf.zip | |
NEW - bug 350056: [Activity Diagram] Problem with pins synchronization on CallBehavior and CallOperation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=350056
Fixed
Diffstat (limited to 'plugins')
2 files changed, 12 insertions, 4 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.controlmode.umlprofiles/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java b/plugins/uml/org.eclipse.papyrus.controlmode.umlprofiles/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java index 410fc8c9368..c53b1ba7930 100644 --- a/plugins/uml/org.eclipse.papyrus.controlmode.umlprofiles/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java +++ b/plugins/uml/org.eclipse.papyrus.controlmode.umlprofiles/src/org/eclipse/papyrus/controlmode/umlprofiles/providers/UMLValidationProvider.java @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.validation.model.IClientSelector;
@@ -168,8 +169,11 @@ public class UMLValidationProvider { }
if(object instanceof EObject) {
EObject eObj = (EObject)object;
- ResourceSet set = eObj.eResource().getResourceSet();
- return set instanceof ModelSet;
+ Resource resource = eObj.eResource();
+ if (resource != null) {
+ ResourceSet set = resource.getResourceSet();
+ return set instanceof ModelSet;
+ }
}
return false;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/providers/UMLValidationProvider.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/providers/UMLValidationProvider.java index 19b5bfdb0aa..d5d3b0fd189 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/providers/UMLValidationProvider.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/providers/UMLValidationProvider.java @@ -20,6 +20,7 @@ import java.util.List; import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.validation.AbstractModelConstraint;
@@ -183,8 +184,11 @@ public class UMLValidationProvider { // filter for Papyrus editor only
if(object instanceof EObject) {
EObject eObj = (EObject)object;
- ResourceSet set = eObj.eResource().getResourceSet();
- return set instanceof ModelSet;
+ Resource resource = eObj.eResource();
+ if (resource != null) {
+ ResourceSet set = resource.getResourceSet();
+ return set instanceof ModelSet;
+ }
}
return false;
}
|