mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

[209193] RSE new connection wizard shows empty categories if typing something into the filter

Browse source
This commit is contained in:
Uwe Stieber 2007-11-08 15:10:56 +00:00
parent 284e3a3296
commit 42c7806c32
2 changed files with 77 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java
View file

@ -8,6 +8,7 @@
* Contributors:
* Uwe Stieber (Wind River) - initial API and implementation.
* Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
* Uwe Stieber (Wind River) - [209193] RSE new connection wizard shows empty categories if typing something into the filter
*******************************************************************************/
package org.eclipse.rse.ui.wizards.newconnection;
@ -181,7 +182,7 @@ public class RSENewConnectionWizardSelectionPage extends WizardPage {
*
* @return The list of system types the page is restricted to or <code>null</code>.
*/
protected IRSESystemType[] getRestrictToSystemTypes() {
public IRSESystemType[] getRestrictToSystemTypes() {
return restrictedSystemTypes;
}

75
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/RSEWizardSelectionTreePatternFilter.java
View file

@ -7,16 +7,91 @@
*
* Contributors:
* Uwe Stieber (Wind River) - initial API and implementation.
* Uwe Stieber (Wind River) - [209193] RSE new connection wizard shows empty categories if typing something into the filter
*******************************************************************************/
package org.eclipse.rse.ui.wizards.registries;
import java.util.Arrays;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.ui.RSESystemTypeAdapter;
import org.eclipse.rse.ui.wizards.newconnection.RSENewConnectionWizardSelectionPage;
import org.eclipse.rse.ui.wizards.newconnection.RSENewConnectionWizardSelectionTreeElement;
import org.eclipse.ui.dialogs.PatternFilter;
/**
* Standard RSE wizard selection tree pattern filter.
*/
public class RSEWizardSelectionTreePatternFilter extends PatternFilter {
private final WizardPage parentPage;
/**
* Constructor.<br>
* Creates a new pattern filter instance which is not associated
* with a parent wizard page.
*/
public RSEWizardSelectionTreePatternFilter() {
this(null);
}
/**
* Constructor.<br>
* Creates a new pattern filter instance with the passed in
* wizard page associated as parent.
*
* @param page The parent wizard page or <code>null</code>.
*/
public RSEWizardSelectionTreePatternFilter(WizardPage page) {
parentPage = page;
}
/**
* Returns the associated parent wizard parent.
*
* @return The parent wizard page or <code>null</code> if none.
*/
protected WizardPage getParentWizardPage() {
return parentPage;
}
/* (non-Javadoc)
* @see org.eclipse.ui.dialogs.PatternFilter#isElementVisible(org.eclipse.jface.viewers.Viewer, java.lang.Object)
*/
public boolean isElementVisible(Viewer viewer, Object element) {
// If the element is a new connection wizard selection tree element,
// we have to check if the associated system type is enabled and/or
// if the system type itself may filter it out from the visible elements.
if (element instanceof RSENewConnectionWizardSelectionTreeElement) {
// A system type must be associated with such tree element, otherwise it is filtered out
IRSESystemType systemType = ((RSENewConnectionWizardSelectionTreeElement)element).getSystemType();
if (systemType == null) return false;
// if the page is restricted to a set of system types, check on them first
WizardPage wizardPage = getParentWizardPage();
if (wizardPage instanceof RSENewConnectionWizardSelectionPage) {
IRSESystemType[] restricted = ((RSENewConnectionWizardSelectionPage)wizardPage).getRestrictToSystemTypes();
if (restricted != null && restricted.length > 0) {
if (!Arrays.asList(restricted).contains(systemType)) return false;
}
}
// First, adapt the system type to a viewer filter and pass on the select request
// to the viewer filter adapter if available
ViewerFilter filter = (ViewerFilter)(systemType.getAdapter(ViewerFilter.class));
// We don't know what the parent of the passed in element is.
// So, we can pass on only null here.
if (filter != null && !filter.select(viewer, null, element)) return false;
// Second, double check if the system type passed the viewer filter but is disabled.
RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(systemType.getAdapter(RSESystemTypeAdapter.class));
if (adapter != null && !adapter.isEnabled(systemType)) return false;
}
return super.isElementVisible(viewer, element);
}
/* (non-Javadoc)
* @see org.eclipse.ui.dialogs.PatternFilter#isElementSelectable(java.lang.Object)