Workcraft

Merge lp:~danilovesky/workcraft/trunk-bug-1332527 into lp:workcraft

  1. trunk-bug-1332527
  2. Merge into trunk
Proposed by Danil Sokolov
Status: Merged
Merged at revision: 509
Proposed branch: lp:~danilovesky/workcraft/trunk-bug-1332527
Merge into: lp:workcraft
Diff against target: 205 lines (+53/-8)
8 files modified
MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatChainResultHandler.java (+1/-0)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java (+3/-7)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConsistencyChecker.java (+8/-0)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCscChecker.java (+8/-0)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatDeadlockChecker.java (+8/-0)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatNormalcyChecker.java (+9/-1)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatPersistencyChecker.java (+8/-0)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatUscChecker.java (+8/-0)
To merge this branch: bzr merge lp:~danilovesky/workcraft/trunk-bug-1332527
Reviewer Review Type Date Requested Status
Danil Sokolov Approve
Review via email: mp+223997@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Danil Sokolov (danilovesky) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatChainResultHandler.java'
2--- MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatChainResultHandler.java 2014-04-25 15:49:33 +0000
3+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatChainResultHandler.java 2014-06-20 22:03:56 +0000
4@@ -29,6 +29,7 @@
5 case UNDEFINED:
6 SwingUtilities.invokeLater(new MpsatUndefinedResultHandler(task, result));
7 break;
8+ case REACHABILITY:
9 case STG_REACHABILITY:
10 case CSC_CONFLICT_DETECTION:
11 case USC_CONFLICT_DETECTION:
12
13=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java'
14--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java 2014-04-16 21:55:15 +0000
15+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java 2014-06-20 22:03:56 +0000
16@@ -5,8 +5,6 @@
17 import org.workcraft.plugins.mpsat.MpsatChainResultHandler;
18 import org.workcraft.plugins.mpsat.MpsatSettings;
19 import org.workcraft.plugins.mpsat.tasks.MpsatChainTask;
20-import org.workcraft.plugins.petri.PetriNetModel;
21-import org.workcraft.util.WorkspaceUtils;
22 import org.workcraft.workspace.WorkspaceEntry;
23
24 public abstract class AbstractMpsatChecker implements Tool {
25@@ -23,11 +21,6 @@
26 }
27
28 @Override
29- public final boolean isApplicableTo(WorkspaceEntry we) {
30- return WorkspaceUtils.canHas(we, PetriNetModel.class);
31- }
32-
33- @Override
34 public final void run(WorkspaceEntry we) {
35 String description = "MPSat tool chain";
36 String title = we.getModelEntry().getModel().getTitle();
37@@ -41,6 +34,9 @@
38 @Override
39 public abstract String getDisplayName();
40
41+ @Override
42+ public abstract boolean isApplicableTo(WorkspaceEntry we);
43+
44 public abstract MpsatSettings getSettings();
45
46 }
47
48=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConsistencyChecker.java'
49--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConsistencyChecker.java 2014-04-16 21:55:15 +0000
50+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConsistencyChecker.java 2014-06-20 22:03:56 +0000
51@@ -5,6 +5,9 @@
52 import org.workcraft.plugins.mpsat.MpsatMode;
53 import org.workcraft.plugins.mpsat.MpsatSettings;
54 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
55+import org.workcraft.plugins.stg.STGModel;
56+import org.workcraft.util.WorkspaceUtils;
57+import org.workcraft.workspace.WorkspaceEntry;
58
59 public class MpsatConsistencyChecker extends AbstractMpsatChecker implements Tool {
60
61@@ -18,6 +21,11 @@
62 }
63
64 @Override
65+ public boolean isApplicableTo(WorkspaceEntry we) {
66+ return WorkspaceUtils.canHas(we, STGModel.class);
67+ }
68+
69+ @Override
70 public MpsatSettings getSettings() {
71 return new MpsatSettings("Consistency", MpsatMode.STG_REACHABILITY, 0,
72 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),
73
74=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCscChecker.java'
75--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCscChecker.java 2014-04-16 21:55:15 +0000
76+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCscChecker.java 2014-06-20 22:03:56 +0000
77@@ -5,6 +5,9 @@
78 import org.workcraft.plugins.mpsat.MpsatMode;
79 import org.workcraft.plugins.mpsat.MpsatSettings;
80 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
81+import org.workcraft.plugins.stg.STGModel;
82+import org.workcraft.util.WorkspaceUtils;
83+import org.workcraft.workspace.WorkspaceEntry;
84
85 public class MpsatCscChecker extends AbstractMpsatChecker implements Tool {
86
87@@ -18,6 +21,11 @@
88 }
89
90 @Override
91+ public boolean isApplicableTo(WorkspaceEntry we) {
92+ return WorkspaceUtils.canHas(we, STGModel.class);
93+ }
94+
95+ @Override
96 public MpsatSettings getSettings() {
97 return new MpsatSettings("CSC", MpsatMode.CSC_CONFLICT_DETECTION, 0,
98 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),
99
100=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatDeadlockChecker.java'
101--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatDeadlockChecker.java 2014-04-16 21:55:15 +0000
102+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatDeadlockChecker.java 2014-06-20 22:03:56 +0000
103@@ -5,6 +5,9 @@
104 import org.workcraft.plugins.mpsat.MpsatMode;
105 import org.workcraft.plugins.mpsat.MpsatSettings;
106 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
107+import org.workcraft.plugins.petri.PetriNetModel;
108+import org.workcraft.util.WorkspaceUtils;
109+import org.workcraft.workspace.WorkspaceEntry;
110
111 public class MpsatDeadlockChecker extends AbstractMpsatChecker implements Tool {
112
113@@ -18,6 +21,11 @@
114 }
115
116 @Override
117+ public boolean isApplicableTo(WorkspaceEntry we) {
118+ return WorkspaceUtils.canHas(we, PetriNetModel.class);
119+ }
120+
121+ @Override
122 public MpsatSettings getSettings() {
123 return new MpsatSettings("Deadlock freedom", MpsatMode.DEADLOCK, 0,
124 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),
125
126=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatNormalcyChecker.java'
127--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatNormalcyChecker.java 2014-04-16 21:55:15 +0000
128+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatNormalcyChecker.java 2014-06-20 22:03:56 +0000
129@@ -5,6 +5,9 @@
130 import org.workcraft.plugins.mpsat.MpsatMode;
131 import org.workcraft.plugins.mpsat.MpsatSettings;
132 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
133+import org.workcraft.plugins.stg.STGModel;
134+import org.workcraft.util.WorkspaceUtils;
135+import org.workcraft.workspace.WorkspaceEntry;
136
137 public class MpsatNormalcyChecker extends AbstractMpsatChecker implements Tool {
138
139@@ -18,8 +21,13 @@
140 }
141
142 @Override
143+ public boolean isApplicableTo(WorkspaceEntry we) {
144+ return WorkspaceUtils.canHas(we, STGModel.class);
145+ }
146+
147+ @Override
148 public MpsatSettings getSettings() {
149- return new MpsatSettings("CSC", MpsatMode.NORMALCY, 0,
150+ return new MpsatSettings("Normalcy", MpsatMode.NORMALCY, 0,
151 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),
152 null);
153 }
154
155=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatPersistencyChecker.java'
156--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatPersistencyChecker.java 2014-04-16 21:55:15 +0000
157+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatPersistencyChecker.java 2014-06-20 22:03:56 +0000
158@@ -5,6 +5,9 @@
159 import org.workcraft.plugins.mpsat.MpsatMode;
160 import org.workcraft.plugins.mpsat.MpsatSettings;
161 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
162+import org.workcraft.plugins.stg.STGModel;
163+import org.workcraft.util.WorkspaceUtils;
164+import org.workcraft.workspace.WorkspaceEntry;
165
166 public class MpsatPersistencyChecker extends AbstractMpsatChecker implements Tool {
167
168@@ -18,6 +21,11 @@
169 }
170
171 @Override
172+ public boolean isApplicableTo(WorkspaceEntry we) {
173+ return WorkspaceUtils.canHas(we, STGModel.class);
174+ }
175+
176+ @Override
177 public MpsatSettings getSettings() {
178 return new MpsatSettings("Output persistence", MpsatMode.STG_REACHABILITY, 0,
179 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),
180
181=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatUscChecker.java'
182--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatUscChecker.java 2014-04-16 21:55:15 +0000
183+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatUscChecker.java 2014-06-20 22:03:56 +0000
184@@ -5,6 +5,9 @@
185 import org.workcraft.plugins.mpsat.MpsatMode;
186 import org.workcraft.plugins.mpsat.MpsatSettings;
187 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
188+import org.workcraft.plugins.stg.STGModel;
189+import org.workcraft.util.WorkspaceUtils;
190+import org.workcraft.workspace.WorkspaceEntry;
191
192 public class MpsatUscChecker extends AbstractMpsatChecker implements Tool {
193
194@@ -18,6 +21,11 @@
195 }
196
197 @Override
198+ public boolean isApplicableTo(WorkspaceEntry we) {
199+ return WorkspaceUtils.canHas(we, STGModel.class);
200+ }
201+
202+ @Override
203 public MpsatSettings getSettings() {
204 return new MpsatSettings("USC", MpsatMode.USC_CONFLICT_DETECTION, 0,
205 MpsatUtilitySettings.getSolutionMode(), MpsatUtilitySettings.getSolutionCount(),

Subscribers

People subscribed via source and target branches