Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2009-09-23 13:20:48 -0400
committeratikhomirov2009-09-23 13:20:48 -0400
commit4d5944ca5e2b416842ccd4000392a264ba0e4fb4 (patch)
tree689c7909a48552e8cfb0a44b60d846a0a58eefb1
parent69425a11eae339205d082c47449f4305aac031d7 (diff)
downloadorg.eclipse.gmf-tooling-4d5944ca5e2b416842ccd4000392a264ba0e4fb4.tar.gz
org.eclipse.gmf-tooling-4d5944ca5e2b416842ccd4000392a264ba0e4fb4.tar.xz
org.eclipse.gmf-tooling-4d5944ca5e2b416842ccd4000392a264ba0e4fb4.zip
[290239] RequiredPlugins attribute content is lost on Map2Gen regeneration.
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java
index e9c9b5334..f56283d32 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
*
* Contributors:
* Michael Golubev (Borland) - initial API and implementation
+ * Artem Tikhomirov (Borland) - maintenance and extra configuration
*/
package org.eclipse.gmf.internal.codegen.util;
@@ -21,6 +22,7 @@ import org.eclipse.gmf.internal.common.reconcile.Copier;
import org.eclipse.gmf.internal.common.reconcile.Decision;
import org.eclipse.gmf.internal.common.reconcile.DefaultDecision;
import org.eclipse.gmf.internal.common.reconcile.Matcher;
+import org.eclipse.gmf.internal.common.reconcile.MergeListsDecision;
import org.eclipse.gmf.internal.common.reconcile.ReconcilerConfigBase;
import org.eclipse.gmf.internal.common.reconcile.ReflectiveMatcher;
import org.eclipse.gmf.internal.common.reconcile.StringPatternDecision;
@@ -47,6 +49,7 @@ public class GMFGenConfig extends ReconcilerConfigBase {
preserveIfSet(GMFGEN.getGenPlugin_Version());
preserveIfSet(GMFGEN.getGenPlugin_ActivatorClassName());
preserveIfSet(GMFGEN.getGenPlugin_PrintingEnabled());
+ addDecision(GMFGEN.getGenPlugin(), new MergeListsDecision(GMFGEN.getGenPlugin_RequiredPlugins()));
setMatcher(GMFGEN.getGenEditorView(), ALWAYS_MATCH); //exactly one
preserveIfSet(GMFGEN.getGenEditorView_IconPath());

Back to the top