Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-04-18 04:23:09 -0400
committerGerrit Code Review @ Eclipse.org2016-04-19 09:10:07 -0400
commit74277e4e464813a72120e2f3e1c320eca04a51f2 (patch)
tree3a71f39f7d7a1c0dad7d8de281f7cb9d7fd531f2 /plugins/sysml
parent4ea6b237f5db0dc206ce1f239c9bd93d38126aa5 (diff)
downloadorg.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.tar.gz
org.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.tar.xz
org.eclipse.papyrus-74277e4e464813a72120e2f3e1c320eca04a51f2.zip
Bug 491883 - Remove the ExtendedTypes framework
Diffstat (limited to 'plugins/sysml')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF3
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java32
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF1
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java11
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java22
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java21
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java11
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java11
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java21
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java14
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java22
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java11
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java19
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java11
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF3
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java33
16 files changed, 5 insertions, 241 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
index 945669db76c..a9b53dcef86 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0
org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
index 5255bb3b46c..0a1c51ff214 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.gmf.runtime.notation.Edge;
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.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@@ -95,20 +94,7 @@ public class InheritedClassDiagramViewProvider 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) {
@@ -240,22 +226,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
}
return false;
}
- // /////////////////////////////////////////////////////////////////////
- // 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.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index c6becc64ded..ace28886224 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -33,7 +33,6 @@ Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
index d4c8adc8668..79e002153f3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class BlockCompositeSemanticEditPolicy extends DefaultCompartmentSemantic
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
- baseType = SysMLElementTypes.FLOW_PORT_NA;
- }
- }
if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
index 0415a91edc0..617b70b972a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
@@ -13,15 +13,11 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
@@ -50,24 +46,6 @@ public class BlockPropertyCompositeSemanticEditPolicy extends DefaultSemanticEdi
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
- baseType = SysMLElementTypes.FLOW_PORT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
- baseType = SysMLElementTypes.FLOW_PORT_IN;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
- baseType = SysMLElementTypes.FLOW_PORT_OUT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
- baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
- baseType = SysMLElementTypes.FLOW_PORT_NA;
- } else if (superTypes.contains(UMLElementTypes.PORT)) {
- baseType = UMLElementTypes.PORT;
- }
- }
-
if ((SysMLElementTypes.FLOW_PORT == baseType)
|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
index 4764f371a5d..ddd9bde7798 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
import java.util.Arrays;
-import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
@@ -22,7 +21,6 @@ import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -56,25 +54,6 @@ public class BlockPropertyStructureCompartmentSemanticEditPolicy extends Default
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-
- if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
- baseType = SysMLElementTypes.PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
- baseType = SysMLElementTypes.REFERENCE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
- baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
- baseType = SysMLElementTypes.VALUE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
- baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
- } else if (superTypes.contains(UMLElementTypes.PROPERTY)) {
- baseType = UMLElementTypes.PROPERTY;
- }
-
- }
if (SysMLElementTypes.PART_PROPERTY == baseType) {
req.setContainer(type);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
index e519f37c84e..8f025885fa7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
@@ -41,13 +37,6 @@ public class ConstraintParameterCompartmentSemanticEditPolicy extends DefaultCom
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(UMLElementTypes.PROPERTY)) {
- baseType = UMLElementTypes.PROPERTY;
- }
- }
if (UMLElementTypes.PROPERTY == baseType) {
String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", req.getContainer().eContents()); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
index 66ff6d11014..32d56b25ccd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class FlowPortCompartmentSemanticEditPolicy extends DefaultCompartmentSem
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
- baseType = SysMLElementTypes.FLOW_PORT_NA;
- }
- }
if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
index 12016a1a816..0e66162a1eb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
@@ -13,15 +13,11 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
@@ -52,23 +48,6 @@ public class NestedBlockPropertyCompositeSemanticEditPolicy extends DefaultSeman
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
- baseType = SysMLElementTypes.FLOW_PORT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
- baseType = SysMLElementTypes.FLOW_PORT_IN;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
- baseType = SysMLElementTypes.FLOW_PORT_OUT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
- baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
- baseType = SysMLElementTypes.FLOW_PORT_NA;
- } else if (superTypes.contains(UMLElementTypes.PORT)) {
- baseType = UMLElementTypes.PORT;
- }
- }
if ((SysMLElementTypes.FLOW_PORT == baseType)
|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
index 1a9a028e3a9..0e4c2c9e8c6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -40,16 +36,6 @@ public class PartCompartmentSemanticEditPolicy extends DefaultCompartmentSemanti
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
- baseType = SysMLElementTypes.PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
- baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
- }
- }
-
if (SysMLElementTypes.PART_PROPERTY == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
index f48e36139ed..13d12c9bb21 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -44,24 +40,6 @@ public class PropertyCompartmentSemanticEditPolicy extends DefaultCompartmentSem
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
- baseType = SysMLElementTypes.PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
- baseType = SysMLElementTypes.REFERENCE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
- baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
- baseType = SysMLElementTypes.VALUE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
- baseType = SysMLElementTypes.FLOW_PORT_NA;
- } else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
- baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
- }
- }
-
if (SysMLElementTypes.PART_PROPERTY == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
index ac078f5edbf..27d3bdde8f2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class ReferenceCompartmentSemanticEditPolicy extends DefaultCompartmentSe
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
- baseType = SysMLElementTypes.REFERENCE_PROPERTY;
- }
- }
if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
index c6872ed20fc..7eaf6b6f49e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -43,21 +39,6 @@ public class StructureCompartmentSemanticEditPolicy extends DefaultCompartmentSe
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
- baseType = SysMLElementTypes.PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
- baseType = SysMLElementTypes.REFERENCE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
- baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
- baseType = SysMLElementTypes.VALUE_PROPERTY;
- } else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
- baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
- }
- }
if (SysMLElementTypes.PART_PROPERTY == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
index 8654ecb0b81..35e42a9121d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
-import java.util.Arrays;
-import java.util.List;
-
import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class ValueCompartmentSemanticEditPolicy extends DefaultCompartmentSemant
IElementType elementTypeToCreate = req.getElementType();
IElementType baseType = elementTypeToCreate;
- // if extended type, retrieve the sysml closest element element type
- if (elementTypeToCreate instanceof IExtendedHintedElementType) {
- List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
- if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
- baseType = SysMLElementTypes.VALUE_PROPERTY;
- }
- }
if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
index 5eb6e8bfa6a..c895a9753af 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,
Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.0.qualifier
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.

Back to the top