mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-15 21:15:23 +02:00
[243263] NPE on expanding a filter
This commit is contained in:
parent
7d087961a7
commit
010cdc73c0
1 changed files with 12 additions and 4 deletions
|
@ -13,6 +13,7 @@
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
|
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
|
||||||
* Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
|
* Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
|
||||||
|
* David McKnight (IBM) - [243263] NPE on expanding a filter
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.ui;
|
package org.eclipse.rse.ui;
|
||||||
|
@ -115,14 +116,21 @@ public abstract class SystemBasePlugin extends AbstractUIPlugin
|
||||||
// otherwise, get a list of all the windows, and simply return the first one
|
// otherwise, get a list of all the windows, and simply return the first one
|
||||||
// KM: why do we need this??
|
// KM: why do we need this??
|
||||||
else {
|
else {
|
||||||
IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
|
final IWorkbench workbench = wb;
|
||||||
|
|
||||||
if (windows != null && windows.length > 0) {
|
// do this in a runnable so we can get the right window on the main thread
|
||||||
return windows[0];
|
class GetActiveWindow implements Runnable {
|
||||||
|
public IWorkbenchWindow _activeWindow = null;
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
_activeWindow = workbench.getActiveWorkbenchWindow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
GetActiveWindow runnable = new GetActiveWindow();
|
||||||
|
wb.getDisplay().syncExec(runnable);
|
||||||
|
return runnable._activeWindow;
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Add table
Reference in a new issue