Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Faltermeier2017-11-23 15:08:40 +0000
committerJohannes Faltermeier2017-11-23 15:18:21 +0000
commitc9b569ba80b6fbbd401e33597150731a0ee1679b (patch)
treeeb01e4f87d04da6f9a1a2f10e9668de3f21225d5
parentf446cf03b3c0670b19cba52668360126f0ba632a (diff)
downloadorg.eclipse.emf.ecp.core-c9b569ba80b6fbbd401e33597150731a0ee1679b.tar.gz
org.eclipse.emf.ecp.core-c9b569ba80b6fbbd401e33597150731a0ee1679b.tar.xz
org.eclipse.emf.ecp.core-c9b569ba80b6fbbd401e33597150731a0ee1679b.zip
Bug 527687 - ChildContext DMR not initialized
* move resolvement code to #vControlAdded method as this is called when a new control is added during runtime _and_ during child context creation Change-Id: Ic45d45ba810be80739620f2861cbf82d8b45aee4 Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
-rw-r--r--bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
index 03af58f8a7..19a1ac29ef 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
@@ -62,11 +62,6 @@ public class SettingToControlMapperImpl implements EMFFormsSettingToControlMappe
&& !VDomainModelReference.class.isInstance(EObject.class.cast(notifier).eContainer())) {
final VDomainModelReference domainModelReference = VDomainModelReference.class.cast(notifier);
- // FIXME remove
- SettingToControlExpandHelper.resolveDomainReferences(domainModelReference,
- viewModelContext.getDomainModel(),
- viewModelContext);
-
final VControl control = findControl(domainModelReference);
if (control != null) {
vControlAdded(control);
@@ -273,8 +268,10 @@ public class SettingToControlMapperImpl implements EMFFormsSettingToControlMappe
return;
}
- checkAndUpdateSettingToControlMapping(vControl);
final EMFFormsViewContext viewContext = controlContextMap.get(vControl);
+ resolveDMR(vControl, viewContext);
+
+ checkAndUpdateSettingToControlMapping(vControl);
if (viewContext != null) {
contextListenerMap.get(viewContext).addVControl(vControl);
} else {
@@ -282,6 +279,16 @@ public class SettingToControlMapperImpl implements EMFFormsSettingToControlMappe
}
}
+ private void resolveDMR(VControl vControl, EMFFormsViewContext childContext) {
+ /* if child context is null use root context */
+ final EMFFormsViewContext viewContext = childContext != null ? childContext : viewModelContext;
+ // FIXME remove
+ SettingToControlExpandHelper.resolveDomainReferences(
+ vControl.getDomainModelReference(),
+ viewContext.getDomainModel(),
+ viewContext);
+ }
+
/**
* {@inheritDoc}
*/

Back to the top