From 6bb6da14b27887021a9ed658d05a1cbba70f1268 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 19 Jul 2006 07:35:27 +0000 Subject: [PATCH] Apply patch for bug 150955 - ADAPTER IS NULL warnings --- .../SystemViewLabelAndContentProvider.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java index 2adfd483926..a383e5a65a1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java @@ -44,6 +44,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.DeferredTreeContentManager; +import org.eclipse.ui.progress.PendingUpdateAdapter; /** @@ -181,14 +182,23 @@ public class SystemViewLabelAndContentProvider extends LabelProvider { SystemBasePlugin.logWarning("ERROR: null passed to getAdapter in SystemViewLabelAndContentProvider"); } - + else { - if (!(o instanceof IAdaptable)) - adapter = (ISystemViewElementAdapter)Platform.getAdapterManager().getAdapter(o,ISystemViewElementAdapter.class); - else + if (o instanceof IAdaptable) + { adapter = (ISystemViewElementAdapter)((IAdaptable)o).getAdapter(ISystemViewElementAdapter.class); + } + else + { + adapter = (ISystemViewElementAdapter)Platform.getAdapterManager().getAdapter(o,ISystemViewElementAdapter.class); + } if (adapter == null) - SystemBasePlugin.logWarning("ADAPTER IS NULL FOR ELEMENT OF TYPE: " + o.getClass().getName()); + { + if (!(o instanceof PendingUpdateAdapter)) + { + SystemBasePlugin.logWarning("ADAPTER IS NULL FOR ELEMENT OF TYPE: " + o.getClass().getName()); + } + } } if ((adapter!=null) && (viewer != null)) {