Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-14 05:18:14 -0500
committerCamille Letavernier2014-02-14 06:48:56 -0500
commit245a00be5fd7c64a917f921d7359adabe5844523 (patch)
tree3e75ef8f585079cd3c0cb2df12bda21d09756105
parenta66895a065cd66a7f322f579b06291d6a43e8a9e (diff)
downloadorg.eclipse.papyrus-245a00be5fd7c64a917f921d7359adabe5844523.tar.gz
org.eclipse.papyrus-245a00be5fd7c64a917f921d7359adabe5844523.tar.xz
org.eclipse.papyrus-245a00be5fd7c64a917f921d7359adabe5844523.zip
417396: [CSS] The CSS Engine shall support label visibility & mask
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Add a default SysML CSS Theme to handle SysML compartments visibility - Generate NotationTypesMap for IDGen diagrams
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/plugin.xml5
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml117
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project28
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF8
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html28
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties5
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml20
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css74
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml59
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml59
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java30
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml9
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml8
13 files changed, 416 insertions, 34 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/plugin.xml
index 1c6dd768174..e34c719cd0f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.theme/plugin.xml
@@ -14,6 +14,11 @@
stylesheetPath="theme/papyrus_theme.css">
</stylesheet>
</themeContribution>
+ <themeDefinition
+ icon="icons/papyrus.png"
+ id="org.eclipse.papyrus.css.blacknwhite_theme"
+ label="Black &amp; White">
+ </themeDefinition>
</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index 9649e4e7908..5f5d47262a0 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -1503,5 +1503,122 @@
</extension>
<!-- // End of user code
-->
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+ <diagramMappings diagramID="BlockDefinition">
+ <mapping type="BlockDefinition" humanReadableType="BlockDefinitionDiagram"/>
+ <!-- Compartments -->
+ <mapping
+ humanReadableType="literals"
+ type="compartment_uml_enumerationliteral_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="compartment_uml_operation_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="standard ports"
+ type="compartment_uml_port_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="properties"
+ type="compartment_uml_property_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="constraints"
+ type="compartment_sysml_constraint_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="flow ports"
+ type="compartment_sysml_flowport_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="flow properties"
+ type="compartment_sysml_flowproperty_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="parameters"
+ type="compartment_sysml_parameter_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="parts"
+ type="compartment_sysml_part_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="references"
+ type="compartment_sysml_reference_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="values"
+ type="compartment_sysml_value_as_list">
+ </mapping>
+
+ <mapping
+ humanReadableType="properties"
+ type="compartment_sysml_property_as_list">
+ </mapping>
+
+ <!-- Link labels -->
+ <mapping
+ humanReadableType="Name"
+ type="affixedlabel_uml_namedelement_name">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="affixedlabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_uml_port_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_sysml_flowport_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Stereotype"
+ type="linklabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="linklabel_uml_namedelement_name">
+ </mapping>
+
+ <mapping
+ humanReadableType="SourceMultiplicity"
+ type="linklabel_uml_association_source_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="SourceRole"
+ type="linklabel_uml_association_source_role">
+ </mapping>
+
+ <mapping
+ humanReadableType="TargetMultiplicity"
+ type="linklabel_uml_association_target_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="TargetRole"
+ type="linklabel_uml_association_target_role">
+ </mapping>
+
+ </diagramMappings>
+ </extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project
new file mode 100644
index 00000000000..6ef523271d2
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.sysml.diagram.css</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..65a23e113ff
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SysML Css (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.css;singleton:=true
+Bundle-Version: 0.10.2.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="0.10.2",
+ org.eclipse.papyrus.infra.gmfdiag.css.theme;bundle-version="0.10.2";resolution:=optional
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties
new file mode 100644
index 00000000000..d92dc103be6
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+ plugin.xml,\
+ theme/,\
+ about.html
+src.includes = about.html
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml
new file mode 100644
index 00000000000..d1e466b08bf
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/plugin.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.infra.gmfdiag.css.theme">
+ <themeContribution
+ id="org.eclipse.papyrus.css.papyrus_theme">
+ <stylesheet
+ stylesheetPath="theme/sysml.css">
+ </stylesheet>
+ </themeContribution>
+ <themeContribution
+ id="org.eclipse.papyrus.css.blacknwhite_theme">
+ <stylesheet
+ stylesheetPath="theme/sysml.css">
+ </stylesheet>
+ </themeContribution>
+ </extension>
+
+</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css
new file mode 100644
index 00000000000..4fb8aadc085
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.css/theme/sysml.css
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
+ *****************************************************************************/
+
+/**
+* Configures the default visibility for SysML compartments
+*/
+
+BlockDefinitionDiagram Compartment,
+ParametricDiagram Compartment,
+RequirementDiagram Compartment,
+InternalBlockDiagram Compartment{
+ visible: false;
+ showTitle: true;
+}
+
+Package > Compartment[kind=packagedelements],
+Model > Compartment[kind=packagedelements]{
+ visible: true;
+ showTitle: false;
+}
+
+[appliedStereotypes~="Block"] > Compartment[kind=properties],
+[appliedStereotypes~="Block"] > Compartment[kind=operations],
+[appliedStereotypes~="Block"] > Compartment[kind=constraints]{
+ visible: true;
+}
+
+[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=parameters],
+[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=constraints]{
+ visible: true;
+}
+
+BlockDefinitionDiagram DataType > Compartment[kind=properties],
+BlockDefinitionDiagram Enumeration > Compartment[kind=literals],
+BlockDefinitionDiagram InstanceSpecification > Compartment[kind=slots],
+BlockDefinitionDiagram Interface > Compartment[kind=properties],
+BlockDefinitionDiagram Interface > Compartment[kind=operations]{
+ visible: true;
+}
+
+
+[appliedStereotypes~="FlowSpecification"] > Compartment[kind=flowproperties]{
+ visible: true;
+}
+
+[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=operations]{
+ visible: true;
+}
+
+InternalBlockDiagram [appliedStereotypes~="Block"] > Compartment[kind=structure],
+InternalBlockDiagram Property > Compartment[kind=structure]{
+ visible: true;
+}
+
+ParametricDiagram Property > Compartment[kind=structure]{
+ visible: true;
+}
+
+ParametricDiagram [appliedStereotypes~="Block"] > Compartment[kind=structure]{
+ visible: true;
+ showTitle: false;
+}
+
+
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index d9c6553d37c..fc09459dd17 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -560,5 +560,62 @@
<!-- // End of user code
-->
-
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+ <diagramMappings diagramID="InternalBlock">
+ <mapping type="InternalBlock" humanReadableType="InternalBlockDiagram"/>
+ <!-- Compartments -->
+ <mapping
+ humanReadableType="structure"
+ type="compartment_sysml_structure">
+ </mapping>
+
+ <mapping
+ humanReadableType="structure"
+ type="compartment_sysml_blockproperty_structure">
+ </mapping>
+
+ <!-- Link labels -->
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_sysml_flowport_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="affixedlabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_uml_port_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Stereotype"
+ type="linklabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="linklabel_uml_connector_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="SourceMultiplicity"
+ type="linklabel_uml_connector_source_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="TargetMultiplicity"
+ type="linklabel_uml_connector_target_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="linklabel_uml_namedelement_name">
+ </mapping>
+
+ </diagramMappings>
+ </extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index 2a9c65f867b..5e3687cde0f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -738,5 +738,62 @@
</extension>
<!-- // End of user code
-->
-
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+ <diagramMappings diagramID="Parametric">
+ <mapping type="Parametric" humanReadableType="ParametricDiagram"/>
+ <!-- Compartments -->
+ <mapping
+ humanReadableType="structure"
+ type="compartment_sysml_structure">
+ </mapping>
+
+ <mapping
+ humanReadableType="structure"
+ type="compartment_sysml_blockproperty_structure">
+ </mapping>
+
+ <!-- Link labels -->
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_sysml_flowport_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="affixedlabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Label"
+ type="affixedlabel_uml_port_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="Stereotype"
+ type="linklabel_uml_appliedstereotype">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="linklabel_uml_connector_label">
+ </mapping>
+
+ <mapping
+ humanReadableType="SourceMultiplicity"
+ type="linklabel_uml_connector_source_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="TargetMultiplicity"
+ type="linklabel_uml_connector_target_multiplicity">
+ </mapping>
+
+ <mapping
+ humanReadableType="Name"
+ type="linklabel_uml_namedelement_name">
+ </mapping>
+
+ </diagramMappings>
+</extension>
</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java
index d8246cf2fae..4c818ab4afa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLElementAdapter.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.types.NotationTypesMap;
import org.eclipse.papyrus.infra.gmfdiag.css.dom.GMFElementAdapter;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
import org.eclipse.papyrus.infra.tools.util.ListHelper;
@@ -46,23 +45,6 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
*/
public static final String QUALIFIER_SEPARATOR = "--"; //$NON-NLS-1$
- static {
- //SysML
- mapDiagram("BlockDefinition", "BlockDiagram");
- mapDiagram("InternalBlock", "InternalBlockDiagram");
- mapDiagram("PapyrusSysMLRequirement", "RequirementDiagram");
- mapDiagram("Parametric", "ParametricDiagram");
- }
-
- /**
- * @Deprecated Use the notationTypesMapping extension point
- * FIXME Use the notationTypesMapping extension point
- */
- @Deprecated
- private static void mapDiagram(String diagramID, String cssID) {
- NotationTypesMap.instance.getComputerToHumanTypeMapping(diagramID).put(diagramID, cssID);
- }
-
public GMFUMLElementAdapter(View view, ExtendedCSSEngine engine) {
super(view, engine);
}
@@ -79,7 +61,6 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
if(parentValue != null) {
return parentValue;
}
-
if(semanticElement instanceof Element) {
//Applied stereotypes
Element currentElement = (Element)semanticElement;
@@ -89,12 +70,10 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
appliedStereotypes.add(stereotype.getName());
appliedStereotypes.add(stereotype.getQualifiedName());
}
-
if(!appliedStereotypes.isEmpty()) {
return ListHelper.deepToString(appliedStereotypes, CSS_VALUES_SEPARATOR);
}
}
-
for(EObject stereotypeApplication : currentElement.getStereotypeApplications()) {
EStructuralFeature feature = stereotypeApplication.eClass().getEStructuralFeature(attr);
if(feature != null) {
@@ -104,7 +83,6 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
for(Object value : values) {
cssValues.add(getCSSValue(feature, value));
}
-
return ListHelper.deepToString(cssValues, CSS_VALUES_SEPARATOR);
} else {
Object value = stereotypeApplication.eGet(feature);
@@ -113,17 +91,12 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
}
}
}
-
if(attr.contains(QUALIFIER_SEPARATOR)) {
List<String> qualifiers = ListHelper.asList(attr.split(QUALIFIER_SEPARATOR)); //Writable list
-
String propertyName = qualifiers.remove(qualifiers.size() - 1); //Last element is the property name
//Remaining strings can be used to build the Stereotype's qualified name
-
String stereotypeName = ListHelper.deepToString(qualifiers, "::"); //$NON-NLS-1$
-
Stereotype appliedStereotype = currentElement.getAppliedStereotype(stereotypeName);
-
if(appliedStereotype != null) {
EObject stereotypeApplication = currentElement.getStereotypeApplication(appliedStereotype);
EStructuralFeature feature = stereotypeApplication.eClass().getEStructuralFeature(propertyName);
@@ -134,7 +107,6 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
}
}
}
-
return null;
}
@@ -143,8 +115,6 @@ public class GMFUMLElementAdapter extends GMFElementAdapter {
if(feature instanceof EReference && value instanceof NamedElement) {
return ((NamedElement)value).getName();
}
-
return super.getCSSValue(feature, value);
}
-
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index f1bb4a5d844..5ffcfbc10c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -897,5 +897,12 @@
<!-- Insert custom extensions here. -->
<!-- // End of user code -->
-
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+ <diagramMappings diagramID="PapyrusUMLInteractionOverviewDiagram">
+ <mapping type="PapyrusUMLInteractionOverviewDiagram" humanReadableType="InteractionOverviewDiagram"/>
+ <!-- Compartments -->
+
+ <!-- Link labels -->
+ </diagramMappings>
+</extension>
</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
index 81c92e29ecf..9b056b8a84a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
@@ -474,5 +474,11 @@
<!-- // End of user code
-->
-
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+ <diagramMappings diagramID="Package">
+ <mapping type="Package" humanReadableType="PackageDiagram"/>
+ <!-- Compartments -->
+ <!-- Link labels -->
+ </diagramMappings>
+</extension>
</plugin> \ No newline at end of file

Back to the top