Merge lp:~tapaal-contributor/tapaal/undo-shared-place-transition-1848948 into lp:tapaal

[Peter Haahr Taankvist]

Making a place or transition shared now only requires one press on undo to undo

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/widgets/PlaceEditorPanel.java'
--- src/pipe/gui/widgets/PlaceEditorPanel.java	2019-03-04 13:27:40 +0000
+++ src/pipe/gui/widgets/PlaceEditorPanel.java	2019-10-24 09:58:47 +0000
@@ -71,6 +71,7 @@
 	private TimedPlaceComponent place;
 	private Context context;
 	private boolean makeNewShared = false;
+	private boolean doNewEdit = true;
 	
 	private Vector<TimedPlace> sharedPlaces;
 	private int maxNumberOfPlacesToShowAtOnce = 20;
@@ -663,9 +664,11 @@
 			JOptionPane.showMessageDialog(this,"It is allowed to have at most " + Pipe.MAX_NUMBER_OF_TOKENS_ALLOWED + " tokens in a place.", "Error", JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
-
-		context.undoManager().newEdit(); // new "transaction""
-
+		//Only make new edit if it has not already been done
+		if(doNewEdit) {
+			context.undoManager().newEdit(); // new "transaction""
+			doNewEdit = false;
+		}
 		TimedPlace underlyingPlace = place.underlyingPlace();
 
 		SharedPlace selectedPlace = (SharedPlace)sharedPlacesComboBox.getSelectedItem();
 
=== modified file 'src/pipe/gui/widgets/TAPNTransitionEditor.java'
--- src/pipe/gui/widgets/TAPNTransitionEditor.java	2019-03-04 13:27:40 +0000
+++ src/pipe/gui/widgets/TAPNTransitionEditor.java	2019-10-24 09:58:47 +0000
@@ -46,6 +46,7 @@
 	private Context context;
 	
 	private int maxNumberOfTransitionsToShowAtOnce = 20;
+	boolean doNewEdit = true;
 
 	public TAPNTransitionEditor(JRootPane _rootPane, TimedTransitionComponent _transition, Context context) {
 		rootPane = _rootPane;
@@ -396,8 +397,11 @@
 		if(urgentCheckBox.isSelected() && !isUrgencyOK()){
 			return false;
 		}
-			
-		context.undoManager().newEdit(); // new "transaction""
+		//Only do new edit if it has not already been done
+		if(doNewEdit) {
+			context.undoManager().newEdit(); // new "transaction""
+			doNewEdit = false;
+		}
 		
 		boolean wasShared = transition.underlyingTransition().isShared() && !sharedCheckBox.isSelected();
 		if(transition.underlyingTransition().isShared()){