diff options
author | ptessier | 2013-05-21 09:31:02 +0000 |
---|---|---|
committer | ptessier | 2013-05-21 09:31:02 +0000 |
commit | aff553c4e1ffbd7ad913ab015ff82c3c32b9b8cc (patch) | |
tree | 48381cc48de91ab467bac18a3db82dcf4441bed3 /plugins/sysml | |
parent | fb8b56178397ca27ade99b1a5be1be4800978866 (diff) | |
download | org.eclipse.papyrus-aff553c4e1ffbd7ad913ab015ff82c3c32b9b8cc.tar.gz org.eclipse.papyrus-aff553c4e1ffbd7ad913ab015ff82c3c32b9b8cc.tar.xz org.eclipse.papyrus-aff553c4e1ffbd7ad913ab015ff82c3c32b9b8cc.zip |
408147: [SysML Requirements Diagram] Add links in the palette
https://bugs.eclipse.org/bugs/show_bug.cgi?id=408147
Diffstat (limited to 'plugins/sysml')
43 files changed, 476 insertions, 88 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen index 48a6bcbeb25..7422c2591c3 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/model/SysML.Requirement.idgen @@ -56,6 +56,12 @@ <genLinks generatePreferencePage="false" generateTool="false">
<genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.17"/>
</genLinks>
+ <genLinks>
+ <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.7"/>
+ </genLinks>
+ <genLinks customPreferencePage="">
+ <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>
+ </genLinks>
</inheritedDiagrams>
<customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.sysml.diagram.requirement.provider.CustomEditPolicyProvider"/>
</idgen:Diagram>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml new file mode 100644 index 00000000000..d86aa99e6d5 --- /dev/null +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/Addition.palette.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" id="requirement.drawer.Addition" name="Addition">
+ <aspectTool description="Create a refinement" id="requirement.tool.refine" name="Refine" refToolId="clazz.tool.abstraction">
+ <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+ <stereotypesToApply>
+ <stereotype stereotypeName="StandardProfileL2::Refine"/>
+ </stereotypesToApply>
+ </postAction>
+ </aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition>
\ No newline at end of file diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml index 61ca242df4b..e7710daa5b7 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.gen.xml @@ -10,9 +10,7 @@ <aspectTool description="Create a new Constraint" id="requirement.tool.constraint" name="Constraint" refToolId="clazz.tool.constraint"> </aspectTool> - <aspectTool description="Create a new NamedElement" id="requirement.tool.namedelement" - name="NamedElement" refToolId=> - </aspectTool> + <aspectTool description="Create a new Package" id="requirement.tool.package" name="Package" refToolId="clazz.tool.package"> </aspectTool> @@ -52,7 +50,14 @@ <aspectTool description="Create a new Dependency" id="requirement.tool.dependency" name="Dependency" refToolId="clazz.tool.dependency"> </aspectTool> + <aspectTool description="Create a new PackageImport" id="requirement.tool.packageimport" + name="PackageImport" refToolId="clazz.tool.packageimport"> + </aspectTool> + <aspectTool description="Create a new Realization" id="requirement.tool.realization" + name="Realization" refToolId="clazz.tool.realization"> + </aspectTool> </drawer> </content> </paletteDefinition> + diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml index 8eb567f3fcc..8876e83417b 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/requirement.palette.xml @@ -71,6 +71,9 @@ </stereotypesToApply>
</postAction>
</aspectTool>
+ <aspectTool description="Create a new Dependency" id="requirement.tool.dependency"
+ name="Dependency" refToolId="clazz.tool.dependency">
+ </aspectTool>
<aspectTool description="Create a Derive Link"
id="requirement.tool.derive" name="Derive"
@@ -87,6 +90,12 @@ <aspectTool description="Create a Decompose Link"
id="requirement.tool.decompose" name="Decompose"
refToolId="clazz.tool.containmentlink"/>
+ <aspectTool description="Create a new PackageImport" id="requirement.tool.packageimport"
+ name="PackageImport" refToolId="clazz.tool.packageimport">
+ </aspectTool>
+ <aspectTool description="Create a new Realization" id="requirement.tool.realization"
+ name="Realization" refToolId="clazz.tool.realization">
+ </aspectTool>
<aspectTool description="Create a Satisfy Link"
id="requirement.tool.satisfy" name="Satisfy"
refToolId="clazz.tool.abstraction" iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/requirements/Satisfy.gif">
@@ -111,10 +120,8 @@ </postAction>
</aspectTool>
- <aspectTool description="Create a new Dependency" id="requirement.tool.dependency"
- name="Dependency" refToolId="clazz.tool.dependency">
- </aspectTool>
-
+
+
<!-- Attention : The element is added manually, can combine the two links comment and constraint, and therefore is not deleted -->
<aspectTool description="Create a new Link" id="package.tool.link"
name="Link" refToolId="clazz.tool.link">
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml index 582d506f9a1..f4d25812750 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.gen.xml @@ -143,8 +143,10 @@ "4008" = DEPENDENCY "4013" = COMMENT_ANNOTATED_ELEMENT "4014" = CONSTRAINT_CONSTRAINED_ELEMENT + "4005" = REALIZATION + "4010" = PACKAGE_IMPORT --> - <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4006, 4023, 4022, 4008, 4013, 4014"/> + <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4006, 4023, 4022, 4008, 4013, 4014, 4005, 4010"/> <object id="elementtype.node" class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)"> @@ -161,7 +163,7 @@ <method name="getSemanticHint()" - value="4006, 4023, 4022, 4008, 4013, 4014"> + value="4006, 4023, 4022, 4008, 4013, 4014, 4005, 4010"> </method> </object> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/> @@ -244,13 +246,23 @@ <method name="getProxyClassID()" value="uml.Dependency"/> </object> + <!-- "uml.Realization" --> + <object id="uml.Realization" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)"> + <method name="getProxyClassID()" value="uml.Realization"/> + </object> + + <!-- "uml.PackageImport" --> + <object id="uml.PackageImport" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)"> + <method name="getProxyClassID()" value="uml.PackageImport"/> + </object> + <!-- Additional activation contexts for nodes semantic objects --> <context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="uml.Package, uml.Class, uml.NamedElement, uml.Comment, uml.Constraint, uml.Property, uml.Reception, uml.Operation, uml.Interface, uml.Enumeration, uml.PrimitiveType, uml.DataType, uml.Signal"/> <!-- Additional activation contexts for edges semantic objects --> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" - elements="uml.Abstraction, uml.Dependency"/> + elements="uml.Abstraction, uml.Dependency, uml.Realization, uml.PackageImport"/> </viewProvider> </extension> @@ -424,6 +436,11 @@ "6027" = DEPENDENCY_LABEL_APPLIED_STEREOTYPE_HINT "4013" = COMMENT_ANNOTATED_ELEMENT "4014" = CONSTRAINT_CONSTRAINED_ELEMENT + "4005" = REALIZATION + "6012" = REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT + "6013" = REALIZATION_LABEL_NAME_HINT + "4010" = PACKAGE_IMPORT + "6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT --> <object id="ABSTRACTION" @@ -455,10 +472,20 @@ class="org.eclipse.gmf.runtime.notation.Edge"> <method name="getType()" value="4014"/> </object> + <object + id="REALIZATION" + class="org.eclipse.gmf.runtime.notation.Edge"> + <method name="getType()" value="4005, 6012, 6013"/> + </object> + <object + id="PACKAGE_IMPORT" + class="org.eclipse.gmf.runtime.notation.Edge"> + <method name="getType()" value="4010, 6022"/> + </object> <context views="PACKAGE, PACKAGE_CN, CLASS, CLASS_CN, NAMED_ELEMENT, CONTAINMENT_CIRCLE_CN, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN"/> <context views="CLASS_PROPERTY_CLN, CLASS_RECEPTION_CLN, CLASS_OPERATION_CLN, CLASS_CLASS_CLN, CLASS_INTERFACE_CLN, CLASS_ENUMERATION_CLN, CLASS_PRIMITIVE_TYPE_CLN, CLASS_DATA_TYPE_CLN, CLASS_SIGNAL_CLN"/> - <context views="ABSTRACTION, CONTAINMENT_LINK, CONTAINMENT_SUB_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT"/> + <context views="ABSTRACTION, CONTAINMENT_LINK, CONTAINMENT_SUB_LINK, DEPENDENCY, COMMENT_ANNOTATED_ELEMENT, CONSTRAINT_CONSTRAINED_ELEMENT, REALIZATION, PACKAGE_IMPORT"/> </editpartProvider> </extension> @@ -552,6 +579,20 @@ <page category="org.eclipse.papyrus.sysml.diagram.requirement.preferences" + class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage" + id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage" + name="Realization"> + </page> + + + <page category="org.eclipse.papyrus.sysml.diagram.requirement.preferences" + class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage" + id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage" + name="PackageImport"> + </page> + + + <page category="org.eclipse.papyrus.sysml.diagram.requirement.preferences" class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage" id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage" name="Property"> diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties index 0825130700e..55423f77a07 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.properties @@ -8,5 +8,5 @@ # Contributors: # Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation ################################################################################## -pluginName=SysML Requirement Diagram (Incubation) +pluginName=SysML Requirement Diagram providerName=Eclipse Modeling Project diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml index fedf6188be6..39486f2227e 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml @@ -97,6 +97,21 @@ </paletteDefinition>
</extension>
+<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+ name="SYSML_Requirement_Addition">
+
+ <paletteDefinition ID="SYSML_Requirement_Addition"
+ class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+ name="Addition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+ path="palettes/Addition.palette.xml"
+ provider="CEA LIST">
+ <Priority name="Low"/>
+
+ <!-- Specify diagram this palette tools relate to -->
+ <editor id="org.eclipse.papyrus.sysml.diagram.requirement"/>
+ </paletteDefinition>
+</extension>
+
<!-- Diagram view providers declaration -->
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
<!-- Diagram view provider -->
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java index 11c301c8462..29bf49818e6 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement; import org.eclipse.emf.ecore.EObject; @@ -19,6 +21,8 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler; import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes; + + public class RequirementDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler { /** diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java index 0961d8923a2..e97ac79b3f3 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement; import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java index 83da0c29f6c..84d75c57922 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramForMultiEditor.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement; import org.eclipse.core.runtime.CoreException; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java index 3ea32b046df..c093dd3f61c 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/part/RequirementDiagramEditPart.java @@ -8,17 +8,21 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.edit.part; +import org.eclipse.gef.EditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy; + +import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy; +import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy; +import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; +import org.eclipse.papyrus.sysml.diagram.requirement.edit.policy.CustomDragDropEditPolicy; public class RequirementDiagramEditPart extends DiagramEditPart { diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java index 77b740a2c31..9a67a63599d 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/edit/policy/RequirementDiagramDragDropEditPolicy.java @@ -8,15 +8,17 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.edit.policy; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.sysml.diagram.requirement.provider.GraphicalTypeRegistry; import org.eclipse.papyrus.sysml.diagram.requirement.provider.IGraphicalTypeRegistry; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; /** Customization of the DND edit policy for the Requirement Diagram */ public class RequirementDiagramDragDropEditPolicy extends ClassDiagramDragDropEditPolicy { @@ -30,19 +32,19 @@ public class RequirementDiagramDragDropEditPolicy extends ClassDiagramDragDropEd @Override public int getNodeVisualID(View containerView, EObject domainElement) { String domainType = registry.getNodeGraphicalType(domainElement, containerView.getType()); - if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) { + if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) { return -1; // undefined } return new Integer(domainType); } - + /** * {@inheritDoc} */ @Override public int getLinkWithClassVisualID(EObject domainElement) { String domainType = registry.getEdgeGraphicalType(domainElement); - if(IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) { + if (IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainType)) { return -1; // undefined } return new Integer(domainType); diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java index 18bc8505b8b..e42aad52add 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/factory/RequirementDiagramViewFactory.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.factory; import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java index 144270cd4f4..d38d2af6c88 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import java.util.Collections; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java index 4ac9617a870..8de918565c1 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/CommentPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; @@ -20,6 +22,7 @@ public class CommentPreferencePage extends RequirementDiagramNodePreferencePage /** Constant key to access preferences */ protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$ + /** Default constructor */ public CommentPreferencePage() { super(); @@ -38,4 +41,5 @@ public class CommentPreferencePage extends RequirementDiagramNodePreferencePage } + } diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java index ed8d32a1c2d..14ff2edaae1 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ConstraintPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; @@ -20,6 +22,7 @@ public class ConstraintPreferencePage extends RequirementDiagramNodePreferencePa /** Constant key to access preferences */ protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$ + /** Default constructor */ public ConstraintPreferencePage() { super(); @@ -38,4 +41,5 @@ public class ConstraintPreferencePage extends RequirementDiagramNodePreferencePa } + } diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java index b49faa8c72e..13e50640961 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ContainmentLinkPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; @@ -20,6 +22,7 @@ public class ContainmentLinkPreferencePage extends RequirementDiagramLinkPrefere /** Constant key to access preferences */ protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ContainmentLink"; //$NON-NLS-1$ + /** Default constructor */ public ContainmentLinkPreferencePage() { super(); diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java index 24baa294269..23c3071f860 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DataTypePreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java index de1a55dc08a..4c8a78eb62b 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import java.util.Collections; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java index 767958bebc1..e652837068c 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/EnumerationPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java index 2879b6667fa..640bfc0c8ae 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/InterfacePreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java index 901fcf17368..a8e81943184 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; @@ -21,6 +23,7 @@ public class NamedElementPreferencePage extends RequirementDiagramNodePreference /** Constant key to access preferences */ protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DefaultNamedElement"; //$NON-NLS-1$ + /** Default constructor */ public NamedElementPreferencePage() { super(); @@ -41,4 +44,5 @@ public class NamedElementPreferencePage extends RequirementDiagramNodePreference store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50); } + } diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java index 3510e669b09..a45ec60575f 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/OperationPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java new file mode 100644 index 00000000000..42c76ae6e18 --- /dev/null +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java @@ -0,0 +1,75 @@ +/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ +package org.eclipse.papyrus.sysml.diagram.requirement.preferences; + +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes; + +public class PackageImportPreferencePage extends RequirementDiagramLinkPreferencePage { + + /** Constant key to access preferences */ + protected static String prefKey = ElementTypes.DIAGRAM_ID + "_PackageImport"; //$NON-NLS-1$ + + /** The compartments default visibility for preferences */ + public static final Map<String, Boolean> labelDefaultVisibilityMap; + + /** Static attribute initialization */ + static { + labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>(); + labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$ + + // Start of user code custom static initializations + // End of user code + + Collections.unmodifiableMap(labelDefaultVisibilityMap); + } + + /** Default constructor */ + public PackageImportPreferencePage() { + super(); + setPreferenceKey(ElementTypes.DIAGRAM_ID + "_PackageImport"); //$NON-NLS-1$ + } + + /** + * Initialize defaults using a specified {@link IPreferenceStore} + * + * @param store + * the preference store. + */ + public static void initDefaults(IPreferenceStore store) { + // Start of user code custom default initializations + // End of user code + + for(String labelName : labelDefaultVisibilityMap.keySet()) { + String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY); + store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName)); + } + } + + /** + * {@inheritDoc} + */ + @Override + protected void initializeLabelsList() { + for(String name : labelDefaultVisibilityMap.keySet()) { + this.labelsList.add(name); + } + } +} diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java index c152d315692..94b4f98a6fe 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import java.util.Collections; @@ -39,6 +41,7 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>(); compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$ + // Start of user code custom static initializations // End of user code diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java index 47b0d110503..0486714cf8a 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PrimitiveTypePreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java index 672a961d91c..8dcf6541bcc 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PropertyPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java new file mode 100644 index 00000000000..2078034b71a --- /dev/null +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java @@ -0,0 +1,76 @@ +/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ +package org.eclipse.papyrus.sysml.diagram.requirement.preferences; + +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes; + +public class RealizationPreferencePage extends RequirementDiagramLinkPreferencePage { + + /** Constant key to access preferences */ + protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Realization"; //$NON-NLS-1$ + + /** The compartments default visibility for preferences */ + public static final Map<String, Boolean> labelDefaultVisibilityMap; + + /** Static attribute initialization */ + static { + labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>(); + labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$ + labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$ + + // Start of user code custom static initializations + // End of user code + + Collections.unmodifiableMap(labelDefaultVisibilityMap); + } + + /** Default constructor */ + public RealizationPreferencePage() { + super(); + setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Realization"); //$NON-NLS-1$ + } + + /** + * Initialize defaults using a specified {@link IPreferenceStore} + * + * @param store + * the preference store. + */ + public static void initDefaults(IPreferenceStore store) { + // Start of user code custom default initializations + // End of user code + + for(String labelName : labelDefaultVisibilityMap.keySet()) { + String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY); + store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName)); + } + } + + /** + * {@inheritDoc} + */ + @Override + protected void initializeLabelsList() { + for(String name : labelDefaultVisibilityMap.keySet()) { + this.labelsList.add(name); + } + } +} diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java index e94d9cf7987..a5de853a477 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/ReceptionPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java index 54b92dbdcc6..540005682ba 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java index bec8cd5625a..b51416ce4f7 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramLinkPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import java.util.ArrayList; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java index 3db3f0928cd..74e38e30286 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramNodePreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import java.util.ArrayList; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java index 8fce037ace5..6ac4721b02a 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramPreferenceInitializer.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; @@ -33,5 +35,7 @@ public class RequirementDiagramPreferenceInitializer extends AbstractPreferenceI org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage.initDefaults(store); org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage.initDefaults(store); org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage.initDefaults(store); + org.eclipse.papyrus.sysml.diagram.requirement.preferences.RealizationPreferencePage.initDefaults(store); + org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackageImportPreferencePage.initDefaults(store); } } diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java index 366bb11d722..bc5f3666656 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/SignalPreferencePage.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.preferences; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java index eae7edcf105..f2cf68fd1c2 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/ElementTypes.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator; @@ -24,10 +26,14 @@ public class ElementTypes extends AbstractElementTypeEnumerator { /** SysML Requirement Diagram :: Diagram */ public static final String DIAGRAM_ID = "RequirementDiagram"; //$NON-NLS-1$ + + + /** ********************************************************* */ /** SysML Requirement Diagram - ClassDiagram related elements */ /** ********************************************************* */ + /** ClassDiagram :: PACKAGE */ public static final IHintedType PACKAGE = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$ @@ -96,6 +102,7 @@ public class ElementTypes extends AbstractElementTypeEnumerator { public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160"; //$NON-NLS-1$ + /** ClassDiagram :: ABSTRACTION */ public static final IHintedType ABSTRACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$ @@ -122,6 +129,18 @@ public class ElementTypes extends AbstractElementTypeEnumerator { /** ClassDiagram :: CONSTRAINT_CONSTRAINED_ELEMENT */ public static final IHintedType CONSTRAINT_CONSTRAINED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$ + /** ClassDiagram :: REALIZATION */ + public static final IHintedType REALIZATION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$ + + public static final String REALIZATION_LABEL_APPLIED_STEREOTYPE_HINT = "6012"; //$NON-NLS-1$ + + public static final String REALIZATION_LABEL_NAME_HINT = "6013"; //$NON-NLS-1$ + + /** ClassDiagram :: PACKAGE_IMPORT */ + public static final IHintedType PACKAGE_IMPORT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$ + + public static final String PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT = "6022"; //$NON-NLS-1$ + /** ClassDiagram :: ChildLabelNodes */ public static final IHintedType CLASS_PROPERTY_CLN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$ diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java index 1e0e691a51c..5f6e1e50482 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/GraphicalTypeRegistry.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import java.util.HashSet; @@ -40,6 +42,8 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry { // Fill known edges set knownEdges.add(ElementTypes.ABSTRACTION.getSemanticHint()); knownEdges.add(ElementTypes.DEPENDENCY.getSemanticHint()); + knownEdges.add(ElementTypes.REALIZATION.getSemanticHint()); + knownEdges.add(ElementTypes.PACKAGE_IMPORT.getSemanticHint()); knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint()); knownEdges.add(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint()); @@ -82,6 +86,12 @@ public class GraphicalTypeRegistry implements IGraphicalTypeRegistry { if(domainElement instanceof org.eclipse.uml2.uml.Dependency) { graphicalType = ElementTypes.DEPENDENCY.getSemanticHint(); } + if(domainElement instanceof org.eclipse.uml2.uml.Realization) { + graphicalType = ElementTypes.REALIZATION.getSemanticHint(); + } + if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) { + graphicalType = ElementTypes.PACKAGE_IMPORT.getSemanticHint(); + } return graphicalType; } diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java index a7162d53d9e..f473f6b2321 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/IGraphicalTypeRegistry.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java index 69883349efe..1e93ce08d69 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramEditPartProvider.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.emf.ecore.EObject; @@ -82,6 +84,12 @@ public class InheritedClassDiagramEditPartProvider extends UMLEditPartProvider { if(eobject instanceof org.eclipse.uml2.uml.Dependency) { return true; } + if(eobject instanceof org.eclipse.uml2.uml.Realization) { + return true; + } + if(eobject instanceof org.eclipse.uml2.uml.PackageImport) { + return true; + } // Additional test needed here to decide whether to support Feature type links. // As feature type link are not related to a MetaClass from the domain model diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java index dc97b4138b2..606cb3fbd85 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/InheritedClassDiagramViewProvider.java @@ -12,6 +12,7 @@ /*****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; + import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EObject; @@ -70,6 +71,12 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider { if(ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) { createdEdge = createConstraintConstrainedElement_4014(containerView, index, persisted, preferencesHint); } + if(ElementTypes.REALIZATION.getSemanticHint().equals(domainElementGraphicalType)) { + createdEdge = createRealization_4005(domainElement, containerView, index, persisted, preferencesHint); + } + if(ElementTypes.PACKAGE_IMPORT.getSemanticHint().equals(domainElementGraphicalType)) { + createdEdge = createPackageImport_4010(domainElement, containerView, index, persisted, preferencesHint); + } } } @@ -125,6 +132,12 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider { if(elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) { return true; } + if(elementType == ElementTypes.REALIZATION) { + return true; + } + if(elementType == ElementTypes.PACKAGE_IMPORT) { + return true; + } // ///////////////////////////////////////////////////////////////////// // Test possibility to provide a view based on the semantic nature and its expected container. @@ -189,9 +202,9 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider { } } if(elementType == ElementTypes.CLASS_CN) { - // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@60215074 (visualID: 3010, editPartClassName: ClassEditPartCN, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ClassCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicyCN, createCommandClassName: ClassCreateCommandCN) - // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@57c5b15d (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7e5004f1 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3774ab00 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@f0f45e2 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false) - // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@70bdde19 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false) + // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@49e8801d (visualID: 3010, editPartClassName: ClassEditPartCN, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ClassCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicyCN, createCommandClassName: ClassCreateCommandCN) + // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7615ece4 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@49766b48 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@7d7d69a5 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@45f05c4d (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false) + // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@42242af9 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false) if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) { return true; } @@ -205,7 +218,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider { } } if(elementType == ElementTypes.CONTAINMENT_CIRCLE_CN) { - // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl@6585f639 (visualID: 3032, editPartClassName: ContainmentCircleEditPart, itemSemanticEditPolicyClassName: ContainmentCircleItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ContainmentCircleCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ContainmentCircleGraphicalNodeEditPolicy, createCommandClassName: ContainmentCircleCreateCommand) (preferredSideName: NORTH) + // node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl@6585f639 (visualID: 3032, editPartClassName: ContainmentCircleEditPart, itemSemanticEditPolicyClassName: ContainmentCircleItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ContainmentCircleCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ContainmentCircleGraphicalNodeEditPolicy, createCommandClassName: ContainmentCircleCreateCommand) (preferredSideName: NORTH) // containers: org.eclipse.gmf.codegen.gmfgen.impl.GenTopLevelNodeImpl@a94a7a8 (visualID: 2008, editPartClassName: ClassEditPart, itemSemanticEditPolicyClassName: ClassItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ClassCanonicalEditPolicy) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ClassGraphicalNodeEditPolicy, createCommandClassName: ClassCreateCommand) // nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@6eca2ca5 (name: ) (customPreferencePage: null, generatePreferencePage: false, generateTool: false) if(ElementTypes.CLASS.getSemanticHint().equals(containerGraphicalType)) { diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java index b269da8ba03..7e24989e5a8 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPartProvider.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.gmf.runtime.common.core.service.IOperation; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java index 29e9d89478d..dbeb55cfd35 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramEditPolicyProvider.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.gef.EditPart; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java index 89be190b5f7..cfd6a5183b3 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/provider/RequirementDiagramViewProvider.java @@ -8,8 +8,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Nizar GUEDIDI (CEA LIST) - Initial API and implementation - /*****************************************************************************/ + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ package org.eclipse.papyrus.sysml.diagram.requirement.provider; import org.eclipse.core.runtime.IAdaptable; diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java new file mode 100644 index 00000000000..fc375e93633 --- /dev/null +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/utils/RequirementDiagramGraphicalTypes.java @@ -0,0 +1,27 @@ +/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST- Initial API and implementation + * Nizar GUEDIDI (CEA LIST)- modification + * + ****************************************************************************/ +package org.eclipse.papyrus.sysml.diagram.requirement.utils; + +public class RequirementDiagramGraphicalTypes { + + /** ********************************************************* */ + /** Diagram custom graphical types id *********************** */ + /** ********************************************************* */ + + + + + +} |