Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2010-02-26 21:15:04 +0000
committeratikhomirov2010-02-26 21:15:04 +0000
commitcd7562d19364ca8a810969329d19a3180027fe30 (patch)
tree1139ffb684afe4885137922abf27674df5071812
parent750c9d3d2b6badad24a5c6bac2299ded68fdbe80 (diff)
downloadorg.eclipse.gmf-tooling-cd7562d19364ca8a810969329d19a3180027fe30.tar.gz
org.eclipse.gmf-tooling-cd7562d19364ca8a810969329d19a3180027fe30.tar.xz
org.eclipse.gmf-tooling-cd7562d19364ca8a810969329d19a3180027fe30.zip
[219877] Transform fails with diagnosing a proxy resolutuion failure - result of transformation was silently ignoredv20100226-2359
-rw-r--r--plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.bridge.ui.dashboard/src/org/eclipse/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java10
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
index 370d21ccd..c9ab77a60 100644
--- a/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.bridge.ui.dashboard;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.gmf.internal.bridge.ui.dashboard.Plugin
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.gmf.bridge.ui.dashboard/src/org/eclipse/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java b/plugins/org.eclipse.gmf.bridge.ui.dashboard/src/org/eclipse/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java
index 4e206e789..865541153 100644
--- a/plugins/org.eclipse.gmf.bridge.ui.dashboard/src/org/eclipse/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java
+++ b/plugins/org.eclipse.gmf.bridge.ui.dashboard/src/org/eclipse/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2010 Borland Software Corporation and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,7 +12,9 @@
package org.eclipse.gmf.internal.bridge.ui.dashboard.actions;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -52,6 +54,7 @@ public class TransformMap2GenModelAction implements DashboardAction {
gm = mm.trimFileExtension().appendFileExtension("gmfgen"); //$NON-NLS-1$
state.setGM(gm);
}
+ IStatus result = Status.OK_STATUS;
try {
final ResourceSet rs = new ResourceSetImpl();
TransformToGenModelOperation op = new TransformToGenModelOperation(rs);
@@ -59,12 +62,13 @@ public class TransformMap2GenModelAction implements DashboardAction {
op.loadMappingModel(mm, new NullProgressMonitor());
op.loadGenModel(state.getDGM(), new NullProgressMonitor());
op.setGenURI(gm);
- op.executeTransformation(new NullProgressMonitor());
+ result = op.executeTransformation(new NullProgressMonitor());
} catch (CoreException ce) {
- ErrorDialog.openError(context.getShell(), null, ce.getMessage(), ce.getStatus());
+ result = ce.getStatus();
} finally {
context.updateStatus();
}
+ ErrorDialog.openError(context.getShell(), null, null, result, IStatus.ERROR | IStatus.WARNING);
}
protected void configureOptions(TransformOptions options) {

Back to the top