Merge lp:~tapaal-contributor/tapaal/Remove-ExportPNXML-button-1718642 into lp:tapaal

Proposed by Peter Haahr Taankvist
Status: Merged
Approved by: Jiri Srba
Approved revision: 966
Merged at revision: 967
Proposed branch: lp:~tapaal-contributor/tapaal/Remove-ExportPNXML-button-1718642
Merge into: lp:tapaal
Diff against target: 35 lines (+5/-5)
1 file modified
src/pipe/gui/widgets/CTLQueryDialog.java (+5/-5)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/Remove-ExportPNXML-button-1718642
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+349098@code.launchpad.net

Description of the change

Diasbled button if reductionOption was VerifyPN and made sure it was not updated.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/pipe/gui/widgets/CTLQueryDialog.java'
--- src/pipe/gui/widgets/CTLQueryDialog.java 2018-05-13 14:57:15 +0000
+++ src/pipe/gui/widgets/CTLQueryDialog.java 2018-07-08 17:00:36 +0000
@@ -314,7 +314,6 @@
314 private final static String TOOL_TIP_SAVE_UPPAAL_BUTTON = "Export an xml file that can be opened in UPPAAL GUI.";314 private final static String TOOL_TIP_SAVE_UPPAAL_BUTTON = "Export an xml file that can be opened in UPPAAL GUI.";
315 private final static String TOOL_TIP_SAVE_COMPOSED_BUTTON = "Export an xml file of composed net and approximated net if enabled";315 private final static String TOOL_TIP_SAVE_COMPOSED_BUTTON = "Export an xml file of composed net and approximated net if enabled";
316 private final static String TOOL_TIP_SAVE_TAPAAL_BUTTON = "Export an xml file that can be used as input for the TAPAAL engine.";316 private final static String TOOL_TIP_SAVE_TAPAAL_BUTTON = "Export an xml file that can be used as input for the TAPAAL engine.";
317 private final static String TOOL_TIP_SAVE_PN_BUTTON = "Export an xml file that can be used as input for the untimed Petri net engine.";
318 317
319 //Tool tips for approximation panel318 //Tool tips for approximation panel
320 private final static String TOOL_TIP_APPROXIMATION_METHOD_NONE = "No approximation method is used.";319 private final static String TOOL_TIP_APPROXIMATION_METHOD_NONE = "No approximation method is used.";
@@ -1106,7 +1105,8 @@
1106 Point location = guiDialog.getLocation();1105 Point location = guiDialog.getLocation();
1107 searchOptionsPanel.setVisible(advancedView);1106 searchOptionsPanel.setVisible(advancedView);
1108 reductionOptionsPanel.setVisible(advancedView);1107 reductionOptionsPanel.setVisible(advancedView);
1109 saveUppaalXMLButton.setVisible(advancedView);1108 if(getReductionOption() != ReductionOption.VerifyPN)
1109 saveUppaalXMLButton.setVisible(advancedView);
1110 openComposedNetButton.setVisible(advancedView);1110 openComposedNetButton.setVisible(advancedView);
1111 1111
1112 if(advancedView){1112 if(advancedView){
@@ -2317,10 +2317,10 @@
23172317
2318 private void refreshExportButtonText() {2318 private void refreshExportButtonText() {
2319 ReductionOption reduction = getReductionOption();2319 ReductionOption reduction = getReductionOption();
2320 if (reduction == null) {saveUppaalXMLButton.setEnabled(false);}2320 if (reduction == null || reduction == ReductionOption.VerifyPN) {saveUppaalXMLButton.setEnabled(false);}
2321 else {2321 else {
2322 saveUppaalXMLButton.setText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? EXPORT_VERIFYTAPN_BTN_TEXT : reduction == ReductionOption.VerifyPN ? EXPORT_VERIFYPN_BTN_TEXT : EXPORT_UPPAAL_BTN_TEXT);2322 saveUppaalXMLButton.setText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? EXPORT_VERIFYTAPN_BTN_TEXT : EXPORT_UPPAAL_BTN_TEXT);
2323 saveUppaalXMLButton.setToolTipText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? TOOL_TIP_SAVE_TAPAAL_BUTTON : reduction == ReductionOption.VerifyPN ? TOOL_TIP_SAVE_PN_BUTTON : TOOL_TIP_SAVE_UPPAAL_BUTTON);2323 saveUppaalXMLButton.setToolTipText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? TOOL_TIP_SAVE_TAPAAL_BUTTON : TOOL_TIP_SAVE_UPPAAL_BUTTON);
2324 saveUppaalXMLButton.setEnabled(true);2324 saveUppaalXMLButton.setEnabled(true);
2325 }2325 }
2326 }2326 }

Subscribers

People subscribed via source and target branches