mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[240646] Default signal type appears twice in SystemKillDialog's combo if the remote system doesn't support signal types

Browse source
This commit is contained in:
Radoslav Gerganov 2008-07-14 12:54:47 +00:00
parent 09fc8554a1
commit 6ff283b755
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/dialogs/SystemKillDialog.java
View file

@ -14,6 +14,7 @@
* Contributors:
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others
* Radoslav Gerganov (ProSyst) - [240646] Default signal type appears twice in SystemKillDialog's combo if the remote system doesn't support signal types
*******************************************************************************/
package org.eclipse.rse.internal.processes.ui.dialogs;
@ -214,7 +215,10 @@ public class SystemKillDialog extends SystemPromptDialog
}
}
);
cmbSignal.setItems(getSignalTypes());
String[] signalTypes = getSignalTypes();
if (signalTypes != null) {
cmbSignal.setItems(signalTypes);
}
cmbSignal.add(SystemProcessesResources.RESID_KILL_SIGNAL_TYPE_DEFAULT, 0);
cmbSignal.setText(cmbSignal.getItem(0));
signalType = cmbSignal.getText();
@ -225,16 +229,17 @@ public class SystemKillDialog extends SystemPromptDialog
/**
* @return all the possible signal types that can be sent to the selected processes
* on that system
* on that system or <code>null</code> if the remote system doesn't support any
* signal types
*/
private String[] getSignalTypes()
{
Object selObj = getInputObject();
String[] types = null;
if (selObj instanceof IStructuredSelection)
{
IStructuredSelection selection = (IStructuredSelection) selObj;
IRemoteProcess process = (IRemoteProcess) selection.getFirstElement();
String[] types = null;
try
{
types = process.getParentRemoteProcessSubSystem().getSignalTypes();
@ -242,12 +247,10 @@ public class SystemKillDialog extends SystemPromptDialog
catch (SystemMessageException e)
{
SystemBasePlugin.logMessage(e.getSystemMessage(), e);
return new String[] { SystemProcessesResources.RESID_KILL_SIGNAL_TYPE_DEFAULT };
return null;
}
if (types == null) types = new String[] { SystemProcessesResources.RESID_KILL_SIGNAL_TYPE_DEFAULT };
return types;
}
else return new String[] { SystemProcessesResources.RESID_KILL_SIGNAL_TYPE_DEFAULT };
return types;
}
private TableViewer createTableViewer(Composite parent, int nbrColumns)