Skip to content

Commit 2894856

Browse files
authored
Prevent NPE if a modelelement doesn't have an eResource (#214)
Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>
1 parent ae1849b commit 2894856

File tree

1 file changed

+4
-0
lines changed
  • framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader

1 file changed

+4
-0
lines changed

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DebugPermissionAuthority.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,28 @@ public void allow(ResourceSet rs, boolean allow) {
4949

5050
@Override
5151
public boolean canEditFeature(EObject eObj, String featureName) {
52+
if(eObj.eResource() == null) return true;
5253
Integer integer = allow.get(eObj.eResource().getResourceSet());
5354
return integer != null && integer.intValue() > 0;
5455
}
5556

5657
@Override
5758
public boolean canEditInstance(EObject eObj) {
59+
if(eObj.eResource() == null) return true;
5860
Integer integer = allow.get(eObj.eResource().getResourceSet());
5961
return integer != null && integer.intValue() > 0;
6062
}
6163

6264
@Override
6365
public boolean canCreateIn(EObject eObj) {
66+
if(eObj.eResource() == null) return true;
6467
Integer integer = allow.get(eObj.eResource().getResourceSet());
6568
return integer != null && integer.intValue() > 0;
6669
}
6770

6871
@Override
6972
public boolean canDeleteInstance(EObject target) {
73+
if(target.eResource() == null) return true;
7074
Integer integer = allow.get(target.eResource().getResourceSet());
7175
return integer != null && integer.intValue() > 0;
7276
}

0 commit comments

Comments
 (0)