Author: mareshkau Date: 2010-10-07 10:05:45 -0400 (Thu, 07 Oct 2010) New Revision: 25559 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java Log: Externalize string icon behaviour has been moved from vpe plugin, https://jira.jboss.org/browse/JBIDE-7060 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-10-07 13:52:41 UTC (rev 25558) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-10-07 14:05:45 UTC (rev 25559) @@ -998,5 +998,4 @@ parentId="org.eclipse.ui.contexts.window"> </context> </extension> - </plugin> Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 13:52:41 UTC (rev 25558) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 14:05:45 UTC (rev 25559) @@ -11,15 +11,20 @@ package org.jboss.tools.jst.jsp.i18n.handlers; +import java.util.Map; + import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.HandlerEvent; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.menus.UIElement; import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsDialog; import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsWizard; @@ -30,7 +35,7 @@ * @author mareshkau * */ -public class I18Handler extends AbstractHandler { +public class I18Handler extends AbstractHandler implements IElementUpdater{ /* (non-Javadoc) * @see org.eclipse.core.commands.AbstractHandler#isEnabled() @@ -47,6 +52,12 @@ return false; } /** + * + */ + public I18Handler() { + setBaseEnabled(true); + } + /** * Calculates the state of ext command * @param selection * @return @@ -111,4 +122,10 @@ } return null; } + + @Override + public void updateElement(UIElement element, Map parameters) { + fireHandlerChanged(new HandlerEvent(this, true, false)); + + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-10-07 13:52:41 UTC (rev 25558) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-10-07 14:05:45 UTC (rev 25559) @@ -51,6 +51,8 @@ import org.eclipse.ui.IPropertyListener; import org.eclipse.ui.IReusableEditor; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.contexts.IContextActivation; import org.eclipse.ui.contexts.IContextService; import org.eclipse.ui.ide.IGotoMarker; @@ -137,6 +139,16 @@ static IVisualEditorFactory visualEditorFactory; private IContextActivation selBarContextActivation; + //added by Maksim Areshkau, notified externalize command that selection changed + private ISelectionChangedListener externalizeSelectionChangeListener = new ISelectionChangedListener() { + + @Override + public void selectionChanged(SelectionChangedEvent event) { + ICommandService commandService = (ICommandService) PlatformUI + .getWorkbench().getService(ICommandService.class); + commandService.refreshElements("org.jboss.tools.jst.jsp.commands.i18", null); //$NON-NLS-1$ + } + }; static { // Fix For JBIDE-2674 @@ -369,6 +381,7 @@ if (selectionProvider != null) { selectionProvider .addSelectionChangedListener(getSelectionChangedListener()); + selectionProvider.addSelectionChangedListener(externalizeSelectionChangeListener); } if (provider != null) { @@ -384,6 +397,7 @@ if (provider != null) { provider .removeSelectionChangedListener(getSelectionChangedListener()); + provider.removeSelectionChangedListener(externalizeSelectionChangeListener); } if (provider instanceof IPostSelectionProvider && postSelectionChangedListener != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java 2010-10-07 13:52:41 UTC (rev 25558) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java 2010-10-07 14:05:45 UTC (rev 25559) @@ -11,13 +11,11 @@ package org.jboss.tools.jst.jsp.jspeditor; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.eclipse.core.commands.IHandler; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.MenuManager; -import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -36,13 +34,12 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.contexts.IContextActivation; -import org.eclipse.ui.contexts.IContextService; -import org.eclipse.ui.handlers.IHandlerService; +import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.internal.KeyBindingService; import org.eclipse.ui.internal.PartSite; import org.eclipse.ui.internal.PopupMenuExtender; import org.eclipse.ui.internal.WorkbenchPlugin; +import org.eclipse.ui.internal.handlers.HandlerProxy; import org.eclipse.ui.internal.services.IServiceLocatorCreator; import org.eclipse.ui.internal.services.IWorkbenchLocationService; import org.eclipse.ui.internal.services.ServiceLocator; @@ -211,7 +208,7 @@ parentProvider, event.getSelection()); ((JSPMultiPageSelectionProvider) parentProvider) .fireSelectionChanged(newEvent); - } + } } public void registerContextMenu(String menuID, MenuManager menuMgr,