Jira-ID: CRNT-23166 NPE observed while clicking on Restore default button after Interactive application type change, for all Interactive application types

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

1 files changed, 12 insertions, 0 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ApplicationInteractivePropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ApplicationInteractivePropertyPage.java
index 399a589..337fa21 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ApplicationInteractivePropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ApplicationInteractivePropertyPage.java
@@ -59,9 +59,14 @@ public class ApplicationInteractivePropertyPage extends AbstractModelElementProp
 
    private HashMap newContexts = new HashMap();
    private TableManager tableManager;
+   private IModelElementNodeSymbol savedSymbol;
+   private IModelElement savedElement;
 
    public void loadFieldsFromElement(IModelElementNodeSymbol symbol, IModelElement node)
    {
+      savedSymbol = symbol;
+      savedElement = node;
+      
       resetContent();
 
       ApplicationType application = (ApplicationType) node;
@@ -121,6 +126,13 @@ public class ApplicationInteractivePropertyPage extends AbstractModelElementProp
       return types;
    }
 
+   @Override
+   protected void performDefaults()
+   {
+      loadFieldsFromElement(savedSymbol, savedElement);
+      //super.performDefaults();
+   }
+
    private void resetContent()
    {
       removePreferenceNodes(INTERACTIVE_ID);