From 1762acceb94ad0c7022ac7d5b28f0fa1e999b6c5 Mon Sep 17 00:00:00 2001
From: kchong
Date: Wed, 2 Aug 2006 21:46:10 +0000
Subject: [143528] Certain XSD constructs are not updated when modifying from
 the source view

---
 .../wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor')

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
index 9bb4545bd8..ef2a4d5102 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
@@ -86,8 +86,10 @@ public class XSDTabbedPropertySheetPage extends TabbedPropertySheetPage implemen
         oldSelection = adapter;
         Object model = adapter.getTarget();
 
-        if (xsdModelAdapter != null)
+        if (xsdModelAdapter != null && xsdModelAdapter.getModelReconcileAdapter() != null)
+        {
           xsdModelAdapter.getModelReconcileAdapter().removeListener(internalNodeAdapter);
+        }
         
         xsdModelAdapter = XSDModelAdapter.lookupOrCreateModelAdapter(((XSDConcreteComponent)adapter.getTarget()).getElement().getOwnerDocument());
         if (xsdModelAdapter != null)
@@ -115,7 +117,7 @@ public class XSDTabbedPropertySheetPage extends TabbedPropertySheetPage implemen
   
   public void dispose()
   {
-    if (xsdModelAdapter != null)
+    if (xsdModelAdapter != null && xsdModelAdapter.getModelReconcileAdapter() != null)
     {
       xsdModelAdapter.getModelReconcileAdapter().removeListener(internalNodeAdapter);
       xsdModelAdapter = null;
-- 
cgit v1.2.3