From d74c0ce49bca03ed0af2423dae0e002611e921cd Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Wed, 30 May 2007 18:09:33 +0000 Subject: [PATCH] [189506] [api][breaking] Remove showActionBar(), showButtonBar() and showActions() from implementors of ISystemViewInputProvider. --- .../files/core/SystemFileAPIProviderImpl.java | 25 ---------------- .../ui/view/SystemAbstractAPIProvider.java | 30 ------------------- .../view/SystemEmptyListAPIProviderImpl.java | 26 ---------------- ...temResolveFilterStringAPIProviderImpl.java | 10 ------- ...stemSelectRemoteObjectAPIProviderImpl.java | 30 ------------------- ...SystemTestFilterStringAPIProviderImpl.java | 26 ---------------- .../SystemViewAPIProviderForConnections.java | 9 ------ .../SystemViewAPIProviderForFilterPools.java | 10 ------- ...SystemViewAPIProviderForFilterStrings.java | 10 ------- .../view/SystemViewAPIProviderForFilters.java | 10 ------- .../SystemViewAPIProviderForSubSystems.java | 10 ------- .../team/SystemTeamViewInputProvider.java | 25 ---------------- .../ui/internal/model/SystemRegistryUI.java | 27 ----------------- .../useractions/UserActionRegistry.java | 6 ---- 14 files changed, 254 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java index e8a694553b9..4c70fb61d52 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java @@ -95,31 +95,6 @@ public class SystemFileAPIProviderImpl { return sr.hasConnectionChildren(selectedConnection); } - - /** - * Return true to show the action bar (ie, toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - */ - public boolean showActionBar() - { - return true; - } - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typicall - * shown in dialogs that list only remote system objects. - */ - public boolean showButtonBar() - { - return false; - } - /** - * Return true to show right-click popup actions on objects in the tree. - */ - public boolean showActions() - { - return true; - } // ---------------------------------- diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java index c1deabd6411..956557bd13e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java @@ -104,36 +104,6 @@ public abstract class SystemAbstractAPIProvider return viewer; } - /** - * Return true to show the action bar (ie, toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - * We return false - */ - public boolean showActionBar() - { - return false; - } - - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typically - * shown in dialogs that list only remote system objects. - * We return false. - */ - public boolean showButtonBar() - { - return false; - } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return false. - */ - public boolean showActions() - { - return false; - } - private void initMsgObjects() { nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java index 788a8167ace..c161334bc06 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemEmptyListAPIProviderImpl.java @@ -76,32 +76,6 @@ public class SystemEmptyListAPIProviderImpl return false; } - /** - * Return true to show the action bar (ie, toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - */ - public boolean showActionBar() - { - return false; - } - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typicall - * shown in dialogs that list only remote system objects. - */ - public boolean showButtonBar() - { - return true; - } - /** - * Return true to show right-click popup actions on objects in the tree. - */ - public boolean showActions() - { - return false; - } - - // ---------------------------------- // OUR OWN METHODS... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java index ee27593a48c..a1b0c2b7f54 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemResolveFilterStringAPIProviderImpl.java @@ -36,15 +36,5 @@ public class SystemResolveFilterStringAPIProviderImpl extends SystemTestFilterSt super(subsystem, filterString); } // end constructor - - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typicall - * shown in dialogs that list only remote system objects. - */ - public boolean showButtonBar() - { - return false; - } // end showButtonBar() } // end class SystemResolveFilterStringAPIProviderImpl \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index b980c4186a9..4f251249c66 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -469,36 +469,6 @@ public class SystemSelectRemoteObjectAPIProviderImpl { return true; } - - /** - * Return true to show the action bar (ie, toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - * We return false. - */ - public boolean showActionBar() - { - return false; - } - - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typically - * shown in dialogs that list only remote system objects. - * We return false. - */ - public boolean showButtonBar() - { - return false; - } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } /** * Return true if we are listing connections or not, so we know whether we are interested in diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java index e0f44be28be..d8cb9f51708 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTestFilterStringAPIProviderImpl.java @@ -139,32 +139,6 @@ public class SystemTestFilterStringAPIProviderImpl return true; } - /** - * Return true to show the action bar (ie, toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - */ - public boolean showActionBar() - { - return false; - } - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typicall - * shown in dialogs that list only remote system objects. - */ - public boolean showButtonBar() - { - return true; - } - /** - * Return true to show right-click popup actions on objects in the tree. - */ - public boolean showActions() - { - return false; - } - - // ---------------------------------- // OUR OWN METHODS... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java index 2af4011f277..f3b9b1d59f6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForConnections.java @@ -95,13 +95,4 @@ public class SystemViewAPIProviderForConnections { return true; } - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java index eab0de999e0..a80324d4c90 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterPools.java @@ -115,14 +115,4 @@ public class SystemViewAPIProviderForFilterPools { return false; } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java index cfd56c01b35..c2d795beac5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java @@ -189,14 +189,4 @@ public class SystemViewAPIProviderForFilterStrings { return false; } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java index a7f23bf002c..4cd6e875b67 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java @@ -251,14 +251,4 @@ public class SystemViewAPIProviderForFilters { return false; } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java index 55df5570a1a..be6fddb9633 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForSubSystems.java @@ -94,14 +94,4 @@ public class SystemViewAPIProviderForSubSystems { return false; } - - /** - * Return true to show right-click popup actions on objects in the tree. - * We return true. - */ - public boolean showActions() - { - return true; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java index 248105b97cc..ab8ca2699a1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewInputProvider.java @@ -141,29 +141,4 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput { return viewer; } - - /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#showActionBar() - */ - public boolean showActionBar() - { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#showButtonBar() - */ - public boolean showButtonBar() - { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#showActions() - */ - public boolean showActions() - { - return false; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java index 2d43656dca5..203323115da 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java @@ -261,33 +261,6 @@ public class SystemRegistryUI implements ISystemRegistryUI, ISystemViewInputProv return null; } - /** - * Return true to show the action bar (i.e., toolbar) above the viewer. - * The action bar contains connection actions, predominantly. - */ - public boolean showActionBar() - { - return true; - } - - /** - * Return true to show the button bar above the viewer. - * The tool bar contains "Get List" and "Refresh" buttons and is typically - * shown in dialogs that list only remote system objects. - */ - public boolean showButtonBar() - { - return false; - } - - /** - * Return true to show right-click popup actions on objects in the tree. - */ - public boolean showActions() - { - return true; - } - /* * (non-Javadoc) * @see org.eclipse.rse.ui.view.ISystemViewInputProvider#setViewer(org.eclipse.jface.viewers.Viewer) diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionRegistry.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionRegistry.java index 7cadf6cd6a5..631cd5144b0 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionRegistry.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionRegistry.java @@ -113,7 +113,6 @@ public class UserActionRegistry { * @return true if the user action context exists, false otherwise. */ public boolean containsUserActionContext(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionContext context) { - Map map = getUserActionContextMap(profile); List list = getUserActionContexts(map, configuration); return list.contains(context); @@ -127,7 +126,6 @@ public class UserActionRegistry { * @return true if the user action context exists, false otherwise. */ public boolean containsUserActionModel(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionContext context) { - Map map = getUserActionModelMap(profile); List list = getUserActionModels(map, configuration); return list.contains(context); @@ -140,7 +138,6 @@ public class UserActionRegistry { * @param context the user action context. */ public void addUserActionContext(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionContext context) { - Map map = getUserActionContextMap(profile); List list = getUserActionContexts(map, configuration); list.add(context); @@ -153,7 +150,6 @@ public class UserActionRegistry { * @param model the user action model. */ public void addUserActionModel(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionModel model) { - Map map = getUserActionModelMap(profile); List list = getUserActionModels(map, configuration); list.add(model); @@ -166,7 +162,6 @@ public class UserActionRegistry { * @param context the user action context. */ public void removeUserActionContext(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionContext context) { - Map map = getUserActionContextMap(profile); List list = getUserActionContexts(map, configuration); list.remove(context); @@ -179,7 +174,6 @@ public class UserActionRegistry { * @param model the user action model. */ public void removeUserActionModel(ISystemProfile profile, ISubSystemConfiguration configuration, IUserActionModel model) { - Map map = getUserActionModelMap(profile); List list = getUserActionModels(map, configuration); list.remove(model);