summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorghillairet2012-05-22 11:30:11 (EDT)
committer mgolubev2012-05-22 11:30:11 (EDT)
commit2b01af1249cea7035bbb126fd0cf1148b3990d8c (patch)
treee198d6846c2fa02f51b9b13b29e34a2daa9d8619
parent191164c9cb382cdf8cbb7216ed49347a0d44a5f5 (diff)
downloadorg.eclipse.gmf-tooling-2b01af1249cea7035bbb126fd0cf1148b3990d8c.zip
org.eclipse.gmf-tooling-2b01af1249cea7035bbb126fd0cf1148b3990d8c.tar.gz
org.eclipse.gmf-tooling-2b01af1249cea7035bbb126fd0cf1148b3990d8c.tar.bz2
[368988] - post-merge problem: Fixed settings of preferences after
execution of gmfgen generation.
-rw-r--r--plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java2
-rw-r--r--plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java b/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java
index cace222..43876be 100644
--- a/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java
+++ b/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/TransformOptions.java
@@ -92,6 +92,8 @@ public class TransformOptions extends AbstractPreferenceInitializer {
String v = getWithContexts(k);
if (v != null && v != myNoValueToken) {
myContextPrefs.put(k, v);
+ } else {
+ myContextPrefs.remove(k);
}
}
myContextPrefs.flush();
diff --git a/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java b/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java
index 85135c7..05c30ce 100644
--- a/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java
+++ b/plugins/org.eclipse.gmf.bridge.ui/src/org/eclipse/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java
@@ -182,7 +182,6 @@ class ViewmapProducerWizardPage extends WizardPage {
radioCustomQVT.setText("Use custom QVTO transformation:");
qvtoFileControl = new Text(map2genControls, SWT.SINGLE | SWT.BORDER);
- qvtoFileControl.addListener(SWT.Modify, modifyListener);
radioDGMT.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
@@ -300,9 +299,6 @@ class ViewmapProducerWizardPage extends WizardPage {
TransformOptions options = getOperation().getOptions();
// safe to set option value now as they get flushed into storage only on Wizard.performFinish
options.setFigureTemplatesPath(checkTextFieldURI(templatesPathText));
- options.setTransformation(checkTextFieldURI(qvtoFileControl));
- options.setPreReconcileTransform(checkTextFieldURI(preReconcileTranfsormText));
- options.setPostReconcileTransform(checkTextFieldURI(postReconcileTransformText));
}
private URL checkTextFieldURI(Text widget) {