diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html index ece65bb8463..ba3376b6cba 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html @@ -74,10 +74,6 @@ Here are the extension points that are defined by the RSE: users select the Properties action from the pop-up menu of remote objects listed in the Remote Systems view. - - org.eclipse.rse.ui.remoteSystemsViewPreferencesActions - For contributing a fastpath action to jump to your preferences page, from the local pulldown menu of the Remote Systems view. -
  • org.eclipse.rse.ui.mountPathMappers
  • org.eclipse.rse.ui.newConnectionWizards
    • -
  • org.eclipse.rse.ui.remoteSystemsViewPreferencesActions
    • diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml index 07e52921ad7..840400ee6ec 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml +++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml @@ -17,7 +17,6 @@ --> - diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java index 654762bdebc..4d514052d69 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java @@ -12,6 +12,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [181066] NLS missing messages with DAEMON and Shells + * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point ********************************************************************************/ package org.eclipse.rse.internal.ui; @@ -913,6 +914,9 @@ public class SystemResources extends NLS public static String ACTION_PREFERENCE_SHOW_FILTERPOOLS_LABEL; public static String ACTION_PREFERENCE_SHOW_FILTERPOOLS_TOOLTIP; + public static String ACTION_SHOW_PREFERENCEPAGE_LABEL; + public static String ACTION_SHOW_PREFERENCEPAGE_TOOLTIP; + public static String ACTION_NEWCONN_LABEL; public static String ACTION_NEWCONN_TOOLTIP; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties index 069b3ccef7c..f0589ca46ed 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2000, 2007 IBM Corporation. All rights reserved. +# Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved. # This program and the accompanying materials are made available under the terms # of the Eclipse Public License v1.0 which accompanies this distribution, and is # available at http://www.eclipse.org/legal/epl-v10.html @@ -11,7 +11,7 @@ # Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. # # Contributors: -# {Name} (company) - description of contribution. +# Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point ################################################################################ # NLS_MESSAGEFORMAT_VAR @@ -812,6 +812,9 @@ ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP=If selected, the tree is re-expanded to ACTION_PREFERENCE_SHOW_FILTERPOOLS_LABEL=Show Filter Pools ACTION_PREFERENCE_SHOW_FILTERPOOLS_TOOLTIP=Show filter pools when expanding subsystems +ACTION_SHOW_PREFERENCEPAGE_LABEL=Remote Systems... +ACTION_SHOW_PREFERENCEPAGE_TOOLTIP=Go to the Remote Systems primary preferences page + ACTION_NEWCONN_LABEL=New Connection... ACTION_NEWCONN_TOOLTIP=Define a connection to remote system diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java index 16a43c9dbcc..a6ded9f2815 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point ********************************************************************************/ package org.eclipse.rse.internal.ui.actions; @@ -36,9 +36,8 @@ import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog; * preference page (it will include its children underneath), including the * child pages registered under that page ("category"). *

    - * This is used by the org.eclipse.rse.core.remoteSystemsViewPreferencesActions - * extension point. - * @see org.eclipse.rse.ui.actions.SystemCascadingPreferencesAction + * @deprecated this will be moved to use the command/handler extension point. + * @see SystemCascadingPreferencesAction */ public class SystemShowPreferencesPageAction extends SystemBaseAction implements IViewActionDelegate { @@ -48,8 +47,9 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements private String preferencePageCategory; /** - * Constructor. We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()} - * for each extension of our extension point org.eclipse.rse.core.remoteSystemsViewPreferencesActions + * Constructor. + * We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()} + * for each menu shortcut to show a particular preference page. */ public SystemShowPreferencesPageAction() { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index a43d23a771c..bbd6d4acb8f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - Replace SystemRegistry by ISystemRegistry * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -726,8 +727,8 @@ public class SystemViewPart menuMgr.add(showFilterPoolsAction); menuMgr.add(restoreStateAction); // d51541 - // Now query our remoteSystemsViewPreferencesActions for extenders who wish to appear in the - // preferences cascading menu... + // Now display any contributed action shortcuts for bringing up + // a particular preference page... SystemCascadingPreferencesAction preferencesAction = new SystemCascadingPreferencesAction(shell); menuMgr.add(preferencesAction.getSubMenu()); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index 044db0d586b..32dcc8a939e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -20,6 +20,7 @@ * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core + * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point ********************************************************************************/ package org.eclipse.rse.ui; @@ -694,86 +695,28 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi return getDefault().isSystemRegistryActive(); } - - /** - * Return all elements that extend the org.eclipse.rse.ui.remoteSystemsViewPreferencesActions extension point - */ - private IConfigurationElement[] getPreferencePageActionPlugins() - { - // Get reference to the plug-in registry - IExtensionRegistry registry = Platform.getExtensionRegistry(); - // Get configured extenders - IConfigurationElement[] prefPageExtensions = - registry.getConfigurationElementsFor(PLUGIN_ID,"remoteSystemsViewPreferencesActions"); //$NON-NLS-1$ - - return prefPageExtensions; - } - - /** - * Return an array of action objects registered via our org.eclipse.rse.ui.remoteSystemsViewPreferencesActions - * extension point.
    - * This may return null if there are no extenders. + * Return an array of action objects to show for the "Preferences..." + * submenu of the RSE System View. + * For contributing a fastpath action to jump to your preferences page, + * from the local pulldown menu of the Remote Systems view. + * This may return null if no such actions are registered. + * @deprecated will be moved to using command/hander extension point */ public SystemShowPreferencesPageAction[] getShowPreferencePageActions() { if (showPrefPageActions == null) { - IConfigurationElement[] showPrefPagePlugins = getPreferencePageActionPlugins(); - if (showPrefPagePlugins != null) - { - Vector v = new Vector(); - for (int idx=0; idx0)) - { - action.setPreferencePageID(prefPageId); - } - String prefPageCategory = showPrefPagePlugins[idx].getAttribute("preferencePageCategory"); //$NON-NLS-1$ - if ((prefPageCategory!=null)&&(prefPageCategory.length()>0)) - { - action.setPreferencePageCategory(prefPageCategory); - } - String iconFile = showPrefPagePlugins[idx].getAttribute("icon"); //$NON-NLS-1$ - - if ((iconFile!=null)&&(iconFile.length()>0)) - { - // get namespace of extension (i.e. the id of the declaring plugin) - String nameSpace = showPrefPagePlugins[idx].getDeclaringExtension().getNamespaceIdentifier(); - - // now get the associated bundle - Bundle bundle = Platform.getBundle(nameSpace); - - ImageDescriptor id = getPluginImage(bundle, iconFile); - - if (id != null) { - action.setImageDescriptor(id); - } - } - String label = showPrefPagePlugins[idx].getAttribute("label"); //$NON-NLS-1$ - if ((label!=null)&&(label.length()>0)) - { - action.setText(label); - } - String tooltip = showPrefPagePlugins[idx].getAttribute("tooltip"); //$NON-NLS-1$ - if ((tooltip!=null)&&(tooltip.length()>0)) - { - action.setToolTipText(tooltip); - } - String heldId = showPrefPagePlugins[idx].getAttribute("helpContextId"); //$NON-NLS-1$ - if ((heldId!=null)&&(heldId.length()>0)) - { - action.setHelp(heldId); - } - v.addElement(action); - } // end for all plugins loop - showPrefPageActions = new SystemShowPreferencesPageAction[v.size()]; - for (int idx=0; idx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -301,15 +264,19 @@ Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to + diff --git a/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesActions.exsd b/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesActions.exsd deleted file mode 100644 index 04384479a60..00000000000 --- a/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesActions.exsd +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - This extension point is for contributing an action to the Remote Systems view pulldown menu, to the Preferences cascading menu. This action will launch the Preferences dialog, scoped to the particular page you specify. This will automatically show any child pages as well. This point is easy to extend, no coding required. Just name the preference page by its id from the preferencePages extension that defined the page. Also, if it is not a root page, then you must also name the root page (such as when using Windows-&gt;Preference) by its id from its preferencePages extension. - -This would be used by anyone who extends the Remote System Explorer, and offers preference pages for their users, and wants a shortcut to those preference pages for convenience. - - - - - - - (no description available) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (no description available) - - - - - - - A unique identifier for this extension. - - - - - - - The display name for the action, shown in the menu. Include any mnenomnic if desired. - - - - - - - This matches the "id" attribute on the preferencePages extension, for the preference page you wish to show in the Preference Dialog for this action. If the preference page is a root (no "category" attribute in its preferencePages extension), this is all you need. Else, you also need to specify the preferencePageCategory attribute. - -Note this page will be shown as the root in the Preferences dialog, but it can be expanded to see its child nodes. - - - - - - - This is required if the preference page you wish to show is not a root page, which means if it has a "category" attribute in its preferencePage extension definition. If so, here you give the "id" value of the preference page's root page... not its immediate parent! Be careful. We need to know the id of the root page so we know which root to recursively search the children of to find the page you specified in the preferencePageId attribute. - - - - - - - A relative path to an icon that will be displayed in the menu, with the label. Optional - - - - - - - - - - A description of the action, for display on the status line, although it doesn't seem to work just yet. Optional - - - - - - - The id of help to be shown when F1 is pressed while this action is selected. Optional - - - - - - - - - - - - <extension point="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions"> - <action - id="org.eclipse.rse.ui.preferences.actions.rse" - label="%PreferencePageAction.rse.label" - preferencePageId="org.eclipse.rse.ui.ui.preferences.RemoteSystemsPreferencePage" - tooltip="%PreferencePageAction.rse.tooltip" - helpContextId="org.eclipse.rse.ui.aprefrse" - /> -</extension> - -<extension point="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions"> - <action - id="com.acme.tools.core.preferences.rse" - label="%PreferencePageAction.rse.label" - preferencePageId="com.acme.tools.core.ui.preferences.PreferencePage" - preferencePageCategory="org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage" - tooltip="%PreferencePageAction.rse.tooltip" - helpContextId="com.acme.tools.core.aprefrse" - /> - <action - id="com.acme.tools.core.preferences.editor" - label="%PreferencePageAction.editor.label" - preferencePageId="com.acme.tools.editor.preferences.EditorGeneralPreferencePage" - preferencePageCategory="org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage" - tooltip="%PreferencePageAction.editor.tooltip" - helpContextId="com.acme.tools.core.helpcontext01" - /> - <action - id="com.acme.tools.core.preferences.cache" - label="%PreferencePageAction.cache.label" - preferencePageId="com.acme.tools.core.ui.preferences.CachingPreferencePage" - preferencePageCategory="org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage" - tooltip="%PreferencePageAction.caching.tooltip" - helpContextId="com.acme.tools.core.helpcontext02" - /> -</extension> - - - - - - - - - Since no coding is required, there is no API information. - - - - - - - - - This extension point is used by the <code>org.eclipse.rse.ui.actions.SystemCascadingPreferencesAction</code> class, which in turn creates a <code>org.eclipse.rse.ui.actions.SystemShowPreferencesPageAction</code> object for each extension of this point. These are used to populate the Preferences cascading menu of the Remote Systems view pulldown, but could be used elsewhere too, if desired. - - - - - - - - - Copyright (c) 2002, 2006 IBM Corporation. All Rights Reserved. -This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, and is -available at http://www.eclipse.org/legal/epl-v10.html - -Contributors: -IBM Corporation - initial API and implementation - - - -