Merge lp:~tapaal-contributor/tapaal/incorrectly-shared-components-1940403 into lp:tapaal

[Lena Ernstsen]

Cancelling edit place/transition dialog, will cancel making them shared

[Jiri Srba (srba)]

Tested and works fine

review: Approve

=== modified file 'src/pipe/gui/widgets/PlaceEditorPanel.java'
--- src/pipe/gui/widgets/PlaceEditorPanel.java	2021-08-03 08:36:57 +0000
+++ src/pipe/gui/widgets/PlaceEditorPanel.java	2021-08-24 08:34:20 +0000
@@ -60,6 +60,7 @@
 	private final Context context;
 	private boolean makeNewShared = false;
 	private boolean doNewEdit = true;
+	private  boolean doOKChecked = false;
 	private final TabContent currentTab;
 	
 	private Vector<TimedPlace> sharedPlaces;
@@ -124,7 +125,12 @@
 		cancelButton.setMaximumSize(new java.awt.Dimension(100, 25));
 		cancelButton.setMinimumSize(new java.awt.Dimension(100, 25));
 		cancelButton.setPreferredSize(new java.awt.Dimension(100, 25));
-		cancelButton.addActionListener(evt -> exit());
+		cancelButton.addActionListener(evt -> {
+            if (doOKChecked) {
+                context.undoManager().undo();
+            }
+		    exit();
+        });
 
 		gridBagConstraints = GridBagHelper.as(0,0,EAST, new Insets(5, 5, 5, 5));
 		gridBagConstraints.gridwidth = java.awt.GridBagConstraints.RELATIVE;
@@ -224,21 +230,24 @@
 		
 		makeSharedButton.addActionListener(evt -> {
 			makeNewShared = true;
+            makeSharedButton.setEnabled(false);
 			if(doOK()){
 				setupInitialState();
-				makeSharedButton.setEnabled(false);
 				sharedCheckBox.setEnabled(true);
 				sharedCheckBox.setSelected(true);
 				switchToNameDropDown();
 				sharedPlacesComboBox.setSelectedItem(place.underlyingPlace());
-			}
-			makeNewShared = false;
+			} else {
+                makeSharedButton.setEnabled(true);
+                doOKChecked = false;
+            }
 		});
 		
 		gridBagConstraints = GridBagHelper.as(3,1, WEST, new Insets(5, 5, 5, 5));
 		basicPropertiesPanel.add(makeSharedButton, gridBagConstraints);
 		
 		nameLabel = new javax.swing.JLabel("Name:");
+		nameLabel = new javax.swing.JLabel("Name:");
 		gridBagConstraints = GridBagHelper.as(0,1, EAST, new Insets(3, 3, 3, 3));
 		basicPropertiesPanel.add(nameLabel, gridBagConstraints);
 
@@ -590,7 +599,7 @@
                 context.nameGenerator().updateIndices(context.activeModel(), newName);
             }
 		
-			if(makeNewShared){
+			if(makeNewShared && !makeSharedButton.isEnabled()){
 				Command command = new MakePlaceNewSharedCommand(context.activeModel(), newName, place.underlyingPlace(), place, context.tabContent(), false);
 				context.undoManager().addEdit(command);
 				try{
@@ -641,8 +650,10 @@
 		place.repaint();
 
 		context.network().buildConstraints();
-		
-		return true;
+
+        doOKChecked = true;
+
+        return true;
 	}
 
 	private TimeInvariant constructInvariant() {
 
=== modified file 'src/pipe/gui/widgets/TAPNTransitionEditor.java'
--- src/pipe/gui/widgets/TAPNTransitionEditor.java	2021-08-03 08:36:57 +0000
+++ src/pipe/gui/widgets/TAPNTransitionEditor.java	2021-08-24 08:34:20 +0000
@@ -45,6 +45,8 @@
 	private final TimedTransitionComponent transition;
 	private final JRootPane rootPane;
 	private final Context context;
+
+	private boolean doOKChecked = false;
 	
 	private final int maxNumberOfTransitionsToShowAtOnce = 20;
 	boolean doNewEdit = true;
@@ -124,13 +126,15 @@
 		
 		makeSharedButton.addActionListener(evt -> {
             makeNewShared = true;
+            makeSharedButton.setEnabled(false);
             if(okButtonHandler(evt)){
-                makeSharedButton.setEnabled(false);
                 sharedCheckBox.setEnabled(true);
                 sharedCheckBox.setSelected(true);
                 setupInitialState();
+            } else {
+                makeSharedButton.setEnabled(true);
+                doOKChecked = false;
             }
-            makeNewShared = false;
         });
 		
 		gridBagConstraints = GridBagHelper.as(3,1, Anchor.WEST, new Insets(5, 5, 5, 5));
@@ -403,7 +407,7 @@
 			context.nameGenerator().updateIndices(transition.underlyingTransition().model(), newName);
 		
 			
-			if(makeNewShared){
+			if(makeNewShared && !makeSharedButton.isEnabled()){
 				Command command = new MakeTransitionNewSharedCommand(context.activeModel(), newName, transition.underlyingTransition(), context.tabContent(), false);
 				context.undoManager().addEdit(command);
 				try{
@@ -471,6 +475,8 @@
 		}
 		
 		transition.update(true);
+
+		doOKChecked = true;
 		
 		return true;
 	}
@@ -480,6 +486,9 @@
 	}
 
 	private void cancelButtonHandler(java.awt.event.ActionEvent evt) {
+        if (doOKChecked) {
+            context.undoManager().undo();
+        }
 		exit();
 	}