Merge lp:~tapaal-contributor/tapaal/shared-place-transition-rename-1871091 into lp:tapaal

[Peter Haahr Taankvist]

Sometimes we accidentally made new shared places, with the same name, in different components, instead of sharing the place across components. This should be fixed now.

[Jiri Srba (srba)]

Tested and works fine also with undo/redo.

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

Added some comments on the code control flow.

Also I don't like that the waySharedPlaces and SharedTransitions are copyed are different. However, the original code base is really bad, so lets not change this now.

I tested the changed on the testbranch, merges cleanly and seem to fix the problem.

review: Needs Fixing (code)

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2019-02-03 11:41:57 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2020-04-10 11:26:34 +0000
@@ -35,17 +35,6 @@
 public class MakePlaceNewSharedMultiCommand extends Command {
 
 		private final String newSharedName;
-		private final List<TimedArcPetriNet> tapns;
-		private Hashtable<TAPNQuery, TAPNQuery> newQueryToOldQueryMapping;
-		//private final List<TimedToken> oldTokens;
-		private final TabContent currentTab;
-		private SharedPlacesAndTransitionsPanel sharedPanel;
-		private ArrayList<SharedPlace> sharedPlaces;
-		private HashMap<TimedArcPetriNet, DataLayer> guiModels;
-		private String originalName;
-		private ArrayList<TimedPlace> timedPlaces = new ArrayList<TimedPlace>();
-		private NameGenerator nameGenerator;
-		private pipe.gui.undo.UndoManager undoManager;
 		private Context context;
 		private Place place;
 		private Command command;
@@ -60,25 +49,26 @@
 			
 			this.place = place;
 			this.context = context;
-			this.tapns = context.network().allTemplates();
 			this.newSharedName = newSharedName;
-			this.sharedPlaces = new ArrayList<SharedPlace>();
-			this.currentTab = context.tabContent();
-			this.sharedPanel = currentTab.getSharedPlacesAndTransitionsPanel();
-			guiModels = context.tabContent().getGuiModels();
-			this.originalName = originalName;
-			undoManager = currentTab.drawingSurface().getUndoManager();
-			//oldTokens = place.tokens();
-			newQueryToOldQueryMapping = new Hashtable<TAPNQuery, TAPNQuery>();
 		}
 		
 		@Override
 		public void redo() {
+			SharedPlace sharedPlace = null;
+			int i = 0;
 			for(Template template : context.tabContent().allTemplates()) {
 				TimedPlaceComponent component = (TimedPlaceComponent)template.guiModel().getPlaceByName(place.getName());
-				if(component != null) {
+				//We make a new shared place with the first place
+				if(component != null && i < 1) {
 					command = new MakePlaceNewSharedCommand(template.model(), newSharedName, component.underlyingPlace(), component, context.tabContent(), true);
 					command.redo();
+					sharedPlace = (SharedPlace)component.underlyingPlace();
+					commands.add(command);
+					i++;
+				//For the rest we make them shared with the recently made place
+				} else if (component != null && i >= 1){
+					command = new MakePlaceSharedCommand(context.activeModel(), sharedPlace, component.underlyingPlace(), component, context.tabContent());
+					command.redo();
 					commands.add(command);
 				}
 			}

=== modified file 'src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	2019-02-03 11:41:57 +0000
+++ src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	2020-04-10 11:26:34 +0000
@@ -11,17 +11,13 @@
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
 import pipe.gui.GuiFrame;
-import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.Transition;
-import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 import dk.aau.cs.TCTL.visitors.BooleanResult;
-import dk.aau.cs.TCTL.visitors.MakePlaceSharedVisitor;
 import dk.aau.cs.gui.Context;
 import dk.aau.cs.gui.NameGenerator;
 import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
 import dk.aau.cs.gui.TabContent;
-import dk.aau.cs.model.tapn.LocalTimedPlace;
 import dk.aau.cs.model.tapn.SharedPlace;
 import dk.aau.cs.model.tapn.SharedTransition;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
@@ -35,17 +31,6 @@
 
 public class MakeTransitionNewSharedMultiCommand extends Command {
 	private final String newSharedName;
-	private final List<TimedArcPetriNet> tapns;
-	private Hashtable<TAPNQuery, TAPNQuery> newQueryToOldQueryMapping;
-	//private final List<TimedToken> oldTokens;
-	private final TabContent currentTab;
-	private SharedPlacesAndTransitionsPanel sharedPanel;
-	private ArrayList<SharedPlace> sharedPlaces;
-	private HashMap<TimedArcPetriNet, DataLayer> guiModels;
-	private String originalName;
-	private ArrayList<TimedPlace> timedPlaces = new ArrayList<TimedPlace>();
-	private NameGenerator nameGenerator;
-	private pipe.gui.undo.UndoManager undoManager;
 	private Context context;
 	private Transition transition;
 	private Command command;
@@ -60,23 +45,26 @@
 		
 		this.transition = transition;
 		this.context = context;
-		this.tapns = context.network().allTemplates();
 		this.newSharedName = newSharedName;
-		this.currentTab = context.tabContent();
-		this.sharedPanel = currentTab.getSharedPlacesAndTransitionsPanel();
-		guiModels = context.tabContent().getGuiModels();
-		undoManager = currentTab.drawingSurface().getUndoManager();
-		//oldTokens = place.tokens();
-		newQueryToOldQueryMapping = new Hashtable<TAPNQuery, TAPNQuery>();
 	}
 	
 	@Override
 	public void redo() {
+		SharedTransition sharedTransition = null;
+		int i = 0;
 		for(Template template : context.tabContent().allTemplates()) {
 			TimedTransitionComponent component = (TimedTransitionComponent)template.guiModel().getTransitionByName(transition.getName());
-			if(component != null) {
+			//We make a new shared transition with the first transition
+			if(component != null && i < 1) {
 				command = new MakeTransitionNewSharedCommand(template.model(), newSharedName, component.underlyingTransition(), context.tabContent(), true);
 				command.redo();
+				sharedTransition = component.underlyingTransition().sharedTransition();
+				commands.add(command);
+				i++;
+				//For the rest we make them shared with the recently made transition
+			} else if (component != null && i >= 1){
+				command = new MakeTransitionSharedCommand(context.activeModel(), sharedTransition, component.underlyingTransition(), context.tabContent());
+				command.redo();
 				commands.add(command);
 			}
 		}

=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNet.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2019-03-14 19:41:23 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2020-04-10 11:26:34 +0000
@@ -287,11 +287,15 @@
 		for(TimedPlace p : places) {
 			TimedPlace copy = p.copy();
 			tapn.add(copy);
-			if(!p.isShared()){
-				for(int i = 0; i < p.numberOfTokens(); i++) {
+			if(!p.isShared()) {
+				for (int i = 0; i < p.numberOfTokens(); i++) {
 					tapn.addToken(new TimedToken(copy));
 				}
 			}
+			if(p.isShared()){
+				tapn.remove(copy);
+				tapn.add(p);
+			}
 		}
 
 		for(TimedTransition t : transitions){