mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 12:35:22 +02:00
Code Issues Wiki Activity

[294398] [shells] SystemCommandsViewPart always assumes systemResourceChanged() called on Display thread

Browse source
This commit is contained in:
David McKnight 2009-11-06 12:42:35 +00:00
parent d71444b0c9
commit e219f9fc00
1 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/SystemCommandsViewPart.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved. * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -19,6 +19,7 @@
* David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work * David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work
* Kevin Doyle (IBM) - [198534] Shell Menu Enablement Issue's * Kevin Doyle (IBM) - [198534] Shell Menu Enablement Issue's
* Radoslav Gerganov (ProSyst) - [181563] Fix hardcoded Ctrl+Space for remote shell content assist * Radoslav Gerganov (ProSyst) - [181563] Fix hardcoded Ctrl+Space for remote shell content assist
* David McKnight (IBM) - [294398] [shells] SystemCommandsViewPart always assumes systemResourceChanged() called on Display thread
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.shells.ui.view; package org.eclipse.rse.internal.shells.ui.view;
@ -749,6 +750,7 @@ public class SystemCommandsViewPart
} }
public void systemResourceChanged(ISystemResourceChangeEvent event) public void systemResourceChanged(ISystemResourceChangeEvent event)
{ {
if (event.getType() == ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_FINISHED) if (event.getType() == ISystemResourceChangeEvents.EVENT_COMMAND_SHELL_FINISHED)
@ -762,9 +764,21 @@ public class SystemCommandsViewPart
else if (source instanceof IRemoteCommandShell) else if (source instanceof IRemoteCommandShell)
{ {
// find out if we're listening to this // find out if we're listening to this
if (Display.getCurrent() != null){
updateOutput((IRemoteCommandShell) source, false);
updateActionStates();
}
else {
final IRemoteCommandShell fsource = (IRemoteCommandShell)source;
Display.getDefault().asyncExec(new Runnable() {
public void run() {
updateOutput((IRemoteCommandShell) fsource, false);
updateActionStates();
}
});
}
updateOutput((IRemoteCommandShell) source, false);
updateActionStates();
} }
} }
@ -773,9 +787,21 @@ public class SystemCommandsViewPart
Object source = event.getSource(); Object source = event.getSource();
if (source instanceof IRemoteCommandShell) if (source instanceof IRemoteCommandShell)
{ {
updateOutput((IRemoteCommandShell) source, false); if (Display.getCurrent() != null){
_folder.remove(source); updateOutput((IRemoteCommandShell) source, false);
updateActionStates(); _folder.remove(source);
updateActionStates();
}
else {
final IRemoteCommandShell fsource = (IRemoteCommandShell)source;
Display.getDefault().asyncExec(new Runnable() {
public void run() {
updateOutput(fsource, false);
_folder.remove(fsource);
updateActionStates();
}
});
}
} }
} }
else if (event.getType() == ISystemResourceChangeEvents.EVENT_REFRESH) else if (event.getType() == ISystemResourceChangeEvents.EVENT_REFRESH)
@ -783,7 +809,19 @@ public class SystemCommandsViewPart
Object parent = event.getParent(); Object parent = event.getParent();
if (parent instanceof IRemoteCommandShell) if (parent instanceof IRemoteCommandShell)
{ {
updateOutput((IRemoteCommandShell) parent, false); if (Display.getCurrent() != null){
updateOutput((IRemoteCommandShell) parent, false);
updateActionStates();
}
else {
final IRemoteCommandShell fsource = (IRemoteCommandShell)parent;
Display.getDefault().asyncExec(new Runnable() {
public void run() {
updateOutput(fsource, false);
updateActionStates();
}
});
}
} }
} }
else if (event.getType() == ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE) else if (event.getType() == ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE)
@ -824,6 +862,7 @@ public class SystemCommandsViewPart
} }
} }
public void widgetDefaultSelected(SelectionEvent e) public void widgetDefaultSelected(SelectionEvent e)
{ {
widgetSelected(e); widgetSelected(e);