bug[ats_ATS175136]: Null pointer in FilteredTree construction

Change-Id: Ic233f5aa62171f8a8f3891c18196ef79c1dee30f

1 files changed, 16 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTree.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTree.java
index ec9b84d1d88..8065531f7f9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTree.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTree.java
@@ -12,10 +12,10 @@ package org.eclipse.osee.framework.ui.skynet.widgets.dialog;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PatternFilter;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * @author Donald G. Dunne
@@ -29,12 +29,19 @@ public class FilteredTree extends org.eclipse.ui.dialogs.FilteredTree {
       super(parent, treeStyle, filter, useNewLook);
    }
 
-   /**
-    * Ensure images have been initialized before FilteredTree construction
-    */
-   {
-      ImageDescriptor imageDescriptor = ImageManager.getImageDescriptor(FrameworkImage.CLEAR_CO);
-      JFaceResources.getImageRegistry().put(CLEAR_ICON, imageDescriptor);
-      JFaceResources.getImageRegistry().put(DISABLED_CLEAR_ICON, imageDescriptor);
+   @Override
+   protected Composite createFilterControls(Composite parent) {
+      ImageDescriptor descriptor =
+         AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "$nl$/icons/full/etool16/clear_co.gif"); //$NON-NLS-1$
+      if (descriptor != null) {
+         JFaceResources.getImageRegistry().put(CLEAR_ICON, descriptor);
+      }
+      descriptor =
+         AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "$nl$/icons/full/dtool16/clear_co.gif"); //$NON-NLS-1$
+      if (descriptor != null) {
+         JFaceResources.getImageRegistry().put(DISABLED_CLEAR_ICON, descriptor);
+      }
+      return super.createFilterControls(parent);
    }
+
 }