Index: src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java,v retrieving revision 1.3 diff -u -r1.3 ContributionItemService.java --- src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java 22 Sep 2005 17:08:24 -0000 1.3 +++ src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java 26 Sep 2005 16:39:15 -0000 @@ -17,6 +17,7 @@ import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.common.core.service.IProvider; import org.eclipse.gmf.runtime.common.core.service.Service; +import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin; import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ContributeToActionBarsOperation; import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ContributeToPopupMenuOperation; import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.DisposeContributionsOperation; @@ -104,10 +105,9 @@ } } - if (operation instanceof ContributeToActionBarsOperation) { + if (operation instanceof ContributeToActionBarsOperation) { ContributeToActionBarsOperation op = (ContributeToActionBarsOperation) operation; - return contributionDescriptor.hasContributionsFor( op.getWorkbenchPartDescriptor().getPartId(), op.getWorkbenchPartDescriptor().getPartClass()); @@ -126,7 +126,7 @@ } else if (operation instanceof DisposeContributionsOperation) { if (provider != null) return provider.provides(operation); - } + } return false; } @@ -173,13 +173,12 @@ && bundle.getState() == org.osgi.framework.Bundle.ACTIVE; } - } - /** + /** * The single instance of the contribution item service. */ - private static ContributionItemService instance = + private static final ContributionItemService instance = new ContributionItemService(); /** @@ -195,7 +194,8 @@ * Creates a new ContributionItemService instance. */ private ContributionItemService() { - /* private constructor */ + super(); + configureProviders(CommonUIServicesActionPlugin.getPluginId(), "contributionItemProviders"); //$NON-NLS-1$ } /* (non-Javadoc) @@ -230,7 +230,7 @@ IActionBars actionBars, IWorkbenchPartDescriptor workbenchPartDescriptor) { execute(new ContributeToActionBarsOperation(actionBars, - workbenchPartDescriptor)); + workbenchPartDescriptor)); } /* @@ -284,4 +284,4 @@ execute(ExecutionStrategy.REVERSE, operation); } -} + } Index: src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java,v retrieving revision 1.2 diff -u -r1.2 ActionFilterService.java --- src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java 12 Sep 2005 21:31:07 -0000 1.2 +++ src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java 26 Sep 2005 16:39:15 -0000 @@ -18,11 +18,6 @@ import java.util.Map; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; - import org.eclipse.gmf.runtime.common.core.command.CommandManager; import org.eclipse.gmf.runtime.common.core.command.CommandManagerChangeEvent; import org.eclipse.gmf.runtime.common.core.command.ICommandManagerChangeListener; @@ -39,6 +34,10 @@ import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionStatusCodes; import org.eclipse.gmf.runtime.common.ui.services.action.internal.filter.IActionFilterProvider; import org.eclipse.gmf.runtime.common.ui.services.action.internal.filter.TestAttributeOperation; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; /** * A service that provides action filters that can be used in evaluating action @@ -153,6 +152,10 @@ */ private final static ActionFilterService instance = new ActionFilterService(); + static { + instance.configureProviders(CommonUIServicesActionPlugin.getPluginId(), "actionFilterProviders"); //$NON-NLS-1$ + } + /** * The cached results (for optimization). * Index: src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java,v retrieving revision 1.2 diff -u -r1.2 GlobalActionHandlerService.java --- src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java 12 Sep 2005 21:31:07 -0000 1.2 +++ src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java 26 Sep 2005 16:39:15 -0000 @@ -18,7 +18,6 @@ import java.util.Vector; import org.eclipse.core.runtime.IConfigurationElement; - import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy; import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.common.core.service.Service; @@ -188,6 +187,10 @@ private final static GlobalActionHandlerService instance = new GlobalActionHandlerService(); + static { + instance.configureProviders(CommonUIServicesActionPlugin.getPluginId(), "globalActionHandlerProviders"); //$NON-NLS-1$ + } + /** * The GlobalActionHandlerService constructor */ Index: src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java,v retrieving revision 1.2 diff -u -r1.2 CommonUIServicesActionPlugin.java --- src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java 12 Sep 2005 21:31:06 -0000 1.2 +++ src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java 26 Sep 2005 16:39:15 -0000 @@ -11,13 +11,8 @@ package org.eclipse.gmf.runtime.common.ui.services.action.internal; -import org.eclipse.core.runtime.Platform; - import org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager; import org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin; -import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService; -import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService; -import org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerService; /** * The Action plugin for Common UI Services. @@ -26,21 +21,6 @@ extends XToolsUIPlugin { /** - * Extension point name for the action filter providers extension point. - */ - protected static final String ACTION_FILTER_PROVIDERS_EXT_P_NAME = "actionFilterProviders"; //$NON-NLS-1$ - - /** - * Extension point name for global action handler providers extension point. - */ - protected static final String GLOBAL_ACTION_HANDLER_PROVIDERS_EXT_P_NAME = "globalActionHandlerProviders"; //$NON-NLS-1$ - - /** - * Extension point name for the contribution item providers extension point. - */ - protected static final String CONTRIBUTION_ITEM_PROVIDERS_EXT_P_NAME = "contributionItemProviders"; //$NON-NLS-1$ - - /** * The singleton instance. */ private static CommonUIServicesActionPlugin _instance; @@ -55,17 +35,6 @@ /* * (non-Javadoc) * - * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#doStartup() - */ - protected void doStartup() { - configureActionFilterProviders(); - configureGlobalActionHandlerProviders(); - configureContributionItemProviders(); - } - - /* - * (non-Javadoc) - * * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#getResourceManager() */ public AbstractResourceManager getResourceManager() { @@ -87,39 +56,6 @@ * @return A non-empty string which is unique within the plug-in registry. */ public static String getPluginId() { - return getDefault().getBundle().getSymbolicName(); - } - - /** - * Configures action filter providers based on action filter provider - * extension configurations. - */ - private void configureActionFilterProviders() { - ActionFilterService.getInstance().configureProviders( - Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), - ACTION_FILTER_PROVIDERS_EXT_P_NAME).getConfigurationElements()); - } - - /** - * Configures global action handler providers based on global action handler - * provider extension configurations. - */ - private void configureGlobalActionHandlerProviders() { - GlobalActionHandlerService.getInstance().configureProviders( - Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), - GLOBAL_ACTION_HANDLER_PROVIDERS_EXT_P_NAME) - .getConfigurationElements()); - - } - - /** - * Configures marker navigation providers based on marker navigation - * provider extension configurations. - */ - private void configureContributionItemProviders() { - ContributionItemService.getInstance().configureProviders( - Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), - CONTRIBUTION_ITEM_PROVIDERS_EXT_P_NAME) - .getConfigurationElements()); + return getDefault().getSymbolicName(); } } \ No newline at end of file