Merge lp:~tapaal-contributor/tapaal/disappearing-tokens-1940098 into lp:tapaal

[Lena Ernstsen]

Stopped tokens from disappearing when shared place names are changed

[Jiri Srba (srba)]

Tested and fixes the problem

review: Approve

=== modified file 'src/dk/aau/cs/gui/SharedPlaceNamePanel.java'
--- src/dk/aau/cs/gui/SharedPlaceNamePanel.java	2021-04-08 08:30:29 +0000
+++ src/dk/aau/cs/gui/SharedPlaceNamePanel.java	2021-08-17 11:36:29 +0000
@@ -150,7 +150,7 @@
 				
 				try{
 					placeToEdit.setName(name);
-				}catch(RequireException e){
+                }catch(RequireException e){
 					JOptionPane.showMessageDialog(SharedPlaceNamePanel.this, "The specified name is invalid.\nAcceptable names 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);
 					nameField.requestFocusInWindow();
 					return false;
 
=== modified file 'src/dk/aau/cs/model/tapn/TimedPlace.java'
--- src/dk/aau/cs/model/tapn/TimedPlace.java	2020-08-04 08:53:19 +0000
+++ src/dk/aau/cs/model/tapn/TimedPlace.java	2021-08-17 11:36:29 +0000
@@ -37,9 +37,21 @@
     public void setName(String newName) {
 		Require.that(newName != null && !newName.isEmpty(), "A timed place must have a name");
 		Require.that(isValid(newName) && !newName.toLowerCase().equals("true") && !newName.toLowerCase().equals("false"), "The specified name must conform to the pattern [a-zA-Z_][a-zA-Z0-9_]*");
-		this.name = newName;
-		fireNameChanged();
-	}
+        List<TimedToken> tokens = null;
+
+		if (currentMarking != null) {
+            if (currentMarking.getTokensFor(this).size() != 0) {
+                tokens = tokens();
+                currentMarking.removePlaceFromMarking(this);
+            }
+            this.name = newName;
+            if (tokens != null) addTokens(tokens);
+            fireNameChanged();
+        } else {
+            this.name = newName;
+            fireNameChanged();
+        }
+    }
 
     public TimeInvariant invariant(){
         return invariant;