Merge lp:~tapaal-contributor/tapaal/places-with-same-name-shared-1801728 into lp:tapaal

[Peter Haahr Taankvist]

The GUI will now ask if the user wants to make all places of the same name shared, if the user tries to share a place which name is used by other places in different components.

This also applies for transitions.

[lp:~tapaal-contributor/tapaal/places-with-same-name-shared-1801728]

985. By Peter Taankvist <email address hidden> on 2019-02-03

Remove unused code and debug lines

[Jiri Srba (srba)]

A. Change the message:

Would you like to make the other places of the same name shared too?

into

Do you want to share this place name also in all other components?

The same for transitions.

B. For transitions this does not work. Open workflow-advanced.tapn example net,
remove the A0 shared transition, then double click on the transition and make it shared
and answer "YES". All seems fine but when you click ok, you get the error message:
"The specified name is already used by another place or transition."

C. Another bug is when you open alternating bit protocol with components, unshared the place Medium_A, then double click is and select "Make shared" and then answer "NO". You get
NPE:
Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
 at pipe.gui.widgets.PlaceEditorPanel.switchToNameDropDown(PlaceEditorPanel.java:609)
 at pipe.gui.widgets.PlaceEditorPanel.access$200(PlaceEditorPanel.java:63)
 at pipe.gui.widgets.PlaceEditorPanel$5.actionPerformed(PlaceEditorPanel.java:268)
 at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2018)
 at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2341)
 at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402)
 at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259)
 at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:252)
 at java.awt.Component.processMouseEvent(Component.java:6505)
 at javax.swing.JComponent.processMouseEvent(JComponent.java:3321)

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/places-with-same-name-shared-1801728]

986. By Peter Taankvist <email address hidden> on 2019-03-02

Change error message for places and transitions

987. By Peter Taankvist <email address hidden> on 2019-03-02

Merge with trunk

988. By Peter Taankvist <email address hidden> on 2019-03-02

Add missing brackets, so it false is returned properly

989. By Peter Taankvist <email address hidden> on 2019-03-02

return false on no option, so nothing is done

[Peter Haahr Taankvist (ptaank)]

Changed the message.

Added brackets around a return statement so it does not return false in either case.

Returns false when the no option is chosen, so that changes that are made when a place is shared, are not made.

review: Needs Resubmitting

[Jiri Srba (srba)]

Before the message:

Do you want to share this place/transition name also in all other components?

is an extra empty space that should be removed.

Also, do you want to share this transition/place in the other components offers
yes/no dialog. Answering "no" is not logical, as it (as far as I can tell) does nothing.
The dialog should be rather ask:

"This place/transition name will be changed into shared one also in all other components."

and offer Cancel/OK dialog.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/places-with-same-name-shared-1801728]

990. By Peter Taankvist <email address hidden> on 2019-03-04

Changed error message and made ok/cancel option instead

[Peter Haahr Taankvist (ptaank)]

Changed the dialog to ok/cancel and changed the message

review: Needs Resubmitting

[Jiri Srba (srba)]

Works as expected now. Will merge to trunk.

review: Approve

=== modified file 'src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java'
--- src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2019-02-12 13:09:06 +0000
+++ src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2019-03-04 13:28:08 +0000
@@ -444,7 +444,10 @@
 	}
 	
 	public void addSharedPlace(SharedPlace place){
-		sharedPlacesListModel.addElement(place);
+		addSharedPlace(place, false);
+	}
+	public void addSharedPlace(SharedPlace place, boolean multiAdd){
+		sharedPlacesListModel.addElement(place, multiAdd);
 	}
 	
 	public void removeSharedTransition(SharedTransition transition){
@@ -452,9 +455,11 @@
 			sharedTransitionsListModel.removeElement(transition);
 		}
 	}
-	
 	public void addSharedTransition(SharedTransition transition){
-		sharedTransitionsListModel.addElement(transition);
+		addSharedTransition(transition, false);
+	}
+	public void addSharedTransition(SharedTransition transition, boolean multiAdd){
+		sharedTransitionsListModel.addElement(transition, multiAdd);
 	}
 
 	public class SharedPlacesListModel extends AbstractListModel {
@@ -506,7 +511,10 @@
 		}
 
 		public void addElement(SharedPlace place){
-			network.add(place);
+			addElement(place, false);
+		}
+		public void addElement(SharedPlace place, boolean multiAdd){
+			network.add(place, multiAdd);
 			fireIntervalAdded(this, network.numberOfSharedPlaces()-1, network.numberOfSharedPlaces());
 		}
 
@@ -584,9 +592,12 @@
 		public int getSize() {
 			return network.numberOfSharedTransitions();
 		}
-
 		public void addElement(SharedTransition transition){
-			network.add(transition);
+			addElement(transition, false);
+		}
+
+		public void addElement(SharedTransition transition, boolean multiAdd){
+			network.add(transition, multiAdd);
 			fireIntervalAdded(this, network.numberOfSharedTransitions()-1, network.numberOfSharedTransitions());
 		}
 

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java	2015-11-04 12:51:55 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java	2019-03-04 13:28:08 +0000
@@ -30,8 +30,9 @@
 	private final TabContent currentTab;
 	private SharedPlacesAndTransitionsPanel sharedPanel;
 	private SharedPlace sharedPlace;
+	private boolean multiShare;
 	
-	public MakePlaceNewSharedCommand(TimedArcPetriNet tapn, String newSharedName, TimedPlace place, TimedPlaceComponent placeComponent, TabContent currentTab){
+	public MakePlaceNewSharedCommand(TimedArcPetriNet tapn, String newSharedName, TimedPlace place, TimedPlaceComponent placeComponent, TabContent currentTab, boolean multiShare){
 		Require.that(tapn != null, "tapn cannot be null");
 		Require.that(newSharedName != null, "newSharedName cannot be null");
 		Require.that(place != null, "timedPlace cannot be null");
@@ -45,6 +46,7 @@
 		this.sharedPlace = null;
 		this.currentTab = currentTab;
 		this.sharedPanel = currentTab.getSharedPlacesAndTransitionsPanel();
+		this.multiShare = multiShare;
 		oldTokens = place.tokens();
 		newQueryToOldQueryMapping = new Hashtable<TAPNQuery, TAPNQuery>();
 	}
@@ -57,9 +59,9 @@
 			sharedPlace = new SharedPlace(newSharedName);
 		}
 		
-		sharedPanel.addSharedPlace(sharedPlace);		
+		sharedPanel.addSharedPlace(sharedPlace, multiShare);
 		updateArcs(place, sharedPlace);
-		tapn.add(sharedPlace);
+		tapn.add(sharedPlace, multiShare);
 		placeComponent.setUnderlyingPlace(sharedPlace);
 		
 		updateQueries(place, sharedPlace);
@@ -72,7 +74,7 @@
 		}
 		updateArcs(sharedPlace, place);
 		tapn.remove(sharedPlace);
-		tapn.add(place);
+		tapn.add(place, multiShare);
 		place.addTokens(oldTokens);
 		placeComponent.setUnderlyingPlace(place);
 		

=== added file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2019-03-04 13:28:08 +0000
@@ -0,0 +1,93 @@
+package dk.aau.cs.gui.undo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map.Entry;
+
+import javax.swing.undo.UndoManager;
+
+import pipe.dataLayer.DataLayer;
+import pipe.dataLayer.TAPNQuery;
+import pipe.dataLayer.Template;
+import pipe.gui.CreateGui;
+import pipe.gui.GuiFrame;
+import pipe.gui.graphicElements.Place;
+import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
+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.TimedArcPetriNet;
+import dk.aau.cs.model.tapn.TimedInhibitorArc;
+import dk.aau.cs.model.tapn.TimedInputArc;
+import dk.aau.cs.model.tapn.TimedOutputArc;
+import dk.aau.cs.model.tapn.TimedPlace;
+import dk.aau.cs.model.tapn.TimedToken;
+import dk.aau.cs.model.tapn.TransportArc;
+import dk.aau.cs.util.Require;
+
+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;
+		private List<Command> commands = new ArrayList<Command>();
+
+
+		
+		public MakePlaceNewSharedMultiCommand(dk.aau.cs.gui.Context context, String newSharedName, TimedPlaceComponent place){
+			Require.that(context.network().allTemplates() != null, "tapns cannot be null");
+			Require.that(newSharedName != null, "newSharedName cannot be null");
+			Require.that(context.tabContent() != null, "currentTab cannot be null");
+			
+			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() {
+			for(Template template : context.tabContent().allTemplates()) {
+				TimedPlaceComponent component = (TimedPlaceComponent)template.guiModel().getPlaceByName(place.getName());
+				if(component != null) {
+					command = new MakePlaceNewSharedCommand(template.model(), newSharedName, component.underlyingPlace(), component, context.tabContent(), true);
+					command.redo();
+					commands.add(command);
+				}
+			}
+		}
+
+		@Override
+		public void undo() {	
+			for(Command command : commands)
+				command.undo();
+		}
+	}
+

=== modified file 'src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java'
--- src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java	2015-11-04 20:11:26 +0000
+++ src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java	2019-03-04 13:28:08 +0000
@@ -17,14 +17,16 @@
 	private final String oldName;
 	private final TimedArcPetriNet tapn;
 	private SharedPlacesAndTransitionsPanel sharedPanel;
+	private boolean multiShare;
 	
-	public MakeTransitionNewSharedCommand(TimedArcPetriNet tapn, String newName, TimedTransition timedTransition, TabContent tabContent){
+	public MakeTransitionNewSharedCommand(TimedArcPetriNet tapn, String newName, TimedTransition timedTransition, TabContent tabContent, boolean multiShare){
 		this.sharedTransition = null;
 		this.tapn = tapn;
 		this.timedTransition = timedTransition;
 		this.newName = newName;
 		this.oldName = timedTransition.name();
 		this.sharedPanel = tabContent.getSharedPlacesAndTransitionsPanel();
+		this.multiShare = multiShare;
 	}
 	
 	@Override
@@ -33,7 +35,7 @@
 		if(sharedTransition == null){
 			sharedTransition = new SharedTransition(newName);
 		}
-		sharedPanel.addSharedTransition(sharedTransition);			
+		sharedPanel.addSharedTransition(sharedTransition, multiShare);			
 		sharedTransition.makeShared(timedTransition);
 		
 		tapn.add(timedTransition);

=== added file 'src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	2019-03-04 13:28:08 +0000
@@ -0,0 +1,90 @@
+package dk.aau.cs.gui.undo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map.Entry;
+import javax.swing.undo.UndoManager;
+import pipe.dataLayer.DataLayer;
+import pipe.dataLayer.TAPNQuery;
+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;
+import dk.aau.cs.model.tapn.TimedInhibitorArc;
+import dk.aau.cs.model.tapn.TimedInputArc;
+import dk.aau.cs.model.tapn.TimedOutputArc;
+import dk.aau.cs.model.tapn.TimedPlace;
+import dk.aau.cs.model.tapn.TimedToken;
+import dk.aau.cs.model.tapn.TransportArc;
+import dk.aau.cs.util.Require;
+
+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;
+	private List<Command> commands = new ArrayList<Command>();
+
+
+	
+	public MakeTransitionNewSharedMultiCommand(dk.aau.cs.gui.Context context, String newSharedName, TimedTransitionComponent transition){
+		Require.that(context.network().allTemplates() != null, "tapns cannot be null");
+		Require.that(newSharedName != null, "newSharedName cannot be null");
+		Require.that(context.tabContent() != null, "currentTab cannot be null");
+		
+		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() {
+		for(Template template : context.tabContent().allTemplates()) {
+			TimedTransitionComponent component = (TimedTransitionComponent)template.guiModel().getTransitionByName(transition.getName());
+			if(component != null) {
+				command = new MakeTransitionNewSharedCommand(template.model(), newSharedName, component.underlyingTransition(), context.tabContent(), true);
+				command.redo();
+				commands.add(command);
+			}
+		}
+	}
+
+	@Override
+	public void undo() {	
+		for(Command command : commands)
+			command.undo();
+	}
+}

=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNet.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2016-04-21 19:11:59 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2019-03-04 13:28:08 +0000
@@ -6,7 +6,7 @@
 import java.util.List;
 
 import pipe.gui.undo.AddArcPathPointEdit;
-
+import pipe.gui.widgets.PlaceEditorPanel;
 import dk.aau.cs.model.tapn.Bound.InfBound;
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.Require;
@@ -49,9 +49,12 @@
 	}
 
 	public void add(TimedPlace place) {
+		add(place, false);
+	}
+	public void add(TimedPlace place, boolean multiRemove) {
 		Require.that(place != null, "Argument must be a non-null place");
-		Require.that(!isNameUsed(place.name()) || (place.isShared() && !places.contains(place)), "A place or transition with the specified name already exists in the petri net.");
-
+		if(!multiRemove)
+			Require.that(!isNameUsed(place.name()) || (place.isShared() && !places.contains(place)), "A place or transition with the specified name already exists in the petri net.");
 		if(!place.isShared()) ((LocalTimedPlace)place).setModel(this);
 		places.add(place);
 		place.setCurrentMarking(currentMarking);

=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java	2015-09-29 09:26:14 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java	2019-03-04 13:28:08 +0000
@@ -8,6 +8,7 @@
 import java.util.Set;
 
 import pipe.gui.MessengerImpl;
+import pipe.gui.widgets.PlaceEditorPanel;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.event.ConstantChangedEvent;
 import dk.aau.cs.model.tapn.event.ConstantEvent;
@@ -60,22 +61,35 @@
 		currentMarking.addMarking(tapn, marking);
 		tapn.setMarking(currentMarking);
 	}
-	
 	public void add(SharedTransition sharedTransition){
+		add(sharedTransition, false);
+	}
+
+	
+	public void add(SharedTransition sharedTransition, boolean multiAdd){
 		Require.that(sharedTransition != null, "sharedTransition must not be null");
-		Require.that(!isNameUsed(sharedTransition.name()), "There is already a transition or place with that name");
+		if(!multiAdd) {
+			Require.that(!isNameUsed(sharedTransition.name()), "There is already a transition or place with that name");
+		}
 		
 		sharedTransition.setNetwork(this);
-		sharedTransitions.add(sharedTransition);
+		if(!(sharedTransitions.contains(sharedTransition)))
+			sharedTransitions.add(sharedTransition);
 	}
 	
 	public void add(SharedPlace sharedPlace) {
+		add(sharedPlace, false);
+	}
+	
+	public void add(SharedPlace sharedPlace, boolean multiremove) {
 		Require.that(sharedPlace != null, "sharedPlace must not be null");
-		Require.that(!isNameUsed(sharedPlace.name()), "There is already a transition or place with that name");
-		
+		if(multiremove == false) {
+			Require.that(!isNameUsed(sharedPlace.name()), "There is already a transition or place with that name");
+		}
 		sharedPlace.setNetwork(this);
 		sharedPlace.setCurrentMarking(currentMarking);
-		sharedPlaces.add(sharedPlace);		
+		if(!(sharedPlaces.contains(sharedPlace)))
+			sharedPlaces.add(sharedPlace);
 	}
 
 	public boolean isNameUsedForShared(String name){
@@ -100,6 +114,25 @@
 		}
 		return false;
 	}
+	
+	public boolean isNameUsedForPlacesOnly(String name) {
+		for(TimedArcPetriNet net : tapns){
+			for(TimedTransition transition : net.transitions()) {
+				if(name.equalsIgnoreCase(transition.name()))
+					return false;
+			}
+		}
+		return true;
+	}
+	public boolean isNameUsedForTransitionsOnly(String name) {
+		for(TimedArcPetriNet net : tapns){
+			for(TimedPlace place : net.places()) {
+				if(name.equalsIgnoreCase(place.name()))
+					return false;
+			}
+		}
+		return true;
+	}
 		
 	public boolean isNameUsed(String name) {
 		return isNameUsedForShared(name) || isNameUsedInTemplates(name);

=== modified file 'src/pipe/gui/widgets/PlaceEditorPanel.java'
--- src/pipe/gui/widgets/PlaceEditorPanel.java	2018-11-05 14:29:27 +0000
+++ src/pipe/gui/widgets/PlaceEditorPanel.java	2019-03-04 13:28:08 +0000
@@ -13,6 +13,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Set;
 import java.util.Vector;
 
@@ -28,15 +29,19 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
 import pipe.gui.Pipe;
+import pipe.gui.graphicElements.PetriNetObject;
+import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import dk.aau.cs.gui.Context;
 import dk.aau.cs.gui.undo.ChangedInvariantCommand;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.gui.undo.MakePlaceSharedCommand;
 import dk.aau.cs.gui.undo.MakePlaceNewSharedCommand;
+import dk.aau.cs.gui.undo.MakePlaceNewSharedMultiCommand;
 import dk.aau.cs.gui.undo.RenameTimedPlaceCommand;
 import dk.aau.cs.gui.undo.TimedPlaceMarkingEdit;
 import dk.aau.cs.gui.undo.UnsharePlaceCommand;
@@ -47,6 +52,7 @@
 import dk.aau.cs.model.tapn.LocalTimedPlace;
 import dk.aau.cs.model.tapn.SharedPlace;
 import dk.aau.cs.model.tapn.TimeInvariant;
+import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedInhibitorArc;
 import dk.aau.cs.model.tapn.TimedInputArc;
 import dk.aau.cs.model.tapn.TimedOutputArc;
@@ -701,14 +707,26 @@
 			context.nameGenerator().updateIndices(context.activeModel(), newName);
 		
 			if(makeNewShared){
-				Command command = new MakePlaceNewSharedCommand(context.activeModel(), newName, place.underlyingPlace(), place, context.tabContent());
+				Command command = new MakePlaceNewSharedCommand(context.activeModel(), newName, place.underlyingPlace(), place, context.tabContent(), false);
 				context.undoManager().addEdit(command);
 				try{
 					command.redo();
 				}catch(RequireException e){
 					context.undoManager().undo();
-					JOptionPane.showMessageDialog(this, "A transition or place with the specified name already exists in this or another component, or the specified name is invalid.\n\nAcceptable names for transitions are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*\n\nNote that \"true\" and \"false\" are reserved keywords.", "Error", JOptionPane.ERROR_MESSAGE);
-					return false;
+					//This is checked as a place cannot be shared if there exists a transition with the same name
+					if(context.activeModel().parentNetwork().isNameUsedForPlacesOnly(newName)) {
+						int dialogResult = JOptionPane.showConfirmDialog(this, "A place with the specified name already exists in one or more components, or the specified name is invalid.\n\nAcceptable names for places are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*\n\nNote that \"true\" and \"false\" are reserved keywords. \n\nThis place name will be changed into shared one also in all other components.", "Error", JOptionPane.OK_CANCEL_OPTION);
+						if(dialogResult == JOptionPane.OK_OPTION) {
+							Command cmd = new MakePlaceNewSharedMultiCommand(context, newName, place);	
+							cmd.redo();
+							context.undoManager().addNewEdit(cmd);
+						} else {
+							return false;
+						}
+					} else {
+						JOptionPane.showMessageDialog(this, "A transition with the specified name already exists in one or more components, or the specified name is invalid.\n\nAcceptable names for places are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*\n\nNote that \"true\" and \"false\" are reserved keywords.", "Error", JOptionPane.OK_OPTION);
+						return false;
+					}
 				}	
 			}
 		}

=== modified file 'src/pipe/gui/widgets/TAPNTransitionEditor.java'
--- src/pipe/gui/widgets/TAPNTransitionEditor.java	2018-05-18 17:51:11 +0000
+++ src/pipe/gui/widgets/TAPNTransitionEditor.java	2019-03-04 13:28:08 +0000
@@ -21,7 +21,9 @@
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 import dk.aau.cs.gui.Context;
 import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.MakePlaceNewSharedMultiCommand;
 import dk.aau.cs.gui.undo.MakeTransitionNewSharedCommand;
+import dk.aau.cs.gui.undo.MakeTransitionNewSharedMultiCommand;
 import dk.aau.cs.gui.undo.MakeTransitionSharedCommand;
 import dk.aau.cs.gui.undo.RenameTimedTransitionCommand;
 import dk.aau.cs.gui.undo.ToggleTransitionUrgent;
@@ -73,6 +75,7 @@
 		
 		
 		
+		
 		sharedTransitionsComboBox = new WidthAdjustingComboBox(maxNumberOfTransitionsToShowAtOnce);
 		sharedTransitionsComboBox.setPreferredSize(new Dimension(290,27));
 		sharedTransitionsComboBox.addActionListener(new ActionListener() {
@@ -402,9 +405,9 @@
 			transition.underlyingTransition().unshare();
 		}
 		
-		if(sharedCheckBox.isSelected()){	
+		if(sharedCheckBox.isSelected()){
 			SharedTransition selectedTransition = (SharedTransition)sharedTransitionsComboBox.getSelectedItem();
-                        Command command = new MakeTransitionSharedCommand(context.activeModel(), selectedTransition, transition.underlyingTransition(), context.tabContent());
+            Command command = new MakeTransitionSharedCommand(context.activeModel(), selectedTransition, transition.underlyingTransition(), context.tabContent());
 			context.undoManager().addEdit(command);
 			try{
 				command.redo();
@@ -436,16 +439,29 @@
 				return false;
 			}
 			context.nameGenerator().updateIndices(transition.underlyingTransition().model(), newName);
+		
 			
 			if(makeNewShared){
-				Command command = new MakeTransitionNewSharedCommand(context.activeModel(), newName, transition.underlyingTransition(), context.tabContent());
+				Command command = new MakeTransitionNewSharedCommand(context.activeModel(), newName, transition.underlyingTransition(), context.tabContent(), false);
 				context.undoManager().addEdit(command);
 				try{
 					command.redo();
 				}catch(RequireException e){
 					context.undoManager().undo();
-					JOptionPane.showMessageDialog(this,"A transition or place with the specified name already exists, or the specified name is invalid.\n\nAcceptable names are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*", "Error", JOptionPane.ERROR_MESSAGE);
-					return false;
+					//This is checked as a transition cannot be shared if there exists a place with the same name
+					if(transition.underlyingTransition().model().parentNetwork().isNameUsedForTransitionsOnly(newName)) {
+						int dialogResult = JOptionPane.showConfirmDialog(this, "A transition with the specified name already exists in one or more components, or the specified name is invalid.\n\nAcceptable names for transitions are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*\n\nNote that \"true\" and \"false\" are reserved keywords. \n\nThis transition name will be changed into shared one also in all other components.", "Error", JOptionPane.OK_CANCEL_OPTION);
+						if(dialogResult == JOptionPane.OK_OPTION) {
+							Command cmd = new MakeTransitionNewSharedMultiCommand(context, newName, transition);	
+							cmd.redo();
+							context.undoManager().addEdit(cmd);
+						} else {
+							return false;
+						}
+					} else {
+						JOptionPane.showMessageDialog(this, "A place with the specified name already exists in one or more components, or the specified name is invalid.\n\nAcceptable names for transitions are defined by the regular expression:\n[a-zA-Z][_a-zA-Z0-9]*\n\nNote that \"true\" and \"false\" are reserved keywords.", "Error", JOptionPane.OK_OPTION);
+						return false;
+					}
 				}
 				transition.setUrgent(urgentCheckBox.isSelected());
 			}