From 5ca2ce5979268db866eb243f83273dda56fcbc07 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Thu, 12 Oct 2017 12:40:42 +0000
Subject: [PATCH] getReferencingResourceURIs(): - Ignore directories when
trying to find sidecar model files - Suppress console message in case a
package in a model file could not be found
---
.../fortiss/tooling/kernel/utils/ResourceUtils.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
index 450226f3f..8dfacc030 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/ResourceUtils.java
@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -48,6 +49,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
import org.eclipse.emf.ecore.xml.type.AnyType;
@@ -62,7 +64,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: A14278605586372E3CCEE85B91CF34CD
+ * @ConQAT.Rating YELLOW Hash: E6CBD4C9FC74A32B1386D76FC50D4CD1
*/
public final class ResourceUtils {
@@ -394,7 +396,7 @@ public final class ResourceUtils {
}
for(IResource member : members) {
- if(member.equals(file)) {
+ if(member.equals(file) || member instanceof IFolder) {
continue;
}
@@ -415,8 +417,10 @@ public final class ResourceUtils {
siblingResource.unload();
} catch(Exception e) {
- error(ToolingKernelActivator.getDefault(),
- "Failed to load \"" + member.getName(), e);
+ if(!(e.getCause() instanceof PackageNotFoundException)) {
+ error(ToolingKernelActivator.getDefault(),
+ "Failed to load \"" + member.getName(), e);
+ }
}
if(progressMonitor != null) {
--
GitLab