Merge pull request #820 from grzesiek2010/init_edit

Fixed initialization of the form definition for edits that are already modifications of finalized forms

Author: seadowg

src/main/java/org/javarosa/core/model/FormDef.java

@@ -1116,8 +1116,11 @@ public void initialize(FormInitializationMode formInitializationMode) {
             if (metaSection != null) {
                 TreeElement instanceId = metaSection.getFirstChild("instanceID");
                 if (instanceId != null) {
-                    TreeElement deprecatedId = new TreeElement("deprecatedID");
-                    metaSection.addChild(deprecatedId);
+                    TreeElement deprecatedId = metaSection.getFirstChild("deprecatedID");
+                    if (deprecatedId == null) {
+                        deprecatedId = new TreeElement("deprecatedID");
+                        metaSection.addChild(deprecatedId);
+                    }
                     deprecatedId.setAnswer(instanceId.getValue());
                     instanceId.setAnswer(new StringData("uuid:" + PropertyUtils.genUUID()));
                 }

src/test/java/org/javarosa/core/model/test/FormDefTest.java

@@ -51,6 +51,7 @@
 import org.javarosa.core.model.condition.IFunctionHandler;
 import org.javarosa.core.model.data.IAnswerData;
 import org.javarosa.core.model.data.StringData;
+import org.javarosa.core.model.instance.TreeElement;
 import org.javarosa.core.model.instance.TreeReference;
 import org.javarosa.test.Scenario;
 import org.javarosa.test.XFormsElement;
@@ -530,6 +531,9 @@ public Object eval(Object[] args, EvaluationContext ec) {
         formDef = Scenario.createFormDef("Simplest", formXml);
 
         formDef.getMainInstance().getRoot().getFirstChild("meta").getFirstChild("instanceID").setAnswer(originalInstanceID);
+        TreeElement deprecatedID = new TreeElement("deprecatedID");
+        deprecatedID.setAnswer(originalDeprecatedID);
+        formDef.getMainInstance().getRoot().getFirstChild("meta").addChild(deprecatedID);
         formDef.initialize(FormInitializationMode.FINALIZED_FORM_EDIT);
 
         IAnswerData newInstanceID = formDef.getMainInstance().getRoot().getFirstChild("meta").getFirstChild("instanceID").getValue();