Workcraft

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

  1. trunk-bug-1436054
  2. Merge into trunk
Proposed by Danil Sokolov
Status: Merged
Merged at revision: 597
Proposed branch: lp:~danilovesky/workcraft/trunk-bug-1436054
Merge into: lp:workcraft
Diff against target: 443 lines (+74/-19)
18 files modified
CircuitPlugin/src/org/workcraft/plugins/circuit/tools/StgGeneratorTool.java (+3/-1)
CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogToGraphConverterTool.java (+3/-1)
CpogsPlugin/src/org/workcraft/plugins/cpog/tools/GraphToCpogConverterTool.java (+3/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java (+3/-1)
FsmPlugin/src/org/workcraft/plugins/fsm/tools/DgToFsmConverterTool.java (+3/-1)
FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToDgConverterTool.java (+3/-1)
FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToPnConverterTool.java (+3/-1)
FstPlugin/src/org/workcraft/plugins/fst/task/PnToFsmConversionResultHandler.java (+3/-1)
FstPlugin/src/org/workcraft/plugins/fst/task/StgToFstConversionResultHandler.java (+3/-1)
FstPlugin/src/org/workcraft/plugins/fst/tools/FstToFsmConverterTool.java (+3/-1)
FstPlugin/src/org/workcraft/plugins/fst/tools/FstToStgConverterTool.java (+3/-1)
MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatCscResolutionResultHandler.java (+4/-2)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationResultHandler.java (+3/-1)
PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PetriNetGeneratorTool.java (+3/-1)
STGPlugin/src/org/workcraft/plugins/stg/tools/PetriNetToStgConverterTool.java (+3/-1)
STGPlugin/src/org/workcraft/plugins/stg/tools/StgToPetriNetConverterTool.java (+3/-1)
WorkcraftCore/src/org/workcraft/gui/MainWindow.java (+2/-1)
WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java (+23/-1)
To merge this branch: bzr merge lp:~danilovesky/workcraft/trunk-bug-1436054
Reviewer Review Type Date Requested Status
Danil Sokolov Approve
Review via email: mp+254061@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 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/StgGeneratorTool.java'
2--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/StgGeneratorTool.java 2014-12-14 22:36:33 +0000
3+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/StgGeneratorTool.java 2015-03-25 10:28:52 +0000
4@@ -5,6 +5,7 @@
5 import org.workcraft.gui.workspace.Path;
6 import org.workcraft.plugins.circuit.Circuit;
7 import org.workcraft.plugins.circuit.VisualCircuit;
8+import org.workcraft.plugins.shared.CommonEditorSettings;
9 import org.workcraft.plugins.stg.STGModelDescriptor;
10 import org.workcraft.plugins.stg.VisualSTG;
11 import org.workcraft.workspace.ModelEntry;
12@@ -37,7 +38,8 @@
13 final Path<String> directory = we.getWorkspacePath().getParent();
14 final String name = we.getWorkspacePath().getNode();
15 final ModelEntry me = new ModelEntry(new STGModelDescriptor(), vstg);
16- workspace.add(directory, name, me, false, true);
17+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
18+ workspace.add(directory, name, me, false, openInEditor);
19 }
20
21 }
22
23=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogToGraphConverterTool.java'
24--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogToGraphConverterTool.java 2015-02-11 14:42:12 +0000
25+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/CpogToGraphConverterTool.java 2015-03-25 10:28:52 +0000
26@@ -9,6 +9,7 @@
27 import org.workcraft.plugins.cpog.VisualCPOG;
28 import org.workcraft.plugins.graph.Graph;
29 import org.workcraft.plugins.graph.VisualGraph;
30+import org.workcraft.plugins.shared.CommonEditorSettings;
31 import org.workcraft.workspace.ModelEntry;
32 import org.workcraft.workspace.Workspace;
33 import org.workcraft.workspace.WorkspaceEntry;
34@@ -43,7 +44,8 @@
35 final Path<String> directory = we.getWorkspacePath().getParent();
36 final String name = we.getWorkspacePath().getNode();
37 final ModelEntry me = new ModelEntry(new CpogModelDescriptor(), converter.getDstModel());
38- workspace.add(directory, name, me, false, true);
39+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
40+ workspace.add(directory, name, me, false, openInEditor);
41 } finally {
42 we.cancelMemento();
43 }
44
45=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tools/GraphToCpogConverterTool.java'
46--- CpogsPlugin/src/org/workcraft/plugins/cpog/tools/GraphToCpogConverterTool.java 2015-02-11 14:42:12 +0000
47+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tools/GraphToCpogConverterTool.java 2015-03-25 10:28:52 +0000
48@@ -9,6 +9,7 @@
49 import org.workcraft.plugins.cpog.VisualCPOG;
50 import org.workcraft.plugins.graph.Graph;
51 import org.workcraft.plugins.graph.VisualGraph;
52+import org.workcraft.plugins.shared.CommonEditorSettings;
53 import org.workcraft.workspace.ModelEntry;
54 import org.workcraft.workspace.Workspace;
55 import org.workcraft.workspace.WorkspaceEntry;
56@@ -43,7 +44,8 @@
57 final Path<String> directory = we.getWorkspacePath().getParent();
58 final String name = we.getWorkspacePath().getNode();
59 final ModelEntry me = new ModelEntry(new CpogModelDescriptor(), converter.getDstModel());
60- workspace.add(directory, name, me, false, true);
61+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
62+ workspace.add(directory, name, me, false, openInEditor);
63 } finally {
64 we.cancelMemento();
65 }
66
67=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java'
68--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java 2014-12-14 22:36:33 +0000
69+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java 2015-03-25 10:28:52 +0000
70@@ -6,6 +6,7 @@
71 import org.workcraft.plugins.dfs.Dfs;
72 import org.workcraft.plugins.dfs.VisualDfs;
73 import org.workcraft.plugins.dfs.stg.StgGenerator;
74+import org.workcraft.plugins.shared.CommonEditorSettings;
75 import org.workcraft.plugins.stg.STGModelDescriptor;
76 import org.workcraft.workspace.ModelEntry;
77 import org.workcraft.workspace.Workspace;
78@@ -37,6 +38,7 @@
79 final Path<String> directory = we.getWorkspacePath().getParent();
80 final String desiredName = we.getWorkspacePath().getNode();
81 final ModelEntry me = new ModelEntry(new STGModelDescriptor(), generator.getSTG());
82- workspace.add(directory, desiredName, me, false, true);
83+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
84+ workspace.add(directory, desiredName, me, false, openInEditor);
85 }
86 }
87
88=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/DgToFsmConverterTool.java'
89--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/DgToFsmConverterTool.java 2015-01-21 14:37:28 +0000
90+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/DgToFsmConverterTool.java 2015-03-25 10:28:52 +0000
91@@ -8,6 +8,7 @@
92 import org.workcraft.plugins.fsm.VisualFsm;
93 import org.workcraft.plugins.graph.Graph;
94 import org.workcraft.plugins.graph.VisualGraph;
95+import org.workcraft.plugins.shared.CommonEditorSettings;
96 import org.workcraft.workspace.ModelEntry;
97 import org.workcraft.workspace.Workspace;
98 import org.workcraft.workspace.WorkspaceEntry;
99@@ -39,6 +40,7 @@
100 final Path<String> directory = we.getWorkspacePath().getParent();
101 final String desiredName = we.getWorkspacePath().getNode();
102 final ModelEntry me = new ModelEntry(new FsmModelDescriptor(), converter.getDstModel());
103- workspace.add(directory, desiredName, me, false, true);
104+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
105+ workspace.add(directory, desiredName, me, false, openInEditor);
106 }
107 }
108
109=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToDgConverterTool.java'
110--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToDgConverterTool.java 2015-01-21 14:37:28 +0000
111+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToDgConverterTool.java 2015-03-25 10:28:52 +0000
112@@ -8,6 +8,7 @@
113 import org.workcraft.plugins.graph.Graph;
114 import org.workcraft.plugins.graph.GraphModelDescriptor;
115 import org.workcraft.plugins.graph.VisualGraph;
116+import org.workcraft.plugins.shared.CommonEditorSettings;
117 import org.workcraft.workspace.ModelEntry;
118 import org.workcraft.workspace.Workspace;
119 import org.workcraft.workspace.WorkspaceEntry;
120@@ -39,6 +40,7 @@
121 final Path<String> directory = we.getWorkspacePath().getParent();
122 final String desiredName = we.getWorkspacePath().getNode();
123 final ModelEntry me = new ModelEntry(new GraphModelDescriptor(), converter.getDstModel());
124- workspace.add(directory, desiredName, me, false, true);
125+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
126+ workspace.add(directory, desiredName, me, false, openInEditor);
127 }
128 }
129
130=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToPnConverterTool.java'
131--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToPnConverterTool.java 2015-01-14 18:10:46 +0000
132+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/FsmToPnConverterTool.java 2015-03-25 10:28:52 +0000
133@@ -9,6 +9,7 @@
134 import org.workcraft.plugins.petri.PetriNet;
135 import org.workcraft.plugins.petri.PetriNetModelDescriptor;
136 import org.workcraft.plugins.petri.VisualPetriNet;
137+import org.workcraft.plugins.shared.CommonEditorSettings;
138 import org.workcraft.workspace.ModelEntry;
139 import org.workcraft.workspace.Workspace;
140 import org.workcraft.workspace.WorkspaceEntry;
141@@ -41,6 +42,7 @@
142 final Path<String> directory = we.getWorkspacePath().getParent();
143 final String desiredName = we.getWorkspacePath().getNode();
144 final ModelEntry me = new ModelEntry(new PetriNetModelDescriptor(), converter.getDstModel());
145- workspace.add(directory, desiredName, me, false, true);
146+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
147+ workspace.add(directory, desiredName, me, false, openInEditor);
148 }
149 }
150
151=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/task/PnToFsmConversionResultHandler.java'
152--- FstPlugin/src/org/workcraft/plugins/fst/task/PnToFsmConversionResultHandler.java 2015-01-14 18:10:46 +0000
153+++ FstPlugin/src/org/workcraft/plugins/fst/task/PnToFsmConversionResultHandler.java 2015-03-25 10:28:52 +0000
154@@ -15,6 +15,7 @@
155 import org.workcraft.plugins.fsm.VisualFsm;
156 import org.workcraft.plugins.fst.VisualFst;
157 import org.workcraft.plugins.fst.tools.FstToFsmConverter;
158+import org.workcraft.plugins.shared.CommonEditorSettings;
159 import org.workcraft.plugins.shared.tasks.ExternalProcessResult;
160 import org.workcraft.tasks.DummyProgressMonitor;
161 import org.workcraft.tasks.Result;
162@@ -51,7 +52,8 @@
163 final Path<String> directory = path.getParent();
164 final String name = FileUtils.getFileNameWithoutExtension(new File(path.getNode()));;
165 final ModelEntry me = new ModelEntry(new FsmModelDescriptor() , model);
166- workspace.add(directory, name, me, true, true);
167+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
168+ workspace.add(directory, name, me, true, openInEditor);
169 } else if (result.getOutcome() != Outcome.CANCELLED) {
170 MainWindow mainWindow = framework.getMainWindow();
171 if (result.getCause() == null) {
172
173=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/task/StgToFstConversionResultHandler.java'
174--- FstPlugin/src/org/workcraft/plugins/fst/task/StgToFstConversionResultHandler.java 2015-01-14 18:10:46 +0000
175+++ FstPlugin/src/org/workcraft/plugins/fst/task/StgToFstConversionResultHandler.java 2015-03-25 10:28:52 +0000
176@@ -11,6 +11,7 @@
177 import org.workcraft.gui.workspace.Path;
178 import org.workcraft.plugins.fst.Fst;
179 import org.workcraft.plugins.fst.FstModelDescriptor;
180+import org.workcraft.plugins.shared.CommonEditorSettings;
181 import org.workcraft.plugins.shared.tasks.ExternalProcessResult;
182 import org.workcraft.tasks.DummyProgressMonitor;
183 import org.workcraft.tasks.Result;
184@@ -43,7 +44,8 @@
185 final Path<String> directory = path.getParent();
186 final String name = FileUtils.getFileNameWithoutExtension(new File(path.getNode()));;
187 final ModelEntry me = new ModelEntry(new FstModelDescriptor() , model);
188- workspace.add(directory, name, me, true, true);
189+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
190+ workspace.add(directory, name, me, true, openInEditor);
191 } else if (result.getOutcome() != Outcome.CANCELLED) {
192 MainWindow mainWindow = framework.getMainWindow();
193 if (result.getCause() == null) {
194
195=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/tools/FstToFsmConverterTool.java'
196--- FstPlugin/src/org/workcraft/plugins/fst/tools/FstToFsmConverterTool.java 2015-01-13 12:36:58 +0000
197+++ FstPlugin/src/org/workcraft/plugins/fst/tools/FstToFsmConverterTool.java 2015-03-25 10:28:52 +0000
198@@ -9,6 +9,7 @@
199 import org.workcraft.plugins.fsm.VisualFsm;
200 import org.workcraft.plugins.fst.Fst;
201 import org.workcraft.plugins.fst.VisualFst;
202+import org.workcraft.plugins.shared.CommonEditorSettings;
203 import org.workcraft.workspace.ModelEntry;
204 import org.workcraft.workspace.Workspace;
205 import org.workcraft.workspace.WorkspaceEntry;
206@@ -43,7 +44,8 @@
207 final Path<String> directory = we.getWorkspacePath().getParent();
208 final String name = we.getWorkspacePath().getNode();
209 final ModelEntry me = new ModelEntry(new FsmModelDescriptor(), converter.getDstModel());
210- workspace.add(directory, name, me, false, true);
211+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
212+ workspace.add(directory, name, me, false, openInEditor);
213 } finally {
214 we.cancelMemento();
215 }
216
217=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/tools/FstToStgConverterTool.java'
218--- FstPlugin/src/org/workcraft/plugins/fst/tools/FstToStgConverterTool.java 2015-01-12 22:09:40 +0000
219+++ FstPlugin/src/org/workcraft/plugins/fst/tools/FstToStgConverterTool.java 2015-03-25 10:28:52 +0000
220@@ -5,6 +5,7 @@
221 import org.workcraft.gui.workspace.Path;
222 import org.workcraft.plugins.fst.Fst;
223 import org.workcraft.plugins.fst.VisualFst;
224+import org.workcraft.plugins.shared.CommonEditorSettings;
225 import org.workcraft.plugins.stg.STG;
226 import org.workcraft.plugins.stg.STGModelDescriptor;
227 import org.workcraft.plugins.stg.VisualSTG;
228@@ -39,6 +40,7 @@
229 final Path<String> directory = we.getWorkspacePath().getParent();
230 final String desiredName = we.getWorkspacePath().getNode();
231 final ModelEntry me = new ModelEntry(new STGModelDescriptor(), converter.getDstModel());
232- workspace.add(directory, desiredName, me, false, true);
233+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
234+ workspace.add(directory, desiredName, me, false, openInEditor);
235 }
236 }
237
238=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatCscResolutionResultHandler.java'
239--- MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatCscResolutionResultHandler.java 2014-12-22 23:19:12 +0000
240+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatCscResolutionResultHandler.java 2015-03-25 10:28:52 +0000
241@@ -8,6 +8,7 @@
242 import org.workcraft.Framework;
243 import org.workcraft.exceptions.DeserialisationException;
244 import org.workcraft.gui.workspace.Path;
245+import org.workcraft.plugins.shared.CommonEditorSettings;
246 import org.workcraft.plugins.stg.interop.DotGImporter;
247 import org.workcraft.plugins.mpsat.tasks.MpsatChainResult;
248 import org.workcraft.plugins.mpsat.tasks.MpsatChainTask;
249@@ -57,8 +58,9 @@
250 Path<String> directory = path.getParent();
251 String name = fileName + "_resolved";
252 ModelEntry me = new ModelEntry(new STGModelDescriptor(), model);
253- Workspace workspace = framework.getWorkspace();
254- workspace.add(directory, name, me, true, true);
255+ Workspace workspace = framework.getWorkspace();
256+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
257+ workspace.add(directory, name, me, true, openInEditor);
258 }
259 }
260 }
261
262=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationResultHandler.java'
263--- PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationResultHandler.java 2014-12-28 23:02:26 +0000
264+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationResultHandler.java 2015-03-25 10:28:52 +0000
265@@ -9,6 +9,7 @@
266 import org.workcraft.gui.ExceptionDialog;
267 import org.workcraft.gui.MainWindow;
268 import org.workcraft.gui.workspace.Path;
269+import org.workcraft.plugins.shared.CommonEditorSettings;
270 import org.workcraft.plugins.shared.tasks.ExternalProcessResult;
271 import org.workcraft.plugins.stg.STGModel;
272 import org.workcraft.plugins.stg.STGModelDescriptor;
273@@ -43,7 +44,8 @@
274 final Path<String> directory = path.getParent();
275 final String name = FileUtils.getFileNameWithoutExtension(new File(path.getNode()));
276 final ModelEntry me = new ModelEntry(new STGModelDescriptor() , model);
277- workspace.add(directory, name, me, true, true);
278+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
279+ workspace.add(directory, name, me, true, openInEditor);
280 } else {
281 MainWindow mainWindow = framework.getMainWindow();
282 if (result.getCause() == null) {
283
284=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PetriNetGeneratorTool.java'
285--- PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PetriNetGeneratorTool.java 2014-12-12 18:43:40 +0000
286+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/PetriNetGeneratorTool.java 2015-03-25 10:28:52 +0000
287@@ -6,6 +6,7 @@
288 import org.workcraft.plugins.petri.PetriNetModelDescriptor;
289 import org.workcraft.plugins.policy.PolicyNet;
290 import org.workcraft.plugins.policy.VisualPolicyNet;
291+import org.workcraft.plugins.shared.CommonEditorSettings;
292 import org.workcraft.workspace.ModelEntry;
293 import org.workcraft.workspace.Workspace;
294 import org.workcraft.workspace.WorkspaceEntry;
295@@ -36,6 +37,7 @@
296 final Path<String> directory = we.getWorkspacePath().getParent();
297 final String desiredName = we.getWorkspacePath().getNode();
298 final ModelEntry me = new ModelEntry(new PetriNetModelDescriptor(), generator.getPetriNet());
299- workspace.add(directory, desiredName, me, false, true);
300+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
301+ workspace.add(directory, desiredName, me, false, openInEditor);
302 }
303 }
304
305=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/tools/PetriNetToStgConverterTool.java'
306--- STGPlugin/src/org/workcraft/plugins/stg/tools/PetriNetToStgConverterTool.java 2014-12-18 16:28:25 +0000
307+++ STGPlugin/src/org/workcraft/plugins/stg/tools/PetriNetToStgConverterTool.java 2015-03-25 10:28:52 +0000
308@@ -5,6 +5,7 @@
309 import org.workcraft.gui.workspace.Path;
310 import org.workcraft.plugins.petri.PetriNet;
311 import org.workcraft.plugins.petri.VisualPetriNet;
312+import org.workcraft.plugins.shared.CommonEditorSettings;
313 import org.workcraft.plugins.stg.STG;
314 import org.workcraft.plugins.stg.STGModelDescriptor;
315 import org.workcraft.plugins.stg.VisualSTG;
316@@ -39,7 +40,8 @@
317 final Path<String> directory = we.getWorkspacePath().getParent();
318 final String name = we.getWorkspacePath().getNode();
319 final ModelEntry me = new ModelEntry(new STGModelDescriptor(), converter.getDstModel());
320- workspace.add(directory, name, me, false, true);
321+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
322+ workspace.add(directory, name, me, false, openInEditor);
323 }
324
325 }
326
327=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/tools/StgToPetriNetConverterTool.java'
328--- STGPlugin/src/org/workcraft/plugins/stg/tools/StgToPetriNetConverterTool.java 2015-01-07 18:18:13 +0000
329+++ STGPlugin/src/org/workcraft/plugins/stg/tools/StgToPetriNetConverterTool.java 2015-03-25 10:28:52 +0000
330@@ -6,6 +6,7 @@
331 import org.workcraft.plugins.petri.PetriNet;
332 import org.workcraft.plugins.petri.PetriNetModelDescriptor;
333 import org.workcraft.plugins.petri.VisualPetriNet;
334+import org.workcraft.plugins.shared.CommonEditorSettings;
335 import org.workcraft.plugins.stg.STG;
336 import org.workcraft.plugins.stg.VisualSTG;
337 import org.workcraft.workspace.ModelEntry;
338@@ -41,7 +42,8 @@
339 final Path<String> directory = we.getWorkspacePath().getParent();
340 final String name = we.getWorkspacePath().getNode();
341 final ModelEntry me = new ModelEntry(new PetriNetModelDescriptor(), converter.getDstModel());
342- workspace.add(directory, name, me, false, true);
343+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
344+ workspace.add(directory, name, me, false, openInEditor);
345 } finally {
346 we.cancelMemento();
347 }
348
349=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindow.java'
350--- WorkcraftCore/src/org/workcraft/gui/MainWindow.java 2015-03-17 13:54:36 +0000
351+++ WorkcraftCore/src/org/workcraft/gui/MainWindow.java 2015-03-25 10:28:52 +0000
352@@ -1138,7 +1138,8 @@
353 try {
354 ModelEntry me = Import.importFromFile(importer, f);
355 me.getModel().setTitle(FileUtils.getFileNameWithoutExtension(f));
356- framework.getWorkspace().add(Path.<String> empty(), f.getName(), me, false, me.isVisual());
357+ boolean openInEditor = (me.isVisual() || CommonEditorSettings.getOpenNonvisual());
358+ framework.getWorkspace().add(Path.<String> empty(), f.getName(), me, false, openInEditor);
359 lastOpenPath = f.getParent();
360 break;
361 } catch (IOException e) {
362
363=== modified file 'WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java'
364--- WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java 2015-01-09 12:41:39 +0000
365+++ WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java 2015-03-25 10:28:52 +0000
366@@ -59,6 +59,7 @@
367 private static final String keyTitleStyle = prefix + ".titleStyle";
368 private static final String keyShowAbsolutePaths = prefix + ".showAbsolutePaths";
369 private static final String keyDebugClipboard = prefix + ".debugClipboard";
370+ private static final String keyOpenNonvisual = prefix + ".openNonvisual";
371
372 private static final Color defaultBackgroundColor = Color.WHITE;
373 private static final boolean defaultShowGrid = true;
374@@ -68,6 +69,7 @@
375 private static final TitleStyle defaultTitleStyle = TitleStyle.SHORT;
376 private static final boolean defaultShowAbsolutePaths = false;
377 private static final boolean defaultDebugClipboard = false;
378+ private static final boolean defaultOpenNonvisual = true;
379
380 private static Color backgroundColor = defaultBackgroundColor;
381 private static boolean showGrid = defaultShowGrid;
382@@ -77,6 +79,7 @@
383 private static TitleStyle titleStyle = defaultTitleStyle;
384 private static boolean showAbsolutePaths = defaultShowAbsolutePaths;
385 private static boolean debugClipboard = defaultDebugClipboard;
386+ private static boolean openNonvisual = defaultOpenNonvisual;
387
388 public CommonEditorSettings() {
389 properties.add(new PropertyDeclaration<CommonEditorSettings, Color>(
390@@ -158,6 +161,16 @@
391 return CommonEditorSettings.getDebugClipboard();
392 }
393 });
394+
395+ properties.add(new PropertyDeclaration<CommonEditorSettings, Boolean>(
396+ this, "Open non-visual models (imported or transformed)", Boolean.class) {
397+ protected void setter(CommonEditorSettings object, Boolean value) {
398+ CommonEditorSettings.setOpenNonvisual(value);
399+ }
400+ protected Boolean getter(CommonEditorSettings object) {
401+ return CommonEditorSettings.getOpenNonvisual();
402+ }
403+ });
404 }
405
406 @Override
407@@ -175,6 +188,7 @@
408 setTitleStyle(config.getEnum(keyTitleStyle, TitleStyle.class, defaultTitleStyle));
409 setShowAbsolutePaths(config.getBoolean(keyShowAbsolutePaths, defaultShowAbsolutePaths));
410 setDebugClipboard(config.getBoolean(keyDebugClipboard, defaultDebugClipboard));
411+ setOpenNonvisual(config.getBoolean(keyOpenNonvisual, defaultOpenNonvisual));
412 }
413
414 @Override
415@@ -187,6 +201,7 @@
416 config.setEnum(keyTitleStyle, TitleStyle.class, getTitleStyle());
417 config.setBoolean(keyShowAbsolutePaths, getShowAbsolutePaths());
418 config.setBoolean(keyDebugClipboard, getDebugClipboard());
419+ config.setBoolean(keyOpenNonvisual, getOpenNonvisual());
420 }
421
422 @Override
423@@ -267,7 +282,6 @@
424 return showAbsolutePaths;
425 }
426
427-
428 public static Boolean getDebugClipboard() {
429 return debugClipboard;
430 }
431@@ -276,4 +290,12 @@
432 debugClipboard = value;
433 }
434
435+ public static Boolean getOpenNonvisual() {
436+ return openNonvisual;
437+ }
438+
439+ public static void setOpenNonvisual(Boolean value) {
440+ openNonvisual = value;
441+ }
442+
443 }

Subscribers

People subscribed via source and target branches