Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2008-07-10 12:29:46 +0000
committerashatalin2008-07-10 12:29:46 +0000
commita1574d1dbc6ecaf5e0ef5ae95c7a427600fcebc1 (patch)
treeca7c47f13d2c4040e60ec9c7409e301cbfce99ff /plugins
parentdf79a2ede42b33cd125ef4ebec25f643403eea9c (diff)
downloadorg.eclipse.gmf-tooling-a1574d1dbc6ecaf5e0ef5ae95c7a427600fcebc1.tar.gz
org.eclipse.gmf-tooling-a1574d1dbc6ecaf5e0ef5ae95c7a427600fcebc1.tar.xz
org.eclipse.gmf-tooling-a1574d1dbc6ecaf5e0ef5ae95c7a427600fcebc1.zip
[217307] - "Add extension model" action: impossible use for additing nondeployed models
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/ui/ModelSelectionPage.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
index 1d0b925d3..8c4b74b06 100644
--- a/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: GMF Tooling Commons Plug-in
Bundle-Vendor: Eclipse.org
Bundle-SymbolicName: org.eclipse.gmf.common
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.100.qualifier
Export-Package: org.eclipse.gmf.common,
org.eclipse.gmf.common.codegen,
org.eclipse.gmf.internal.codegen.dispatch;x-friends:="org.eclipse.gmf.codegen,org.eclipse.gmf.graphdef.codegen,org.eclipse.gmf.codegen.lite",
diff --git a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/ui/ModelSelectionPage.java b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/ui/ModelSelectionPage.java
index b5d96ce3c..46ff76e78 100644
--- a/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/ui/ModelSelectionPage.java
+++ b/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/ui/ModelSelectionPage.java
@@ -18,6 +18,7 @@ import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ContentHandler;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -347,7 +348,7 @@ public class ModelSelectionPage extends WizardPage {
protected Resource loadResource() {
unloadResource();
assert uri != null;
- Resource resource = getResourceSet().createResource(uri);
+ Resource resource = getResourceSet().createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
if (resource == null) {
setErrorMessage(Messages.ModelSelectionPageModelNA);
return null;

Back to the top