From 94ce1132df676be701c09f94a71fbed18123524a Mon Sep 17 00:00:00 2001 From: Pavel Date: Sat, 6 May 2017 23:36:30 -0400 Subject: [PATCH] Returning empty list of packages if uri is relative and resourse is null --- .../nasdanika/codegen/ecore/impl/EPackageSourceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java b/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java index f0332f1..2365fcf 100644 --- a/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java +++ b/org.nasdanika.codegen.ecore/src/org/nasdanika/codegen/ecore/impl/EPackageSourceImpl.java @@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException; +import org.eclipse.core.runtime.Plugin; import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier; import org.eclipse.emf.codegen.ecore.genmodel.GenPackage; import org.eclipse.emf.common.util.ECollections; @@ -110,7 +111,12 @@ public EList getEPackages(ResourceSet resourceSet) { } } else { URI uri = URI.createURI(getLocation()); - if (eResource() != null) { + if (uri.isRelative()) { + if (eResource() == null) { + System.err.println("Resource is null"); // TODO - proper logging. + return ret; + } + URI base = eResource().getURI(); if (base != null && base.isHierarchical()) { uri = uri.resolve(base);