mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-09 18:15:23 +02:00
Apply patch for bug 150955 - ADAPTER IS NULL warnings
This commit is contained in:
parent
4269bd09fa
commit
6bb6da14b2
1 changed files with 15 additions and 5 deletions
|
@ -44,6 +44,7 @@ import org.eclipse.swt.graphics.Image;
|
||||||
import org.eclipse.swt.widgets.Shell;
|
import org.eclipse.swt.widgets.Shell;
|
||||||
import org.eclipse.ui.model.IWorkbenchAdapter;
|
import org.eclipse.ui.model.IWorkbenchAdapter;
|
||||||
import org.eclipse.ui.progress.DeferredTreeContentManager;
|
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");
|
SystemBasePlugin.logWarning("ERROR: null passed to getAdapter in SystemViewLabelAndContentProvider");
|
||||||
}
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
if (!(o instanceof IAdaptable))
|
if (o instanceof IAdaptable)
|
||||||
adapter = (ISystemViewElementAdapter)Platform.getAdapterManager().getAdapter(o,ISystemViewElementAdapter.class);
|
{
|
||||||
else
|
|
||||||
adapter = (ISystemViewElementAdapter)((IAdaptable)o).getAdapter(ISystemViewElementAdapter.class);
|
adapter = (ISystemViewElementAdapter)((IAdaptable)o).getAdapter(ISystemViewElementAdapter.class);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
adapter = (ISystemViewElementAdapter)Platform.getAdapterManager().getAdapter(o,ISystemViewElementAdapter.class);
|
||||||
|
}
|
||||||
if (adapter == null)
|
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))
|
if ((adapter!=null) && (viewer != null))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue