Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2006-06-01 12:44:38 +0000
committeratikhomirov2006-06-01 12:44:38 +0000
commitbbe71a811cb483f84a6ccde69f26526e72576f04 (patch)
treed278ab29ad2869100ce52a7d49b5627a76fb4d71 /plugins/org.eclipse.gmf.codegen.ui
parent76c737ac6c94831cfd0f2a9721492a51345d6c55 (diff)
downloadorg.eclipse.gmf-tooling-bbe71a811cb483f84a6ccde69f26526e72576f04.tar.gz
org.eclipse.gmf-tooling-bbe71a811cb483f84a6ccde69f26526e72576f04.tar.xz
org.eclipse.gmf-tooling-bbe71a811cb483f84a6ccde69f26526e72576f04.zip
[mgolubev] #144497 Preserve user-defined values for .gmfgen's dynamicTemplates, templateDirectory, creationWizardIconPath and iconPath options & #144304 Custom plugin name defined in gmfgen model is not retained on regeneration from gmfmap model
Diffstat (limited to 'plugins/org.eclipse.gmf.codegen.ui')
-rw-r--r--plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java b/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java
index 7c502929c..4da76c9b7 100644
--- a/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java
+++ b/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java
@@ -36,6 +36,8 @@ public class GMFGenConfig extends ReconcilerConfigBase {
preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_DiagramFileExtension());
preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_SameFileForDiagramAndModel());
preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_ModelID());
+ preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_DynamicTemplates());
+ preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_TemplateDirectory());
setMatcher(GMFGEN.getGenPlugin(), ALWAYS_MATCH); //exactly one feature for ALWAYS_MATCH GenEditorGenerator
preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_ID());
@@ -45,9 +47,16 @@ public class GMFGenConfig extends ReconcilerConfigBase {
preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_ActivatorClassName());
preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_PrintingEnabled());
+ setMatcher(GMFGEN.getGenEditorView(), ALWAYS_MATCH); //exactly one
+ preserveIfSet(GMFGEN.getGenEditorView(), GMFGEN.getGenEditorView_IconPath());
+ preserveIfSet(GMFGEN.getGenEditorView(), GMFGEN.getGenEditorView_ClassName());
+ preserveIfSet(GMFGEN.getGenEditorView(), GMFGEN.getGenEditorView_ID());
+
setMatcher(GMFGEN.getGenDiagram(), ALWAYS_MATCH);
preserveIfSet(GMFGEN.getGenDiagram(), GMFGEN.getShortcuts_ContainsShortcutsTo());
preserveIfSet(GMFGEN.getGenDiagram(), GMFGEN.getShortcuts_ShortcutsProvidedFor());
+ preserveIfSet(GMFGEN.getGenDiagram(), GMFGEN.getEditorCandies_CreationWizardIconPath());
+ preserveIfSet(GMFGEN.getGenDiagram(), GMFGEN.getGenDiagram_Synchronized());
setMatcher(GMFGEN.getGenTopLevelNode(), getGenNodeMatcher());
preserveIfNotByPattern(GMFGEN.getGenTopLevelNode(), GMFGEN.getGenChildContainer_CanonicalEditPolicyClassName(), ".*" + GenChildContainer.CANONICAL_EDIT_POLICY_SUFFIX);

Back to the top