Jira-ID: CRNT-22800 Configuration Variables can't be used properly if first added in properties view.

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53833 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 4 insertions, 9 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java
index e5fef48..66af97c 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java
@@ -1031,6 +1031,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor
 
    protected void validateModel()
    {
+      VariableContextHelper.getInstance().storeVariables(getWorkflowModel(), true);
       if (getWorkflowModel() == null)
       {
          // todo: (fh) should not happen, investigate
@@ -1107,9 +1108,8 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor
       }
       modelServer = new ModelServer(model);
       
-      variableContextHelper.createContext(model);
-      variableContextHelper.getContext(model).initializeVariables(model);      
-      variableContextHelper.getContext(model).refreshVariables(model);
+      variableContextHelper.storeVariables(model, false);
+
       return model;
    }
 
@@ -1214,12 +1214,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor
          // store configuration variables
          try
          {
-            variableContextHelper.createContext(getWorkflowModel());
-            variableContextHelper.getContext(getWorkflowModel()).initializeVariables(
-                  getWorkflowModel());
-            variableContextHelper.getContext(getWorkflowModel()).refreshVariables(
-                  getWorkflowModel());
-            variableContextHelper.getContext(getWorkflowModel()).saveVariables();
+            variableContextHelper.storeVariables(getWorkflowModel(), true);
          }
          catch (Throwable t)
          {