diff options
Diffstat (limited to 'plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java')
-rw-r--r-- | plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java index ddecbff759b..513df2b5aae 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java @@ -27,7 +27,6 @@ import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticAdapter; //bugs.eclipse.org/bugs/show_bug.cgi?id=432824 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes; @@ -97,20 +96,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider { if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) { return true; } - // ///////////////////////////////////////////////////////////////////// - // Test possibility to provide a view based on the semantic nature and its expected container. - // ///////////////////////////////////////////////////////////////////// - // IElementType may be an extended type. Check for a view based on this element type - if (elementType instanceof IExtendedHintedElementType) { - EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class); - String domainElementGraphicalType = op.getSemanticHint(); - if (domainElementGraphicalType == null) { - domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement); - } - if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) { - return true; - } - } + // IElementType may be null (especially when drop from ModelExplorer). // In such a case, test the semantic EObject instead. if (elementType == null) { @@ -162,22 +148,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider { return true; } } - // ///////////////////////////////////////////////////////////////////// - // Test possibility to provide a view based on the semantic nature and its expected container. - // ///////////////////////////////////////////////////////////////////// - // IElementType may be an extended type. Check for a view based on this element type - if (elementType instanceof IExtendedHintedElementType) { - EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class); - String domainElementGraphicalType = op.getSemanticHint(); - if (domainElementGraphicalType == null) { - domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType); - } else { - domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType); - } - if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) { - return true; - } - } + // IElementType may be null (especially when drop from ModelExplorer). // In such a case, test the semantic EObject instead. |