[551238] NPE in ExtendedPropertySheetPage

6 files changed, 32 insertions, 24 deletions

diff --git a/features/org.eclipse.emf.edit.ui-feature/feature.xml b/features/org.eclipse.emf.edit.ui-feature/feature.xml
index fc0152d25..e7d01cf49 100644
--- a/features/org.eclipse.emf.edit.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.edit.ui-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.edit.ui"
       label="%featureName"
-      version="2.17.0.qualifier"
+      version="2.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.edit.ui-feature/pom.xml b/features/org.eclipse.emf.edit.ui-feature/pom.xml
index 00d0bd8b4..12e06d07e 100644
--- a/features/org.eclipse.emf.edit.ui-feature/pom.xml
+++ b/features/org.eclipse.emf.edit.ui-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.edit.ui</artifactId>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.18.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
index 6d58dc40c..f8238dacc 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.codegen.ecore;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
index 8db7d3353..3800cb5a9 100644
--- a/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.edit.ui;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.edit.ui.EMFEditUIPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -18,8 +18,8 @@ Export-Package: org.eclipse.emf.edit.ui,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.workbench;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.common.ui;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
  org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
  org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
diff --git a/plugins/org.eclipse.emf.edit.ui/pom.xml b/plugins/org.eclipse.emf.edit.ui/pom.xml
index 42a726022..e89a4f7ee 100644
--- a/plugins/org.eclipse.emf.edit.ui/pom.xml
+++ b/plugins/org.eclipse.emf.edit.ui/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.edit.ui</artifactId>
-  <version>2.16.0-SNAPSHOT</version>
+  <version>2.17.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/view/ExtendedPropertySheetPage.java b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/view/ExtendedPropertySheetPage.java
index baeeb8b5a..d9ea047f3 100644
--- a/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/view/ExtendedPropertySheetPage.java
+++ b/plugins/org.eclipse.emf.edit.ui/src/org/eclipse/emf/edit/ui/view/ExtendedPropertySheetPage.java
@@ -547,31 +547,34 @@ public class ExtendedPropertySheetPage extends PropertySheetPage
     }
 
     Tree tree = (Tree)getControl();
-    try
-    {
-      tree.setRedraw(false);
-      super.selectionChanged(part, selection);
-    }
-    finally
-    {
-      if (columnResizer != null)
-      {
-        columnResizer.resizeColumns();
-      }
-      tree.setRedraw(true);
-    }
-
-    if (autoExpandLevel != 0)
+    if (tree != null)
     {
       try
       {
         tree.setRedraw(false);
-        expand(tree, tree.getItems(), autoExpandLevel);
+        super.selectionChanged(part, selection);
       }
       finally
       {
+        if (columnResizer != null)
+        {
+          columnResizer.resizeColumns();
+        }
         tree.setRedraw(true);
       }
+  
+      if (autoExpandLevel != 0)
+      {
+        try
+        {
+          tree.setRedraw(false);
+          expand(tree, tree.getItems(), autoExpandLevel);
+        }
+        finally
+        {
+          tree.setRedraw(true);
+        }
+      }
     }
   }
 
@@ -646,6 +649,11 @@ public class ExtendedPropertySheetPage extends PropertySheetPage
   public void refresh()
   {
     Control control = getControl();
+    if (control == null)
+    {
+      return;
+    }
+
     // Check that there isn't currently a cell editor active.
     // If there is a focus control that isn't the control of the property sheet page...
     Control focusControl = control.getDisplay().getFocusControl();
@@ -679,7 +687,7 @@ public class ExtendedPropertySheetPage extends PropertySheetPage
       return;
     }
 
-    Tree tree = (Tree)getControl();
+    Tree tree = (Tree)control;
     try
     {
       tree.setRedraw(false);