aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2017-10-13 10:39:44 -0400
committerVincent Lorenzo2017-10-13 10:39:47 -0400
commitf7a646f5bb66bf67f2e43bd0f94fac42675c22f7 (patch)
tree8e96372d7ce606bf1fd5b65e4c3c4dd1dac7118c
parentaa5965d36db33a4524608d7f961001c26c2aaf6e (diff)
downloadorg.eclipse.papyrus-f7a646f5bb66bf67f2e43bd0f94fac42675c22f7.zip
org.eclipse.papyrus-f7a646f5bb66bf67f2e43bd0f94fac42675c22f7.tar.gz
org.eclipse.papyrus-f7a646f5bb66bf67f2e43bd0f94fac42675c22f7.tar.xz
Bug 517441: [Table][Matrix][Properties view] Some errors and exception occured when using Matrix properties view
https://bugs.eclipse.org/bugs/show_bug.cgi?id=517441 Change-Id: I6dd760399e92443dfa826e334e9c0f0636b810a0 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/src/org/eclipse/papyrus/uml/nattable/properties/modelelements/GenericUMLRelationshipMatrixFactory.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/src/org/eclipse/papyrus/uml/nattable/properties/modelelements/GenericUMLRelationshipMatrixFactory.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/src/org/eclipse/papyrus/uml/nattable/properties/modelelements/GenericUMLRelationshipMatrixFactory.java
index 1013fad..6317d95 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/src/org/eclipse/papyrus/uml/nattable/properties/modelelements/GenericUMLRelationshipMatrixFactory.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/src/org/eclipse/papyrus/uml/nattable/properties/modelelements/GenericUMLRelationshipMatrixFactory.java
@@ -71,9 +71,11 @@ public class GenericUMLRelationshipMatrixFactory extends EMFModelElementFactory
}
// this manager is the manager of the current table editor. It already has been checked by the constraint {@link IsGenericUMLRelationshipMatrix}
final IMatrixTableWidgetManager manager = MatrixHelper.getMatrixTableWidgetModelManagerFromCurrentEditor();
- final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(manager.getTable());
- if (null != manager && null != domain) {
- return new GenericUMLRelationshipMatrixModelElement(manager, domain);
+ if (null != manager) {
+ final TransactionalEditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(manager.getTable());
+ if (null != domain) {
+ return new GenericUMLRelationshipMatrixModelElement(manager, domain);
+ }
}
return super.doCreateFromSource(sourceElement, context);