TAPAAL

Merge lp:~tapaal-contributor/tapaal/bug898117-query-modified-save into lp:tapaal

  1. bug898117-query-modified-save
  2. Merge into trunk
Proposed by Jiri Srba
Status: Merged
Approved by: Kenneth Yrke Jørgensen
Approved revision: 665
Merged at revision: 666
Proposed branch: lp:~tapaal-contributor/tapaal/bug898117-query-modified-save
Merge into: lp:tapaal
Diff against target: 44 lines (+5/-2)
3 files modified
src/dk/aau/cs/gui/BatchProcessingDialog.java (+0/-1)
src/pipe/gui/GuiFrame.java (+1/-1)
src/pipe/gui/widgets/QueryDialog.java (+4/-0)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/bug898117-query-modified-save
Reviewer Review Type Date Requested Status
Kenneth Yrke Jørgensen Approve
Jiri Srba Approve
Review via email: mp+94748@code.launchpad.net

Commit message

Net is marked as modified also when a query is changed (by pressing save or save/verify).

Description of the change

Whenever a query is saved or saved/verified, the net is marked as changed.
Also, when entering batch processing, the user is suggested to save all
unsaved nets, not only the active one.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve
Revision history for this message
Kenneth Yrke Jørgensen (yrke) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
2--- src/dk/aau/cs/gui/BatchProcessingDialog.java 2012-01-27 14:28:55 +0000
3+++ src/dk/aau/cs/gui/BatchProcessingDialog.java 2012-02-27 11:10:25 +0000
4@@ -34,7 +34,6 @@
5 import javax.swing.JOptionPane;
6 import javax.swing.JPanel;
7 import javax.swing.JScrollPane;
8-import javax.swing.JSpinner;
9 import javax.swing.JSplitPane;
10 import javax.swing.JTable;
11 import javax.swing.ListCellRenderer;
12
13=== modified file 'src/pipe/gui/GuiFrame.java'
14--- src/pipe/gui/GuiFrame.java 2012-02-23 20:58:48 +0000
15+++ src/pipe/gui/GuiFrame.java 2012-02-27 11:10:25 +0000
16@@ -582,7 +582,7 @@
17 batchProcessing.setMnemonic('b');
18 batchProcessing.addActionListener(new ActionListener() {
19 public void actionPerformed(ActionEvent arg0) {
20- checkForSave();
21+ checkForSaveAll();
22 BatchProcessingDialog dialog = new BatchProcessingDialog(CreateGui.getApp(), "Batch Processing", true);
23 dialog.pack();
24 dialog.setPreferredSize(dialog.getSize());
25
26=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
27--- src/pipe/gui/widgets/QueryDialog.java 2012-01-27 14:28:55 +0000
28+++ src/pipe/gui/widgets/QueryDialog.java 2012-02-27 11:10:25 +0000
29@@ -2065,12 +2065,16 @@
30 // TODO make save
31 // save();
32 querySaved = true;
33+ // Now if a query is saved, the net is marked as modified
34+ CreateGui.getView().setNetChanged(true);
35 exit();
36 }
37 });
38 saveAndVerifyButton.addActionListener(new ActionListener() {
39 public void actionPerformed(ActionEvent evt) {
40 querySaved = true;
41+ // Now if a query is saved and verified, the net is marked as modified
42+ CreateGui.getView().setNetChanged(true);
43 exit();
44 TAPNQuery query = getQuery();
45

Subscribers

People subscribed via source and target branches