Bug 521682 - Papyrus Req should have one top menu
Change-Id: I9c082cdb46a24901421d9e4981f58e2360f6df9b
diff --git a/ReqSpecification/ReqSpecification.uml b/ReqSpecification/ReqSpecification.uml
index 6186fda..5618b46 100644
--- a/ReqSpecification/ReqSpecification.uml
+++ b/ReqSpecification/ReqSpecification.uml
@@ -7,8 +7,9 @@
<packageImport xmi:type="uml:PackageImport" xmi:id="_F6rUsI4yEeeHHIaf5vdK1g">
<importedPackage xmi:type="uml:Package" href="pathmap://SysML14_LIBRARIES/SysML-Standard-Library.uml#SysML.package_packagedElement_Libraries"/>
</packageImport>
- <packagedElement xmi:type="uml:Class" xmi:id="_cIrn8I4yEeeHHIaf5vdK1g" name="ViewCustomization">
- <nestedClassifier xmi:type="uml:Class" xmi:id="_Ic9rQI4yEeeHHIaf5vdK1g" name="RequirementInModelExplorer"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_cIrn8I4yEeeHHIaf5vdK1g" name="View Customization">
+ <nestedClassifier xmi:type="uml:Class" xmi:id="_Ic9rQI4yEeeHHIaf5vdK1g" name="Requirements In ModelExplorer"/>
+ <nestedClassifier xmi:type="uml:Class" xmi:id="_A5bWcI40EeeYpYlUdHhhKQ" name="PapyrusReq Menu"/>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_F5oL0I4yEeeHHIaf5vdK1g">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_F5uScI4yEeeHHIaf5vdK1g" source="http://www.eclipse.org/uml2/2.0.0/UML">
@@ -73,4 +74,5 @@
</uml:Model>
<Requirements:Requirement xmi:id="_IqIkkI4yEeeHHIaf5vdK1g" base_Class="_Ic9rQI4yEeeHHIaf5vdK1g" id="R-001-001" text="Requirements should be displayed in the model explorer by using Id and text"/>
<Requirements:Requirement xmi:id="_cI_xAI4yEeeHHIaf5vdK1g" base_Class="_cIrn8I4yEeeHHIaf5vdK1g" id="R-001" text="Views of papyrus must be customized in order to manage requirements"/>
+ <Requirements:Requirement xmi:id="_A6KWQI40EeeYpYlUdHhhKQ" base_Class="_A5bWcI40EeeYpYlUdHhhKQ" id="R-001-002" text="Papyrus should contains only one menu called Papyrus Req."/>
</xmi:XMI>
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.properties b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.properties
index 08cb858..5ddcf42 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.properties
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.properties
@@ -9,8 +9,8 @@
# Mauricio Alferez (CEA LIST) mauricio.alferez@cea.fr - initial API and implementation
##################################################################################
-papyrus.requirements.sysml14.assistant.menu.label = SysML 1.4 Papyrus Req - Editing Tools
-papyrus.requirements.sysml14.assistant.menu.tooltip = Assistants to edit SysML 1.4 requirements models
+papyrus.requirements.sysml14.assistant.menu.label = Editing Tools
+papyrus.requirements.sysml14.assistant.menu.tooltip = Assistants to edit SysML requirements models
#Commands to be executed from package or model
createNewRequirement.command.label = Create new requirement
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.xml b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.xml
index 7deef5f..056c4f4 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.xml
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.assistant.ui/plugin.xml
@@ -5,9 +5,8 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=org.eclipse.papyrus.requirements.sysml14.common.ui.assistant.additions">
+ locationURI="popup:papyrus.requirements.menu">
<menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
id="papyrus.requirements.sysml14.assistant.menu"
label="%papyrus.requirements.sysml14.assistant.menu.label"
tooltip="%papyrus.requirements.sysml14.assistant.menu.tooltip">
@@ -23,16 +22,6 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.requirements.sysml14.common.ui.assistant.additions">
- <menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
- id="papyrus.requirements.sysml14.assistant.menu"
- label="%papyrus.requirements.sysml14.assistant.menu.label"
- tooltip="%papyrus.requirements.sysml14.assistant.menu.tooltip">
- </menu>
- </menuContribution>
- <menuContribution
- allPopups="false"
locationURI="popup:papyrus.requirements.sysml14.assistant.menu">
<command
commandId="org.eclipse.papyrus.requirements.sysml14.assistant.handlers.PapyrusReqSysMLRequirementHandler"
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/plugin.xml b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/plugin.xml
index 10e6dd5..9c3f658 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/plugin.xml
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/plugin.xml
@@ -7,64 +7,36 @@
allPopups="true"
locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=org.eclipse.ui.edit.delete">
<separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.start">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.metrics.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.assistant.additions"
+ name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.start"
visible="true">
</separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.traceability.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.analysis.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.preferences.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.dummy"
- visible="true">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.end">
- </separator>
+ <menu
+ icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
+ id="papyrus.requirements.menu"
+ label="Papyrus Req"
+ tooltip="Menu to manage Requirements">
+ </menu>
+ <separator
+ name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.end"
+ visible="true">
+ </separator>
</menuContribution>
<menuContribution
allPopups="true"
locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
<separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.start">
+ name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.start"
+ visible="true">
</separator>
+ <menu
+ icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
+ id="papyrus.requirements.menu"
+ label="Papyrus Req"
+ tooltip="Menu to manage Requirements">
+ </menu>
<separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.metrics.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.assistant.additions"
- visible="true">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.traceability.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.analysis.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.preferences.additions"
- visible="false">
- </separator>
- <separator
- name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.end">
+ name="org.eclipse.papyrus.requirements.sysml14.common.ui.separator.end"
+ visible="true">
</separator>
</menuContribution>
</extension>
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/src/org/eclipse/papyrus/requirements/sysml14/common/ui/queries/GetComplexName.java b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/src/org/eclipse/papyrus/requirements/sysml14/common/ui/queries/GetComplexName.java
index c5900dc..07a7e65 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/src/org/eclipse/papyrus/requirements/sysml14/common/ui/queries/GetComplexName.java
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.common.ui/src/org/eclipse/papyrus/requirements/sysml14/common/ui/queries/GetComplexName.java
@@ -61,11 +61,9 @@
if (source.getAppliedStereotypes().size() > 0) {
appStereotype = source.getAppliedStereotypes().get(0);
}
- if (stereotypeReq != null) {
- return "" + source.getValue(stereotypeReq, I_SysMLStereotype.REQUIREMENT_ID_ATT) + ": " + source.getValue(stereotypeReq, I_SysMLStereotype.REQUIREMENT_TEXT_ATT);
- }
+
if ((source instanceof org.eclipse.uml2.uml.Class) && (appStereotype != null) && (isRequirementStereotype(appStereotype))) {
- return "" + source.getValue(appStereotype, I_SysMLStereotype.REQUIREMENT_ID_ATT) + ": " + source.getValue(appStereotype, I_SysMLStereotype.REQUIREMENT_TEXT_ATT);
+ return "" + source.getValue(appStereotype, I_SysMLStereotype.REQUIREMENT_ID_ATT) + ": " + source.getName();
}
// Delegate to UML2 Edit providers to get localized and inferred names where applicable
return labelProvider.getText(source);
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties
index 04763ba..71762de 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties
@@ -10,7 +10,7 @@
##################################################################################
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = SysML 1.4 Papyrus for Requirements - Preferences (Incubation)
-page.name = SysML 1.4 Papyrus for Requirements
-menu.label = SysML 1.4 Papyrus Req - Preferences Settings...
+page.name = Preferences for Requirements
+menu.label = Preferences Settings...
menu.tooltip = Open the preference settings page
-command.name = SysML 1.4 Papyrus Req - Preference Settings...
\ No newline at end of file
+command.name = Preference Settings...
\ No newline at end of file
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml
index 4e973a0..9fbc921 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml
@@ -7,7 +7,7 @@
category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
class="org.eclipse.papyrus.requirements.sysml14.preferences.PreferencePage"
id="org.eclipse.papyrus.requirements.sysml14.preferences.PreferencePage"
- name="%page.name">
+ name="Preferences for Requirements">
</page>
</extension>
<extension
@@ -20,21 +20,11 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=org.eclipse.papyrus.requirements.sysml14.common.ui.preferences.additions">
+ locationURI="popup:papyrus.requirements.menu">
<command
commandId="org.eclipse.papyrus.requirements.sysml14.preferences.handlers.ShowPreferencePageHandler"
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
id="org.eclipse.papyrus.requirements.sysml14.preferences.handlers.ShowPreferencePageHandler"
- style="push">
- </command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.requirements.sysml14.common.ui.preferences.additions">
- <command
- commandId="org.eclipse.papyrus.requirements.sysml14.preferences.handlers.ShowPreferencePageHandler"
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
- id="org.eclipse.papyrus.requirements.sysml14.preferences.handlers.ShowPreferencePageHandler"
+ label="Preference Settings..."
style="push">
</command>
</menuContribution>
@@ -51,7 +41,7 @@
<command
categoryId="org.eclipse.papyrus.editor.category"
id="org.eclipse.papyrus.requirements.sysml14.preferences.handlers.ShowPreferencePageHandler"
- name="%command.name">
+ name="Preference Settings...">
</command>
</extension>
</plugin>
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.properties b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.properties
index fe92ebc..a0ec69a 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.properties
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.properties
@@ -9,7 +9,7 @@
# Mauricio Alferez (CEA LIST) mauricio.alferez@cea.fr - initial API and implementation
##################################################################################
-papyrus.requirements.sysml14.traceability.menu.label = SysML 1.4 Papyrus Req - Traceability Tools
+papyrus.requirements.sysml14.traceability.menu.label = Traceability Tools
papyrus.requirements.sysml14.traceability.menu.tooltip = Traceability assistants for SysML 1.4 requirements models
#--------------------------------------------------------------------------
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.xml b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.xml
index 1bc7081..decb8a2 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.xml
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.traceability.ui/plugin.xml
@@ -5,27 +5,8 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=org.eclipse.papyrus.requirements.sysml14.common.ui.traceability.additions">
+ locationURI="popup:papyrus.requirements.menu">
<menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
- id="papyrus.requirements.sysml14.traceability.menu"
- label="%papyrus.requirements.sysml14.traceability.menu.label"
- tooltip="%papyrus.requirements.sysml.traceability.tooltip">
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
- </visibleWhen>
- </menu>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.requirements.sysml14.common.ui.traceability.additions">
- <menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
id="papyrus.requirements.sysml14.traceability.menu"
label="%papyrus.requirements.sysml14.traceability.menu.label"
tooltip="%papyrus.requirements.sysml14.traceability.menu.tooltip">
diff --git a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.verification/plugin.xml b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.verification/plugin.xml
index 603b916..49a7fde 100644
--- a/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.verification/plugin.xml
+++ b/plugins/sysml14/org.eclipse.papyrus.requirements.sysml14.verification/plugin.xml
@@ -94,20 +94,10 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=org.eclipse.papyrus.requirements.sysml14.common.ui.analysis.additions">
+ locationURI="popup:papyrus.requirements.menu">
<menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
id="org.eclipse.papyrus.requirements.sysml14.verification.menu"
- label="SysML 1.4 Papyrus Req - Validation">
- </menu>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=org.eclipse.papyrus.requirements.sysml14.common.ui.analysis.additions">
- <menu
- icon="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.common.ui/images/Papyrus_Req_logo_16x16.png"
- id="org.eclipse.papyrus.requirements.sysml14.verification.menu"
- label="SysML 1.4 Papyrus Req - Validation">
+ label="Validation">
</menu>
</menuContribution>
<menuContribution
