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

[289533] NPE on "Show in Table"

Browse source
This commit is contained in:
Martin Oberhuber 2009-09-15 21:44:07 +00:00
parent 43af27a74a
commit 8c14762da2
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -23,6 +23,7 @@
* Martin Oberhuber (Wind River) - [227516] [regression] Fix ArrayIndexOutOfBoundsException in TableView * Martin Oberhuber (Wind River) - [227516] [regression] Fix ArrayIndexOutOfBoundsException in TableView
* David McKnight (IBM) - [187058] Incorrect Right Click Menu in Remote System Details View with no selection * David McKnight (IBM) - [187058] Incorrect Right Click Menu in Remote System Details View with no selection
* David McKnight (IBM) - [260346] RSE view for jobs does not remember resized columns * David McKnight (IBM) - [260346] RSE view for jobs does not remember resized columns
* Martin Oberhuber (Wind River) - [289533] NPE on "Show in Table"
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.view; package org.eclipse.rse.ui.view;
@ -307,11 +308,11 @@ public class SystemTableView
private static final int LEFT_BUTTON = 1; private static final int LEFT_BUTTON = 1;
private int mouseButtonPressed = LEFT_BUTTON; private int mouseButtonPressed = LEFT_BUTTON;
// for bug 260346 - to maintain list of cached column widths // for bug 260346 - to maintain list of cached column widths
private Map _cachedColumnWidths; private Map _cachedColumnWidths;
/** /**
* Constructor for the table view * Constructor for the table view
* *
@ -372,7 +373,7 @@ public class SystemTableView
_upI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_ARROW_UP_ID); _upI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_ARROW_UP_ID);
_downI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_ARROW_DOWN_ID); _downI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_ARROW_DOWN_ID);
_cachedColumnWidths = new HashMap(); _cachedColumnWidths = new HashMap();
} }
@ -438,18 +439,20 @@ public class SystemTableView
if (newObject instanceof IAdaptable) if (newObject instanceof IAdaptable)
{ {
getTable().setVisible(true); getTable().setVisible(true);
// columns may change so we want to keep track of the current ones // columns may change so we want to keep track of the current ones
int[] lastWidths = getCurrentColumnWidths(); int[] lastWidths = getCurrentColumnWidths();
if (lastWidths.length > 0){ if (lastWidths.length > 0){
ISystemViewElementAdapter contentsAdapter = getAdapterForContents(); ISystemViewElementAdapter contentsAdapter = getAdapterForContents();
if (contentsAdapter != null) {
String adapterName = contentsAdapter.getClass().getName(); // no use caching anything when there were no children
String adapterName = contentsAdapter.getClass().getName();
// associate the last contents adapter with the last widths
_cachedColumnWidths.put(adapterName, lastWidths); // associate the last contents adapter with the last widths
_cachedColumnWidths.put(adapterName, lastWidths);
}
} }
_objectInput = newObject; _objectInput = newObject;
computeLayout(); computeLayout();
@ -784,7 +787,7 @@ public class SystemTableView
ISystemViewElementAdapter adapter = getAdapterForContents(); ISystemViewElementAdapter adapter = getAdapterForContents();
String adapterName = adapter.getClass().getName(); String adapterName = adapter.getClass().getName();
int[] cachedWidths = (int[])_cachedColumnWidths.get(adapterName); int[] cachedWidths = (int[])_cachedColumnWidths.get(adapterName);
// if there are already cached widths, use them // if there are already cached widths, use them
if (cachedWidths != null){ if (cachedWidths != null){
setCurrentColumnWidths(cachedWidths); setCurrentColumnWidths(cachedWidths);
@ -1334,7 +1337,7 @@ public class SystemTableView
} }
table.dispose(); table.dispose();
} }
} }
/* /*
@ -2117,9 +2120,9 @@ public class SystemTableView
/** /**
* Returns the column widths associated with this view. * Returns the column widths associated with this view.
* *
* @return the map of column widths associated with this view * @return the map of column widths associated with this view
* *
* @since 3.1 * @since 3.1
*/ */
public Map getCachedColumnWidths() public Map getCachedColumnWidths()
@ -2129,14 +2132,14 @@ public class SystemTableView
/** /**
* Sets the map of column widths associated with this view * Sets the map of column widths associated with this view
* *
* @param cachedColumnWidths the column widths map * @param cachedColumnWidths the column widths map
* *
* @since 3.1 * @since 3.1
*/ */
public void setCachedColumnWidths(Map cachedColumnWidths) public void setCachedColumnWidths(Map cachedColumnWidths)
{ {
_cachedColumnWidths = cachedColumnWidths; _cachedColumnWidths = cachedColumnWidths;
} }
} }