Skip to content

Commit 0d97293

Browse files
committed
Do not catch exception when an error occurs in model translation.
1 parent 67ad71c commit 0d97293

File tree

1 file changed

+54
-50
lines changed

1 file changed

+54
-50
lines changed

apis/alligator/src/fr/lip6/move/coloane/api/alligator/RunService.java

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
import org.eclipse.core.runtime.IProgressMonitor;
4848
import org.eclipse.core.runtime.NullProgressMonitor;
4949
import org.eclipse.core.runtime.SubMonitor;
50+
import org.eclipse.jface.dialogs.MessageDialog;
5051
import org.eclipse.swt.widgets.Display;
52+
import org.eclipse.swt.widgets.Shell;
53+
import org.eclipse.ui.PlatformUI;
5154

5255
/**
5356
* Implementation of IApiService to manage Alligator service.
@@ -112,15 +115,18 @@ public RunService(ServiceDescription service, Connection alligatorConnection) {
112115
}
113116

114117
private final
115-
File getFile(IFile file) {
118+
File
119+
getFile(IFile file) {
116120
return file.getRawLocation()
117121
.makeAbsolute()
118122
.toFile();
119123
}
120124

121125
@Override
122126
public
123-
List<IResult> run(IGraph model, IProgressMonitor monitor)
127+
List<IResult>
128+
run(IGraph model,
129+
IProgressMonitor monitor)
124130
throws ServiceException {
125131
InputWizard wizard = new InputWizard(service);
126132
try {
@@ -133,58 +139,54 @@ List<IResult> run(IGraph model, IProgressMonitor monitor)
133139
}
134140
// Convert input parameters:
135141
for (Parameter<?> parameter : service.parameters()) {
136-
try {
137-
if (parameter.isInput()) {
138-
if (parameter instanceof ModelParameter) {
139-
IFile file = wizard.fileFor(parameter);
140-
ModelParameter p = ModelParameter.of(parameter);
141-
ExportToGrML exporter = new ExportToGrML();
142-
LOGGER.info("Converting file '" + file + "' to GrML...");
142+
if (parameter.isInput()) {
143+
if (parameter instanceof ModelParameter) {
144+
IFile file = wizard.fileFor(parameter);
145+
ModelParameter p = ModelParameter.of(parameter);
146+
ExportToGrML exporter = new ExportToGrML();
147+
LOGGER.info("Converting file '" + file + "' to GrML...");
148+
IGraph graph = ModelLoader.loadGraphFromXML(file);
149+
File temp = File.createTempFile("coloane-exporter", ".grml");
150+
temp.deleteOnExit();
151+
exporter.export(graph, temp.getAbsolutePath(), new NullProgressMonitor());
152+
p.setModelFromFile(temp);
153+
} else if (parameter instanceof FileParameter && ((FileParameter) parameter).getContentType()
154+
.equalsIgnoreCase("lola")) {
155+
IFile file = wizard.fileFor(parameter);
156+
FileParameter p = FileParameter.of(parameter);
157+
if (file.getFileExtension()
158+
.equalsIgnoreCase("lola")) {
159+
p.setFile(getFile(file));
160+
} else {
161+
ExportToLola exporter = new ExportToLola();
162+
LOGGER.info("Converting file '" + file + "' to LoLa...");
143163
IGraph graph = ModelLoader.loadGraphFromXML(file);
144-
File temp = File.createTempFile("coloane-exporter", ".grml");
164+
File temp = File.createTempFile("coloane-exporter", ".lola");
145165
temp.deleteOnExit();
146166
exporter.export(graph, temp.getAbsolutePath(), new NullProgressMonitor());
147-
p.setModelFromFile(temp);
148-
} else if (parameter instanceof FileParameter && ((FileParameter) parameter).getContentType()
149-
.equalsIgnoreCase("lola")) {
150-
IFile file = wizard.fileFor(parameter);
151-
FileParameter p = FileParameter.of(parameter);
152-
if (file.getFileExtension()
153-
.equalsIgnoreCase("lola")) {
154-
p.setFile(getFile(file));
155-
} else {
156-
ExportToLola exporter = new ExportToLola();
157-
LOGGER.info("Converting file '" + file + "' to LoLa...");
158-
IGraph graph = ModelLoader.loadGraphFromXML(file);
159-
File temp = File.createTempFile("coloane-exporter", ".lola");
160-
temp.deleteOnExit();
161-
exporter.export(graph, temp.getAbsolutePath(), new NullProgressMonitor());
162-
p.setFile(temp);
163-
}
164-
} else if (parameter instanceof FileParameter && ((FileParameter) parameter).getContentType()
165-
.equalsIgnoreCase("cami")) {
166-
IFile file = wizard.fileFor(parameter);
167-
FileParameter p = FileParameter.of(parameter);
168-
if (file.getFileExtension()
169-
.equalsIgnoreCase("cami")) {
170-
p.setFile(getFile(file));
171-
} else {
172-
ExportToImpl exporter = new ExportToImpl();
173-
LOGGER.info("Converting file '" + file + "' to CAMI... ");
174-
IGraph graph = ModelLoader.loadGraphFromXML(file);
175-
File temp = File.createTempFile("coloane-exporter", ".cami");
176-
temp.deleteOnExit();
177-
exporter.export(graph, temp.getAbsolutePath(), new NullProgressMonitor());
178-
p.setFile(temp);
179-
}
180-
} else if (parameter instanceof FileParameter) {
181-
IFile file = wizard.fileFor(parameter);
182-
FileParameter p = FileParameter.of(parameter);
167+
p.setFile(temp);
168+
}
169+
} else if (parameter instanceof FileParameter && ((FileParameter) parameter).getContentType()
170+
.equalsIgnoreCase("cami")) {
171+
IFile file = wizard.fileFor(parameter);
172+
FileParameter p = FileParameter.of(parameter);
173+
if (file.getFileExtension()
174+
.equalsIgnoreCase("cami")) {
183175
p.setFile(getFile(file));
176+
} else {
177+
ExportToImpl exporter = new ExportToImpl();
178+
LOGGER.info("Converting file '" + file + "' to CAMI... ");
179+
IGraph graph = ModelLoader.loadGraphFromXML(file);
180+
File temp = File.createTempFile("coloane-exporter", ".cami");
181+
temp.deleteOnExit();
182+
exporter.export(graph, temp.getAbsolutePath(), new NullProgressMonitor());
183+
p.setFile(temp);
184184
}
185+
} else if (parameter instanceof FileParameter) {
186+
IFile file = wizard.fileFor(parameter);
187+
FileParameter p = FileParameter.of(parameter);
188+
p.setFile(getFile(file));
185189
}
186-
} catch (Exception e) {
187-
e.printStackTrace();
188190
}
189191
}
190192
if (alligator.getServices() != null) {
@@ -242,13 +244,15 @@ List<IResult> run(IGraph model, IProgressMonitor monitor)
242244

243245
@Override
244246
public
245-
String getName() {
247+
String
248+
getName() {
246249
return service.name();
247250
}
248251

249252
@Override
250253
public
251-
String getDescription() {
254+
String
255+
getDescription() {
252256
return service.help();
253257
}
254258

0 commit comments

Comments
 (0)