Merge lp:~tapaal-contributor/tapaal/unshare-transitions-in-all-components-1820014 into lp:tapaal

[Peter Haahr Taankvist]

Transitions shared via the error dialog (when every transition with the same name is shared as well) will now correctly be removed when removing them in the sidepanel.

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java'
--- src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2019-01-24 14:23:06 +0000
+++ src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2019-03-14 19:45:52 +0000
@@ -91,15 +91,17 @@
 		messageShown = false;
 		if(list.getSelectedValuesList() != null){
 			ArrayList<String> affectedComponents = new ArrayList<String>();
+			ArrayList<String> affectedComponentsWithDupes = new ArrayList<String>();
 			if(sharedPlacesAndTransitionsPanel.isDisplayingTransitions()){
 				for(Object transition : list.getSelectedValuesList()) {
-					for(TimedTransition t : ((SharedTransition)transition).transitions()){
-						if(!(affectedComponents.contains(t.model().name())))
-							affectedComponents.add(t.model().name());
+					affectedComponentsWithDupes.addAll(((SharedTransition)transition).getComponentsUsingThisTransition());
+				}
+				for(String component : affectedComponentsWithDupes) {
+					if(!(affectedComponents.contains(component))) {
+						affectedComponents.add(component);
 					}
 				}
 			} else {
-				ArrayList<String> affectedComponentsWithDupes = new ArrayList<String>();
 				for(Object place : list.getSelectedValuesList()) {
 					affectedComponentsWithDupes.addAll(((SharedPlace)place).getComponentsUsingThisPlace());
 				}
@@ -296,17 +298,25 @@
 			sharedTransitionsListModel.removeElement(sharedTransition);
 			undoManager.addEdit(new DeleteSharedTransitionCommand(sharedTransition, sharedTransitionsListModel));
 		}else{
-			Collection<TimedTransition> copy = sharedTransition.transitions();
-			for(TimedTransition transition : copy){
+			
+			ArrayList<TimedTransition> transitions = new ArrayList<TimedTransition> ();
+			for(Template template : tab.allTemplates()) {
+				TimedTransition timedTransition = template.model().getTransitionByName(sharedTransition.name());
+				if(timedTransition != null)
+					transitions.add(timedTransition);
+			}
+			for(TimedTransition transition : transitions){
 				transition.unshare();
 				undoManager.addEdit(new UnshareTransitionCommand(sharedTransition, transition));
 			}
 			sharedTransitionsListModel.removeElement(sharedTransition);
 			undoManager.addEdit(new DeleteSharedTransitionCommand(sharedTransition, sharedTransitionsListModel));
-			for(TimedTransition transition : copy){
+			for(TimedTransition transition : transitions){
 				String name = nameGenerator.getNewTransitionName(transition.model());
 				// We add this invisible transition renaming to avoid problems with undo
-				undoManager.addEdit(new RenameTimedTransitionCommand(tab, transition, name, transition.name())); 
+				Command renameCommand = new RenameTimedTransitionCommand(tab, transition, name, transition.name());
+				renameCommand.redo();
+				undoManager.addEdit(renameCommand); 
 			}
 		}
 	}
 
=== modified file 'src/dk/aau/cs/model/tapn/SharedTransition.java'
--- src/dk/aau/cs/model/tapn/SharedTransition.java	2016-04-28 13:18:00 +0000
+++ src/dk/aau/cs/model/tapn/SharedTransition.java	2019-03-14 19:45:52 +0000
@@ -7,6 +7,8 @@
 
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.Require;
+import pipe.dataLayer.Template;
+import pipe.gui.CreateGui;
 
 public class SharedTransition {
 	private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
@@ -152,4 +154,14 @@
 		}
 		return true;
 	}
+	public ArrayList<String> getComponentsUsingThisTransition(){
+		ArrayList<String> components = new ArrayList<String>();
+		for(Template t : CreateGui.getCurrentTab().allTemplates()){
+			TimedTransition tt = t.model().getTransitionByName(this.name);
+			if(tt != null){
+				components.add(t.model().name());
+			}
+		}
+		return components;
+	}
 }
 
=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNet.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2019-02-03 11:41:57 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2019-03-14 19:45:52 +0000
@@ -5,6 +5,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import pipe.gui.CreateGui;
+import pipe.gui.GuiFrame;
 import pipe.gui.undo.AddArcPathPointEdit;
 import pipe.gui.widgets.PlaceEditorPanel;
 import dk.aau.cs.model.tapn.Bound.InfBound;
@@ -63,7 +65,6 @@
 	public void add(TimedTransition transition) {
 		Require.that(transition != null, "Argument must be a non-null transition");
 		Require.that(!isNameUsed(transition.name()) || transition.isShared(), "A place or transition with the specified name already exists in the petri net.");
-
 		transition.setModel(this);
 		transitions.add(transition);
 	}