diff options
| author | William Chen | 2012-02-27 07:17:25 +0000 |
|---|---|---|
| committer | William Chen | 2012-02-27 07:17:52 +0000 |
| commit | 3f8a73f82fba08610ece56a15fa0507bc9f7f0f8 (patch) | |
| tree | 1d95142d5cc4720d187429860fd6d0187eb15cd2 /target_explorer | |
| parent | b4a40bd6cc20cd544103984e36a4940d7f3c50fd (diff) | |
| download | org.eclipse.tcf-3f8a73f82fba08610ece56a15fa0507bc9f7f0f8.tar.gz org.eclipse.tcf-3f8a73f82fba08610ece56a15fa0507bc9f7f0f8.tar.xz org.eclipse.tcf-3f8a73f82fba08610ece56a15fa0507bc9f7f0f8.zip | |
Target Explorer: Fix an NPE regression caused by refactoring.
Diffstat (limited to 'target_explorer')
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java index b4ce35058..ebd497f34 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java @@ -739,9 +739,12 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement * @return The filter descriptors of this viewer. */ public FilterDescriptor[] getFilterDescriptors() { - FilterDescriptor[] descriptors = new FilterDescriptor[filterDescriptors.length]; - System.arraycopy(filterDescriptors, 0, descriptors, 0, filterDescriptors.length); - return descriptors; + if (filterDescriptors != null) { + FilterDescriptor[] descriptors = new FilterDescriptor[filterDescriptors.length]; + System.arraycopy(filterDescriptors, 0, descriptors, 0, filterDescriptors.length); + return descriptors; + } + return null; } /** @@ -750,9 +753,12 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement * @return The current viewer columns. */ public ColumnDescriptor[] getViewerColumns() { - ColumnDescriptor[] columnDescriptors = new ColumnDescriptor[columns.length]; - System.arraycopy(columns, 0, columnDescriptors, 0, columns.length); - return columnDescriptors; + if (columns != null) { + ColumnDescriptor[] columnDescriptors = new ColumnDescriptor[columns.length]; + System.arraycopy(columns, 0, columnDescriptors, 0, columns.length); + return columnDescriptors; + } + return null; } /** |