diff options
| author | adaussy | 2013-05-23 13:01:17 +0000 |
|---|---|---|
| committer | adaussy | 2013-05-23 13:01:17 +0000 |
| commit | 06d84517f15d7bee87b47cabbdac77e5591fd94b (patch) | |
| tree | e782a2285da48ae2e949bea40f4a3efa98a7a801 | |
| parent | cf325aa4ec2c08de89c7d8046a5d1d91caf92d4e (diff) | |
| download | org.eclipse.papyrus-06d84517f15d7bee87b47cabbdac77e5591fd94b.tar.gz org.eclipse.papyrus-06d84517f15d7bee87b47cabbdac77e5591fd94b.tar.xz org.eclipse.papyrus-06d84517f15d7bee87b47cabbdac77e5591fd94b.zip | |
NEW - # 357931 [component diagram] cannot create diagram except from root model
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/ComponentDiagramCreationCondition.java b/plugins/uml/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/ComponentDiagramCreationCondition.java index a56ad795dee..1364e86db58 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/ComponentDiagramCreationCondition.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/ComponentDiagramCreationCondition.java @@ -12,6 +12,7 @@ package org.eclipse.papyrus.diagram.component; import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;
+import org.eclipse.uml2.uml.Component;
/**
* ComponentDiagramCreationCondition class allows to check if a Component diagram can be added to the
@@ -24,7 +25,7 @@ public class ComponentDiagramCreationCondition extends PerspectiveContextDepende */
public boolean create(EObject selectedElement) {
if(super.create(selectedElement)) {
- return selectedElement instanceof org.eclipse.uml2.uml.Package;
+ return selectedElement instanceof org.eclipse.uml2.uml.Package || selectedElement instanceof Component;
}
return false;
}
diff --git a/plugins/uml/org.eclipse.papyrus.diagram.component/src/org/eclipse/papyrus/diagram/component/part/UMLVisualIDRegistry.java b/plugins/uml/org.eclipse.papyrus.diagram.component/src/org/eclipse/papyrus/diagram/component/part/UMLVisualIDRegistry.java index 0759de808ec..160df312203 100644 --- a/plugins/uml/org.eclipse.papyrus.diagram.component/src/org/eclipse/papyrus/diagram/component/part/UMLVisualIDRegistry.java +++ b/plugins/uml/org.eclipse.papyrus.diagram.component/src/org/eclipse/papyrus/diagram/component/part/UMLVisualIDRegistry.java @@ -124,7 +124,7 @@ public class UMLVisualIDRegistry { }
/**
- * @generated
+ * @generated not
*/
public static int getDiagramVisualID(EObject domainElement) {
if(domainElement == null) {
@@ -133,6 +133,9 @@ public class UMLVisualIDRegistry { if(UMLPackage.eINSTANCE.getPackage().isSuperTypeOf(domainElement.eClass()) && isDiagram((Package)domainElement)) {
return ComponentDiagramEditPart.VISUAL_ID;
}
+ if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
+ return ComponentDiagramEditPart.VISUAL_ID;
+ }
return -1;
}
|