From 23f6c11ecdb083b8b153fc43010210d4f6fee0e6 Mon Sep 17 00:00:00 2001
From: Hernan Ponce de Leon <ponce@fortiss.org>
Date: Thu, 29 Mar 2018 08:16:39 +0000
Subject: [PATCH] [YELLOW] Catch exceptions in loadModelFromFile
---
.../trunk/src/org/fortiss/tooling/kernel/utils/.ratings | 2 +-
.../fortiss/tooling/kernel/utils/EMFResourceUtils.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/.ratings b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/.ratings
index f83b5e34f..6780334f0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/.ratings
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/.ratings
@@ -1,6 +1,6 @@
CompositionUtils.java a2b1c7f4b1ae4d0783b4e170e432a9e02fc451fd GREEN
ConstraintsUtils.java 93ae55d9c4a2645a97bb4162f43eb00acbc94633 GREEN
-EMFResourceUtils.java 01cddc68d7dd199191792d87f8256d6c52540856 GREEN
+EMFResourceUtils.java 451ef553ab30e958c74dd442f83bcb1e6bc6d9c0 YELLOW
EcoreSerializerBase.java 63b879cb32a0981dc1fefaf33db098abe81fe520 GREEN
EcoreUtils.java c191385af86ff630d1ad9daacb42751527db8744 GREEN
ExtensionPointUtils.java e3ec0d396b0a88c040fd0117d4a369340d6099f4 GREEN
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
index 970d59cd8..0f1b50f22 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/EMFResourceUtils.java
@@ -170,6 +170,12 @@ public final class EMFResourceUtils {
* @return the root {@link EObject}
*/
public static EObject loadModelFromFile(URI uri) {
- return loadModelFromFileWithUnknownFeatures(uri).getFirst();
+ try {
+ return loadModelFromFileWithUnknownFeatures(uri).getFirst();
+ } catch(Exception ex) {
+ error(ToolingKernelActivator.getDefault(),
+ "Failed to load model from " + uri.toString());
+ }
+ return null;
}
}
--
GitLab