Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2008-07-10 12:29:39 +0000
committerashatalin2008-07-10 12:29:39 +0000
commit462bb8b77f3005ebb8a77f7b05e4f6ab7adc6b33 (patch)
tree29b46ca738f1a62617a59460f2211ef9da50bb23 /plugins
parent69a338cda8916cea7772d036dbe2f6ad1732cc36 (diff)
downloadorg.eclipse.gmf-tooling-462bb8b77f3005ebb8a77f7b05e4f6ab7adc6b33.tar.gz
org.eclipse.gmf-tooling-462bb8b77f3005ebb8a77f7b05e4f6ab7adc6b33.tar.xz
org.eclipse.gmf-tooling-462bb8b77f3005ebb8a77f7b05e4f6ab7adc6b33.zip
[217307] - "Add extension model" action: impossible use for additing nondeployed models
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.gmf.bridge.trace/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.gmf.bridge.trace/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge.trace/META-INF/MANIFEST.MF
index f5bb0ebd0..8f6634902 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge.trace/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GMF Models Bridge Tracing Plug-in
Bundle-SymbolicName: org.eclipse.gmf.bridge.trace; singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)",
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
index 0d8a55415..844f378e2 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
@@ -17,6 +17,7 @@ import java.util.HashMap;
import java.util.Map;
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;
@@ -88,7 +89,7 @@ public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispe
try {
traceRes = resSet.getResource(traceModelURI, true);
} catch (RuntimeException e) {
- traceRes = resSet.createResource(traceModelURI);
+ traceRes = resSet.createResource(traceModelURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
}
if (traceRes.getContents().size() > 0 && traceRes.getContents().get(0) instanceof TraceModel) {

Back to the top