Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGéry Deloge2016-10-13 14:03:24 +0000
committerBenoit Maggi2016-10-14 14:18:53 +0000
commit2ca12d54fd2be941b5ba736c8d7f38cfaf03c3e4 (patch)
tree8f57c82f0fe049773f661441123a49381e8bcc67
parent663c5e8eb090bd0493ee07735a99e35f0363e4f2 (diff)
downloadorg.eclipse.papyrus-2ca12d54fd2be941b5ba736c8d7f38cfaf03c3e4.tar.gz
org.eclipse.papyrus-2ca12d54fd2be941b5ba736c8d7f38cfaf03c3e4.tar.xz
org.eclipse.papyrus-2ca12d54fd2be941b5ba736c8d7f38cfaf03c3e4.zip
Bug 505900: [BMM] invalid extension for org.eclipse.papyrus.infra.properties.contexts
Change-Id: I290072751830518a52b6c3e551fa4857efc8eb70 Signed-off-by: Géry Deloge <gery.deloge@cea.fr> (cherry picked from commit 3278cc73a27b664bbd23fd4065521d8d6824e88b)
-rw-r--r--extraplugins/bmm/org.eclipse.papyrus.bmm/plugin.xml2
-rw-r--r--plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/extraplugins/bmm/org.eclipse.papyrus.bmm/plugin.xml b/extraplugins/bmm/org.eclipse.papyrus.bmm/plugin.xml
index 518357ab69a..810fdac40c3 100644
--- a/extraplugins/bmm/org.eclipse.papyrus.bmm/plugin.xml
+++ b/extraplugins/bmm/org.eclipse.papyrus.bmm/plugin.xml
@@ -39,7 +39,7 @@
<extension
point="org.eclipse.papyrus.infra.properties.contexts">
<context
- contextModel="properties/BMM.ctx"
+ contextModel="properties/Bmm.ctx"
isCustomizable="true">
</context>
</extension>
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
index 505d4234b76..36574ba8b00 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/src/org/eclipse/papyrus/infra/properties/catalog/PropertiesURIHandler.java
@@ -58,6 +58,9 @@ public class PropertiesURIHandler implements URIHandler {
@Override
public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {
URI convertedURI = getConvertedURI(uri);
+ if(convertedURI == null){
+ throw new IOException(uri.toString() + " not found");
+ }
URIHandler handler = getDelegateHandler(convertedURI);
return handler.createInputStream(convertedURI, options);
}

Back to the top