Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2014-01-16 18:31:40 -0500
committermgolubev2014-12-17 15:41:41 -0500
commit885aa2920826aad9fb2205237816c3b0a2e94c39 (patch)
tree5d9753189da4299a88c7dac5b3d2c8bcda63e2af
parent5f9f319ea43ede9f3e139997dbe9b27a916b5668 (diff)
downloadorg.eclipse.gmf-tooling-885aa2920826aad9fb2205237816c3b0a2e94c39.tar.gz
org.eclipse.gmf-tooling-885aa2920826aad9fb2205237816c3b0a2e94c39.tar.xz
org.eclipse.gmf-tooling-885aa2920826aad9fb2205237816c3b0a2e94c39.zip
NotationViewFactories are deprecated, don't reconcile them.
Change-Id: I5543ca9c83b0f392d62aa970a8832127e826b810 Signed-off-by: mgolubev <golubev@montages.com>
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenConfig.java8
1 files changed, 4 insertions, 4 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 34cf1d715..d1046b90c 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
@@ -83,7 +83,7 @@ public class GMFGenConfig extends ReconcilerConfigBase {
for (EClass node : new EClass[] { GMFGEN.getGenTopLevelNode(), GMFGEN.getGenChildNode(), GMFGEN.getGenChildLabelNode(), GMFGEN.getGenChildSideAffixedNode() }) {
setMatcher(node, new VisualIDMatcher());
- restoreOld(node, GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
+ preserveIfSet(node, GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
restoreOld(node, GMFGEN.getGenCommonBase_EditPartClassName());
restoreOld(node, GMFGEN.getGenCommonBase_ItemSemanticEditPolicyClassName());
restoreOld(node, GMFGEN.getGenContainerBase_CanonicalEditPolicyClassName());
@@ -93,7 +93,7 @@ public class GMFGenConfig extends ReconcilerConfigBase {
}
setMatcher(GMFGEN.getGenCompartment(), new VisualIDMatcher());
- restoreOld(GMFGEN.getGenCompartment(), GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
+ preserveIfSet(GMFGEN.getGenCompartment(), GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
restoreOld(GMFGEN.getGenCompartment(), GMFGEN.getGenCommonBase_EditPartClassName());
restoreOld(GMFGEN.getGenCompartment(), GMFGEN.getGenCommonBase_ItemSemanticEditPolicyClassName());
restoreOld(GMFGEN.getGenCompartment(), GMFGEN.getGenContainerBase_CanonicalEditPolicyClassName());
@@ -103,7 +103,7 @@ public class GMFGenConfig extends ReconcilerConfigBase {
preserveIfSet(GMFGEN.getGenCompartment_NeedsTitle());
setMatcher(GMFGEN.getGenLink(), new VisualIDMatcher());
- restoreOld(GMFGEN.getGenLink(), GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
+ preserveIfSet(GMFGEN.getGenLink(), GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
restoreOld(GMFGEN.getGenLink(), GMFGEN.getGenCommonBase_EditPartClassName());
restoreOld(GMFGEN.getGenLink(), GMFGEN.getGenCommonBase_ItemSemanticEditPolicyClassName());
restoreOld(GMFGEN.getGenLink_CreateCommandClassName());
@@ -115,7 +115,7 @@ public class GMFGenConfig extends ReconcilerConfigBase {
for (EClass label : new EClass[] { GMFGEN.getGenLinkLabel(), GMFGEN.getGenNodeLabel(), GMFGEN.getGenExternalNodeLabel() }) {
setMatcher(label, new VisualIDMatcher());
- restoreOld(label, GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
+ preserveIfSet(label, GMFGEN.getGenCommonBase_NotationViewFactoryClassName());
restoreOld(label, GMFGEN.getGenCommonBase_EditPartClassName());
restoreOld(label, GMFGEN.getGenCommonBase_ItemSemanticEditPolicyClassName());
}

Back to the top