mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-15 13:05:22 +02:00
[fix] bug 248685: new connection wizard does not check the default selection against the restricted system type list
This commit is contained in:
parent
d4f336f20b
commit
33a35a5cd2
1 changed files with 15 additions and 4 deletions
|
@ -230,11 +230,22 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
|
||||||
public void setSelection(ISelection selection) {
|
public void setSelection(ISelection selection) {
|
||||||
if (selection instanceof IStructuredSelection) {
|
if (selection instanceof IStructuredSelection) {
|
||||||
IStructuredSelection sel = (IStructuredSelection)selection;
|
IStructuredSelection sel = (IStructuredSelection)selection;
|
||||||
|
// Reset previous selected system type
|
||||||
|
selectedSystemType = null;
|
||||||
|
// Only if the first element of the selection is of type IRSESystemType,
|
||||||
|
// we re-new the selected system type from the selection
|
||||||
if (sel.getFirstElement() instanceof IRSESystemType) {
|
if (sel.getFirstElement() instanceof IRSESystemType) {
|
||||||
// update the selected system type.
|
// Get the system type candidate from the selection.
|
||||||
selectedSystemType = (IRSESystemType)((IStructuredSelection)selection).getFirstElement();
|
IRSESystemType candidate = (IRSESystemType)((IStructuredSelection)selection).getFirstElement();
|
||||||
} else {
|
// Accept only system types as selection which are enabled or if
|
||||||
selectedSystemType = null;
|
// the wizard has a restricted list of system types, is within the list
|
||||||
|
// of restricted system types
|
||||||
|
if (candidate.isEnabled() &&
|
||||||
|
(restrictedSystemTypes == null ||
|
||||||
|
restrictedSystemTypes.length == 0 ||
|
||||||
|
Arrays.asList(restrictedSystemTypes).contains(candidate))) {
|
||||||
|
selectedSystemType = candidate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// signal the system type change
|
// signal the system type change
|
||||||
|
|
Loading…
Add table
Reference in a new issue