diff options
| author | Henrik Rentz-Reichert | 2011-11-10 11:55:39 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2011-11-10 11:55:39 +0000 |
| commit | 381122d528c9d122f8f6dfe2fa5c3e2eab81e550 (patch) | |
| tree | 647315a2338729cd04b3059e201bcdb5843993e5 | |
| parent | cab47df9635d5a0dd723c2806fce9988b1f250ec (diff) | |
| download | org.eclipse.etrice-381122d528c9d122f8f6dfe2fa5c3e2eab81e550.tar.gz org.eclipse.etrice-381122d528c9d122f8f6dfe2fa5c3e2eab81e550.tar.xz org.eclipse.etrice-381122d528c9d122f8f6dfe2fa5c3e2eab81e550.zip | |
[core.room] fix in URI resolver (no error for empty URIs)
| -rw-r--r-- | plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/scoping/PlatformRelativeUriResolver.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/scoping/PlatformRelativeUriResolver.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/scoping/PlatformRelativeUriResolver.java index a27949a50..87aa94415 100644 --- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/scoping/PlatformRelativeUriResolver.java +++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/scoping/PlatformRelativeUriResolver.java @@ -34,7 +34,10 @@ public class PlatformRelativeUriResolver extends ImportUriResolver { @Override
public String resolve(EObject object) {
String resolve = super.resolve(object);
- if (resolve!=null && object.eResource()!=null && object.eResource().getURI()!=null) {
+ if (resolve==null || resolve.trim().isEmpty())
+ return null;
+
+ if (object.eResource()!=null && object.eResource().getURI()!=null) {
URI uri = URI.createURI(resolve);
if (uri.isRelative()) {
URI base = object.eResource().getURI().trimSegments(1);
|