From 24f1936b03a07d18c58fff2f6ec77b241197d818 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Mon, 21 Apr 2008 14:04:04 +0000 Subject: [PATCH] [fix] Usage of deprecated API IRSESystemTypeAdapter#isEnabled --- .../newconnection/RSENewConnectionWizardSelectionPage.java | 7 +------ .../registries/RSEWizardSelectionTreePatternFilter.java | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java index 5ede7bda0ca..ba1ad451c01 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardSelectionPage.java @@ -39,7 +39,6 @@ import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.ui.RSESystemTypeAdapter; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.wizards.registries.IRSEWizardCategory; import org.eclipse.rse.ui.wizards.registries.IRSEWizardRegistryElement; @@ -113,11 +112,7 @@ public class RSENewConnectionWizardSelectionPage extends WizardPage { } // 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; - } - + if (!systemType.isEnabled()) return false; } // In all other cases, the element passes the filter diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/RSEWizardSelectionTreePatternFilter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/RSEWizardSelectionTreePatternFilter.java index bde48fdbe76..cf79c36bb22 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/RSEWizardSelectionTreePatternFilter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/registries/RSEWizardSelectionTreePatternFilter.java @@ -17,7 +17,6 @@ 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; @@ -86,8 +85,7 @@ public class RSEWizardSelectionTreePatternFilter extends PatternFilter { 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; + if (!systemType.isEnabled()) return false; } return super.isElementVisible(viewer, element);