Index: ui/src/org/tigris/subversion/subclipse/ui/actions/CopyAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/CopyAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/CopyAction.java (working copy) @@ -110,10 +110,5 @@ { return ISVNUIConstants.IMG_MENU_COPY; } - - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.copy"; //$NON-NLS-1$ - } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/SynchronizeAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/SynchronizeAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/SynchronizeAction.java (working copy) @@ -59,9 +59,4 @@ return ISVNUIConstants.IMG_MENU_SYNC; } - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.synchronize"; //$NON-NLS-1$ - } - } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/CheckoutWizardAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/CheckoutWizardAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/CheckoutWizardAction.java (working copy) @@ -49,8 +49,4 @@ return true; } - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.checkout"; //$NON-NLS-1$ - } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/AddAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/AddAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/AddAction.java (working copy) @@ -136,9 +136,4 @@ return ISVNUIConstants.IMG_MENU_ADD; } - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.add"; //$NON-NLS-1$ - } - } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/WorkbenchWindowAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/WorkbenchWindowAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/WorkbenchWindowAction.java (working copy) @@ -10,61 +10,19 @@ ******************************************************************************/ package org.tigris.subversion.subclipse.ui.actions; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.CoolBarManager; -import org.eclipse.jface.action.IContributionItem; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.internal.provisional.action.IToolBarContributionItem; -import org.eclipse.jface.window.ApplicationWindow; -import org.eclipse.swt.widgets.CoolItem; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; -import org.tigris.subversion.subclipse.ui.SVNUIPlugin; /** * Helper class for actions that are displayed in a toolbar */ public abstract class WorkbenchWindowAction extends WorkspaceAction implements IWorkbenchWindowActionDelegate { - protected abstract String getMenuId(); - /* * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow) */ public void init(IWorkbenchWindow workbenchWindow) { setIcon(); - - ApplicationWindow window = (ApplicationWindow)workbenchWindow; - - CoolBarManager coolBarmgr = (CoolBarManager)window.getCoolBarManager(); - CoolItem[] items = coolBarmgr.getControl().getItems(); - - for (int i = 0; i < items.length; ++i) - { - IContributionItem contribItem = (IContributionItem) items[i].getData(); - if (!"org.tigris.subversion.subclipse.actionSet".equals(contribItem.getId())) //$NON-NLS-1$ - continue; - - IToolBarContributionItem toolBarContribItem = (IToolBarContributionItem)contribItem; - - IToolBarManager toolBarMgr = toolBarContribItem.getToolBarManager(); - IContributionItem updateItem = toolBarMgr.find(getMenuId()); - - if (updateItem == null) - { - SVNUIPlugin.log(IStatus.ERROR, "updateItem == null", null); - break; - } - - if (getAction().getImageDescriptor() == null) - updateItem.setVisible(false); - else - updateItem.setVisible(true); - toolBarMgr.update(true); - coolBarmgr.update(true); - - break; - } } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/IgnoreAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/IgnoreAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/IgnoreAction.java (working copy) @@ -78,10 +78,5 @@ { return ISVNUIConstants.IMG_MENU_IGNORE; } - - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.ignore"; //$NON-NLS-1$ - } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/UpdateAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/UpdateAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/UpdateAction.java (working copy) @@ -55,10 +55,5 @@ { return ISVNUIConstants.IMG_MENU_UPDATE; } - - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.update"; //$NON-NLS-1$ - } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/CommitAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/CommitAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/CommitAction.java (working copy) @@ -368,10 +368,5 @@ { return ISVNUIConstants.IMG_MENU_COMMIT; } - - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.commit"; //$NON-NLS-1$ - } } Index: ui/src/org/tigris/subversion/subclipse/ui/actions/RevertAction.java =================================================================== --- ui/src/org/tigris/subversion/subclipse/ui/actions/RevertAction.java (revision 2805) +++ ui/src/org/tigris/subversion/subclipse/ui/actions/RevertAction.java (working copy) @@ -104,10 +104,5 @@ { return ISVNUIConstants.IMG_MENU_REVERT; } - - protected String getMenuId() - { - return "org.tigris.subversion.subclipse.ui.revert"; //$NON-NLS-1$ - } }