TAPAAL

Merge lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006 into lp:tapaal

  1. slash-in-name-fix-1575006
  2. Merge into trunk
Proposed by Mads Johannsen
Status: Merged
Approved by: Jiri Srba
Approved revision: 932
Merged at revision: 933
Proposed branch: lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006
Merge into: lp:tapaal
Diff against target: 64 lines (+5/-5)
5 files modified
src/dk/aau/cs/model/tapn/Constant.java (+1/-1)
src/dk/aau/cs/model/tapn/LocalTimedPlace.java (+1/-1)
src/dk/aau/cs/model/tapn/SharedPlace.java (+1/-1)
src/dk/aau/cs/model/tapn/SharedTransition.java (+1/-1)
src/dk/aau/cs/model/tapn/TimedTransition.java (+1/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+293266@code.launchpad.net

Commit message

Using slash and equality sign in place/transition/constant names is now disallowed.

Description of the change

Makes it impossible to use slashes and equality symbols in place, transition, and constant names.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/dk/aau/cs/model/tapn/Constant.java'
--- src/dk/aau/cs/model/tapn/Constant.java 2014-02-27 13:04:19 +0000
+++ src/dk/aau/cs/model/tapn/Constant.java 2016-04-28 13:20:15 +0000
@@ -5,7 +5,7 @@
5import dk.aau.cs.util.Require;5import dk.aau.cs.util.Require;
66
7public class Constant {7public class Constant {
8 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");8 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
9 9
10 private String name;10 private String name;
11 private int value;11 private int value;
1212
=== modified file 'src/dk/aau/cs/model/tapn/LocalTimedPlace.java'
--- src/dk/aau/cs/model/tapn/LocalTimedPlace.java 2014-02-27 13:04:19 +0000
+++ src/dk/aau/cs/model/tapn/LocalTimedPlace.java 2016-04-28 13:20:15 +0000
@@ -13,7 +13,7 @@
13import dk.aau.cs.util.Tuple;13import dk.aau.cs.util.Tuple;
1414
15public class LocalTimedPlace extends TimedPlace {15public class LocalTimedPlace extends TimedPlace {
16 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");16 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
1717
18 private String name;18 private String name;
19 private TimeInvariant invariant;19 private TimeInvariant invariant;
2020
=== modified file 'src/dk/aau/cs/model/tapn/SharedPlace.java'
--- src/dk/aau/cs/model/tapn/SharedPlace.java 2015-09-29 09:26:14 +0000
+++ src/dk/aau/cs/model/tapn/SharedPlace.java 2016-04-28 13:20:15 +0000
@@ -12,7 +12,7 @@
12import dk.aau.cs.util.Tuple;12import dk.aau.cs.util.Tuple;
1313
14public class SharedPlace extends TimedPlace{14public class SharedPlace extends TimedPlace{
15 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");15 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
16 16
17 private String name;17 private String name;
18 private TimeInvariant invariant;18 private TimeInvariant invariant;
1919
=== modified file 'src/dk/aau/cs/model/tapn/SharedTransition.java'
--- src/dk/aau/cs/model/tapn/SharedTransition.java 2014-02-27 13:04:19 +0000
+++ src/dk/aau/cs/model/tapn/SharedTransition.java 2016-04-28 13:20:15 +0000
@@ -9,7 +9,7 @@
9import dk.aau.cs.util.Require;9import dk.aau.cs.util.Require;
1010
11public class SharedTransition {11public class SharedTransition {
12 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");12 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
13 13
14 private String name;14 private String name;
15 private List<TimedTransition> transitions = new ArrayList<TimedTransition>();15 private List<TimedTransition> transitions = new ArrayList<TimedTransition>();
1616
=== modified file 'src/dk/aau/cs/model/tapn/TimedTransition.java'
--- src/dk/aau/cs/model/tapn/TimedTransition.java 2014-02-27 13:04:19 +0000
+++ src/dk/aau/cs/model/tapn/TimedTransition.java 2016-04-28 13:20:15 +0000
@@ -14,7 +14,7 @@
14import dk.aau.cs.util.Require;14import dk.aau.cs.util.Require;
1515
16public class TimedTransition extends TAPNElement {16public class TimedTransition extends TAPNElement {
17 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");17 private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
1818
19 private String name;19 private String name;
20 private List<TimedOutputArc> postset = new ArrayList<TimedOutputArc>();20 private List<TimedOutputArc> postset = new ArrayList<TimedOutputArc>();

Subscribers

People subscribed via source and target branches