Bug 502968 - [SysML 1.4][Moka] Conflict between SysML 1.4 and Moka
- papyrusViewStyle isn't a mandatory property
( not present in old diagram)
Change-Id: I9d543c77de3385abf643f40b6d650be9b3783123
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/edit/provider/RemoveAppliedStereotypeCommentEditPolicyProvider.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/edit/provider/RemoveAppliedStereotypeCommentEditPolicyProvider.java
index d5c10f5..bc58b35 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/edit/provider/RemoveAppliedStereotypeCommentEditPolicyProvider.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/internal/edit/provider/RemoveAppliedStereotypeCommentEditPolicyProvider.java
@@ -57,15 +57,17 @@
if (model instanceof View){
View view = (View) model;
PapyrusViewStyle papyrusViewStyle = DiagramUtils.getPapyrusViewStyle(view.getDiagram());
- PapyrusView configuration = papyrusViewStyle.getConfiguration();
- if (configuration != null){
- EList<Category> categories = configuration.getCategories();
- for (Category category : categories) {
- if (ViewpointUtil.SYSML14_CATEGORY_NAME.equals(category.getName())){
- editPart.installEditPolicy(AppliedStereotypeCommentEditPolicy.APPLIED_STEREOTYPE_COMMENT, null);
- }
- }
- }
+ if (papyrusViewStyle != null){
+ PapyrusView configuration = papyrusViewStyle.getConfiguration();
+ if (configuration != null){
+ EList<Category> categories = configuration.getCategories();
+ for (Category category : categories) {
+ if (ViewpointUtil.SYSML14_CATEGORY_NAME.equals(category.getName())){
+ editPart.installEditPolicy(AppliedStereotypeCommentEditPolicy.APPLIED_STEREOTYPE_COMMENT, null);
+ }
+ }
+ }
+ }
}
}
}
