Fixed (hopefully) the problem of extension data getting removed on writes. I say hopefully because although it now passes my basic JUnit tests, there are many possible scenarios that are not yet tested thoroughly.

1 files changed, 15 insertions, 2 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DynamicElementTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DynamicElementTranslator.java
index 827b43764..82a92296d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DynamicElementTranslator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DynamicElementTranslator.java
@@ -37,8 +37,21 @@ class DynamicElementTranslator extends Translator implements IAnyTranslator
 
         return new Translator[]
         {
-            new Translator(TEXT_ATTRIBUTE_VALUE, facesConfigPackage.getDynamicElement_TextContent()),
-            new DynamicElementTranslator("*", facesConfigPackage.getDynamicElement_ChildNodes())
+            new DynamicElementTranslator("*", facesConfigPackage.getDynamicElement_ChildNodes()),
+            new Translator(TEXT_ATTRIBUTE_VALUE, facesConfigPackage.getDynamicElement_TextContent())
+            {
+                public Object getMOFValue(EObject object)
+                {
+                    // TODO: this is a bit of a hack.  The problem is
+                    // that for some reason, if this translator returns
+                    // null, then EMF2DOMAdapterImpl.updateDOMSubtree will
+                    // remove the containing DynamicElement node completely.
+                    // Returning an non-null empty value seems to work
+                    // around this for now.
+                    Object value = super.getMOFValue(object);
+                    return value != null ? value : "";
+                }
+            }
         };
     }