Skip to content
Snippets Groups Projects
Commit be3d73ac authored by Alberto Debiasi's avatar Alberto Debiasi
Browse files

Moved all features from AMASS menu to CHESS menu. Removed AMASS menu 


Change-Id: I617b719c9234d5ea809d5f7723c595f41111c54e
Signed-off-by: default avatarAlberto Debiasi <adebiasi@fbk.eu>
parent cfeebda9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 196 additions and 162 deletions
plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/plugin.xml
+ 50
− 33
View file @ be3d73ac
......@@ -5,48 +5,65 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:org.eclipse.ui.main.menu.AMASS?after=org.eclipse.ui.main.menu.AMASS.funcVer">
locationURI="menu:org.eclipse.ui.main.menu.AMASS?after=org.eclipse.ui.main.menu.CHESS.funcVer">
<menu
label="Safety Analysis">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.safetyAnalysis.commands.debug.ComputeContractFaultTreeOnFileCommand"
style="push">
</command>
</menu>
<menu
label="Fault Tree Viewer">
<command
commandId="eu.fbk.eclipse.standardtools.faultTreeViewer.commands.ShowFaultTreeFromXmlFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.safetyAnalysis.commands.ComputeContractFaultTreeCommand"
style="push">
</command>
id="org.eclipse.ui.main.menu.CHESS.safetyAnalysis"
label="Safety Analysis">
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.ui.main.diagramEditorMenu.AMASS?after=org.eclipse.ui.main.diagramEditorMenu.AMASS.funcVer">
locationURI="popup:org.eclipse.ui.main.diagramEditorMenu.AMASS?after=org.eclipse.ui.main.diagramEditorMenu.CHESS.funcVer">
<menu
label="Safety Analysis"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.safetyAnalysis">
<menu
label="Fault Tree Viewer">
<command
commandId="eu.fbk.eclipse.standardtools.faultTreeViewer.commands.ShowFaultTreeFromXmlFileCommand"
style="push">
</command>
</menu>
<command
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.safetyAnalysis">
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="menu:org.polarsys.chess.mainMenu?after=org.eclipse.ui.main.menu.CHESS.funcVer">
<menu
id="org.eclipse.ui.main.menu.CHESS.safetyAnalysis"
label="Safety Analysis">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.safetyAnalysis.commands.debug.ComputeContractFaultTreeOnFileCommand"
style="push">
</command>
</menu>
<menu
label="Fault Tree Viewer">
<command
commandId="eu.fbk.eclipse.standardtools.faultTreeViewer.commands.ShowFaultTreeFromXmlFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.safetyAnalysis.commands.ComputeContractFaultTreeCommand"
style="push">
</command>
</menu>
</menuContribution>
</command>
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.polarsys.chess.modelexplorerpopupmenu.id?after=org.eclipse.ui.main.diagramEditorMenu.CHESS.funcVer">
<menu
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.safetyAnalysis"
label="Safety Analysis">
<menu
label="Fault Tree Viewer">
<command
commandId="eu.fbk.eclipse.standardtools.faultTreeViewer.commands.ShowFaultTreeFromXmlFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.safetyAnalysis.commands.ComputeContractFaultTreeCommand"
style="push">
</command>
</menu>
</menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
......
plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -44,7 +44,7 @@ public class ComputeContractFaultTreeCommand extends AbstractJobCommand {
String resultFilePath;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
umlSelectedResource = umlSelectedComponent.eResource();
......
plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml
+ 11
− 1
View file @ be3d73ac
......@@ -153,7 +153,7 @@
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
<!-- <menuContribution
allPopups="false"
locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
<menu
......@@ -180,6 +180,16 @@
</visibleWhen>
</command>
</menu>
</menuContribution> -->
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.ui.main.diagramEditorMenu.CHESS.basicOperations">
<command
commandId="org.polarsys.chess.contracts.transformations.smv.id"
id="org.polarsys.chess.contracts.transformations.smv.id"
label="Export as SMV"
style="push">
</command>
</menuContribution>
</extension>
</plugin>
plugins/contracts/org.polarsys.chess.contracts.verificationService/build.properties
+ 2
− 1
View file @ be3d73ac
......@@ -2,4 +2,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
plugin.xml,\
icons/
plugins/contracts/org.polarsys.chess.contracts.verificationService/plugin.xml
+ 120
− 114
View file @ be3d73ac
......@@ -6,54 +6,10 @@
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
<menu
label="AMASS"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS">
<menu
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.basicOperations"
label="Basic Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.ExportModelToFileCommand"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.validation"
label="Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.CheckValidationPropertyCommand2"
style="push">
</command>
</menu>
<menu
label="Functional Verifications"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.funcVer">
<command
commandId="org.polarsys.chess.verificationService.commands.ContractRefinementCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractImplementationCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ModelCheckingCommand2"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.safetyAnalysis"
label="Safety Analysis">
</menu>
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
<menu
label="AMASS"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS">
</menu>
<!--<menu
label="AMASS"
id="org.eclipse.ui.main.modelExplorerMenu.AMASS">
......@@ -95,80 +51,130 @@
<menuContribution
allPopups="false"
locationURI="menu:org.eclipse.ui.main.menu">
<menu
label="AMASS"
id="org.eclipse.ui.main.menu.AMASS">
<menu
id="org.eclipse.ui.main.menu.AMASS.debug"
label="//Debug Operations">
</menu>
<menu
id="org.eclipse.ui.main.menu.AMASS.basicOperation"
label="Basic Operations">
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.polarsys.chess.modelexplorerpopupmenu.id">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.RuntimeErrorsOnFileCommand"
style="push">
</command>
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.basicOperations"
label="Basic Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.ExportModelToFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.verificationService.commands.ExportModelToFileCommand"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.menu.AMASS.validation"
label="Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.CheckValidationPropertyCommand2"
style="push">
</command>
<menu
label="//Debug Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ModelCheckingOnFileCommand"
style="push">
</command>
</menu>
</menu>
<menu
label="Functional Verifications"
id="org.eclipse.ui.main.menu.AMASS.funcVer">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ContractRefinementOnFileCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ContractImplementationOnFileCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.debug.CheckValidationPropertyOnFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractRefinementCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractImplementationCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ModelCheckingCommand2"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.menu.AMASS.safetyAnalysis"
label="Safety Analysis">
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.validation"
label="Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.CheckValidationPropertyCommand2"
style="push">
</command>
</menu>
</menu>
</menuContribution>
<menu
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.funcVer"
label="Functional Verifications">
<command
commandId="org.polarsys.chess.verificationService.commands.ContractRefinementCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractImplementationCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ModelCheckingCommand2"
style="push">
</command>
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="menu:org.polarsys.chess.mainMenu">
<menu
id="org.eclipse.ui.main.menu.CHESS.basicOperation"
label="Basic Operations">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.RuntimeErrorsOnFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.verificationService.commands.ExportModelToFileCommand"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.menu.CHESS.validation"
label="Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.CheckValidationPropertyCommand2"
style="push">
</command>
<menu
label="//Debug Validation">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ModelCheckingOnFileCommand"
style="push">
</command>
</menu>
</menu>
<menu
id="org.eclipse.ui.main.menu.CHESS.funcVer"
label="Functional Verifications">
<menu
label="//Debug Operations">
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ContractRefinementOnFileCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.debug.ContractImplementationOnFileCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.debug.CheckValidationPropertyOnFileCommand"
style="push">
</command>
</menu>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractRefinementCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ContractImplementationCommand"
style="push">
</command>
<command
commandId="org.polarsys.chess.verificationService.commands.ModelCheckingCommand2"
style="push">
</command>
</menu>
<menu
id="org.eclipse.ui.main.menu.CHESS.safetyAnalysis"
label="Safety Analysis">
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
<menu
icon="icons/CHESSicon.gif"
id="org.polarsys.chess.modelexplorerpopupmenu.id"
label="CHESS">
</menu>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
<menu
icon="icons/CHESSicon.gif"
id="org.polarsys.chess.modelexplorerpopupmenu.id"
label="CHESS">
</menu>
</menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
......
plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/CheckValidationPropertyCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -50,7 +50,7 @@ public class CheckValidationPropertyCommand extends AbstractJobCommand {
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
umlSelectedResource = umlSelectedComponent.eResource();
isDiscreteTime = MessageTimeModelDialog.openQuestion();
......
plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractImplementationCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -49,7 +49,7 @@ public class ContractImplementationCommand extends AbstractJobCommand {
private String resultFilePath;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
umlSelectedResource = umlSelectedComponent.eResource();
isDiscreteTime = MessageTimeModelDialog.openQuestion();
......
plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractRefinementCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -43,7 +43,7 @@ public class ContractRefinementCommand extends AbstractJobCommand {
private String resultFilePath;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
umlSelectedResource = umlSelectedComponent.eResource();
isDiscreteTime = MessageTimeModelDialog.openQuestion();
......
plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ExportModelToFileCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -49,7 +49,7 @@ public class ExportModelToFileCommand extends AbstractJobCommand {
private Class umlSelectedComponent;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
umlSelectedResource = umlSelectedComponent.eResource();
isDiscreteTime = MessageTimeModelDialog.openQuestion();
......
plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ModelCheckingCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -42,7 +42,7 @@ public class ModelCheckingCommand extends AbstractJobCommand {
private String smvFilePath;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
showPopups = false;
smvFilePath = nuXmvDirectoryUtil.getSmvFilePath();
......
plugins/org.polarsys.chess.diagram.ui/plugin.xml
+ 6
− 6
View file @ be3d73ac
......@@ -5,13 +5,13 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:org.eclipse.ui.main.menu.AMASS?after=org.eclipse.ui.main.menu.AMASS.funcVer">
locationURI="menu:org.polarsys.chess.mainMenu?after=org.eclipse.ui.main.menu.CHESS.safetyAnalysis">
<menu
label="Safety Case"
id="org.eclipse.ui.main.menu.AMASS.safetyCase">
id="org.eclipse.ui.main.menu.CHESS.safetyCase">
<menu
label="Document Generation"
id="org.eclipse.ui.main.menu.AMASS.docGen">
id="org.eclipse.ui.main.menu.CHESS.docGen">
<command
commandId="org.polarsys.chess.diagram.ui.commands.ExportComponentToImageCommand"
style="push">
......@@ -29,13 +29,13 @@
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:org.eclipse.ui.main.diagramEditorMenu.AMASS?after=org.eclipse.ui.main.diagramEditorMenu.AMASS.funcVer">
locationURI="popup:org.polarsys.chess.modelexplorerpopupmenu.id?after=org.eclipse.ui.main.diagramEditorMenu.CHESS.safetyAnalysis">
<menu
label="Safety Case"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.safetyCase">
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.safetyCase">
<menu
label="Document Generation"
id="org.eclipse.ui.main.diagramEditorMenu.AMASS.docGen">
id="org.eclipse.ui.main.diagramEditorMenu.CHESS.docGen">
<command
commandId="org.polarsys.chess.diagram.ui.commands.ExportComponentToImageCommand"
style="push">
......
plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
+ 1
− 1
View file @ be3d73ac
......@@ -56,7 +56,7 @@ public class GenerateDocumentCommand extends AbstractJobCommand {
private Collection<Diagram> chessDiagrams;
@Override
public void execGUIOperations(ExecutionEvent event) throws Exception {
public void execGUIOperations(ExecutionEvent event,IProgressMonitor monitor) throws Exception {
umlSelectedComponent = selectionUtil.getUmlComponentFromSelectedObject(event);
isDiscreteTime = MessageTimeModelDialog.openQuestion();
outputDirectoryName = exportDialogUtils.getDirectoryNameFromDialog();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent