mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

[166605] fix for null pointer scenario when getting text from non-existant result

Browse source
This commit is contained in:
David McKnight 2006-12-05 21:44:00 +00:00
parent a88fe3e775
commit fae33894df
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java
View file

@ -24,9 +24,9 @@ import java.util.Hashtable;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILabelProviderListener;
@ -196,7 +196,7 @@ public class SystemTableTreeViewProvider implements ILabelProvider, ITableLabelP
if (adapter != null && adapter.hasChildren(object)) if (adapter.hasChildren(object))
{ {
if (supportsDeferredQueries()) if (supportsDeferredQueries())
{ {
@ -217,7 +217,7 @@ public class SystemTableTreeViewProvider implements ILabelProvider, ITableLabelP
{ {
results = adapter.getChildren(object); results = adapter.getChildren(object);
} }
if (adapter instanceof SystemViewRootInputAdapter) if (adapter instanceof SystemViewRootInputAdapter && results != null)
{ {
ArrayList filterredResults = new ArrayList(); ArrayList filterredResults = new ArrayList();
for (int i = 0; i < results.length; i++) for (int i = 0; i < results.length; i++)
@ -263,10 +263,17 @@ public class SystemTableTreeViewProvider implements ILabelProvider, ITableLabelP
} }
return wadapter.getLabel(object); return wadapter.getLabel(object);
} }
int len = result.length(); if (result != null)
if (len > _maxCharsInColumnZero)
{ {
_maxCharsInColumnZero = len; int len = result.length();
if (len > _maxCharsInColumnZero)
{
_maxCharsInColumnZero = len;
}
}
else
{
result = ""; //$NON-NLS-1$
} }
return result; return result;
} }