mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-31 12:13:34 +02:00
Code Issues Wiki Activity

[243263] NPE on expanding a filter - explicitly get the part in runnable since _part that was set is unreliable

Browse source
This commit is contained in:
David McKnight 2008-08-18 20:17:13 +00:00
parent 972a31ba0b
commit 651a27bf7d
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java
View file

@ -22,6 +22,7 @@
* David McKnight (IBM) - [239368] Expand to action ignores the filter string * David McKnight (IBM) - [239368] Expand to action ignores the filter string
* David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline * David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline
* David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate * David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate
* David McKnight (IBM) - [243263] NPE on expanding a filter
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.ui.operations; package org.eclipse.rse.ui.operations;
@ -57,8 +58,10 @@ import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.progress.IElementCollector; import org.eclipse.ui.progress.IElementCollector;
@ -300,21 +303,35 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
Object[] children = null; Object[] children = null;
// we first test to see if this is an expand-to filter in effect for this // we first test to see if this is an expand-to filter in effect for this
// object, and if so use it... // object, and if so use it...
if (_part instanceof SystemViewPart && _adapter instanceof ISystemRemoteElementAdapter) if (_adapter instanceof ISystemRemoteElementAdapter)
{ {
final SystemView viewer = ((SystemViewPart)_part).getSystemView();
class GetExpandToFilter implements Runnable class GetExpandToFilter implements Runnable
{ {
private String expandToFilter; private String expandToFilter = null;
public void run() public void run()
{ {
// fetching part here ourselves, because right now there's no guarantee that _part will be the correct one
if (_remoteObject instanceof IContextObject){ // see bug 244454 for details
expandToFilter = viewer.getExpandToFilter(((IContextObject)_remoteObject).getModelObject()); IWorkbenchPart activePart = null;
IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
if (win != null){
IWorkbenchPage page = win.getActivePage();
if (page != null){
activePart = page.getActivePart();
if (activePart != null){
_part = activePart;
}
}
} }
else {
expandToFilter = viewer.getExpandToFilter(_remoteObject); if (activePart instanceof SystemViewPart){
SystemView viewer = ((SystemViewPart)activePart).getSystemView();
if (_remoteObject instanceof IContextObject){
expandToFilter = viewer.getExpandToFilter(((IContextObject)_remoteObject).getModelObject());
}
else {
expandToFilter = viewer.getExpandToFilter(_remoteObject);
}
} }
} }