Author: mareshkau Date: 2010-11-05 12:06:24 -0400 (Fri, 05 Nov 2010) New Revision: 26299 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PageDesignOptionsHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PreferencesHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RefreshHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowTextFormattingHandler.java Log: https://jira.jboss.org/browse/JBIDE-7475 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -128,6 +128,13 @@ import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.jboss.tools.vpe.editor.util.VpeDebugUtil; import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil; +import org.jboss.tools.vpe.handlers.PageDesignOptionsHandler; +import org.jboss.tools.vpe.handlers.PreferencesHandler; +import org.jboss.tools.vpe.handlers.RefreshHandler; +import org.jboss.tools.vpe.handlers.RotateEditorsHandler; +import org.jboss.tools.vpe.handlers.ShowBorderHandler; +import org.jboss.tools.vpe.handlers.ShowBundleAsELHandler; +import org.jboss.tools.vpe.handlers.ShowNonVisualTagsHandler; import org.jboss.tools.vpe.handlers.ShowTextFormattingHandler; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; @@ -2370,7 +2377,6 @@ } public void setVisualEditorVisible(boolean visualEditorVisible) { - VpeDebugUtil.debugInfo(visualEditorVisible+""); this.visualEditorVisible = visualEditorVisible; } @@ -2467,7 +2473,13 @@ ICommandService commandService = (ICommandService) PlatformUI .getWorkbench().getService(ICommandService.class); commandService.refreshElements(ShowTextFormattingHandler.COMMAND_ID, null); - + commandService.refreshElements(RotateEditorsHandler.COMMAND_ID, null); + commandService.refreshElements(ShowNonVisualTagsHandler.COMMAND_ID, null); + commandService.refreshElements(ShowBundleAsELHandler.COMMAND_ID, null); + commandService.refreshElements(ShowBorderHandler.COMMAND_ID, null); + commandService.refreshElements(RefreshHandler.COMMAND_ID, null); + commandService.refreshElements(PreferencesHandler.COMMAND_ID, null); + commandService.refreshElements(PageDesignOptionsHandler.COMMAND_ID, null); } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PageDesignOptionsHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PageDesignOptionsHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PageDesignOptionsHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.handlers; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IFile; @@ -22,7 +21,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; @@ -30,12 +31,9 @@ /** * Handler for PageDesignOptions */ -public class PageDesignOptionsHandler extends AbstractHandler { - /** - * The constructor. - */ - public PageDesignOptionsHandler() { - } +public class PageDesignOptionsHandler extends VisualPartAbstractHandler { + + public static final String COMMAND_ID="org.jboss.tools.vpe.commands.pageDesignOptionsCommand"; //$NON-NLS-1$ /** * the command has been executed, so extract extract the needed information @@ -84,8 +82,16 @@ file = FileUtil.getFile(input, path.lastSegment()); } } + boolean isVisualPartVisible=false; + if(activeEditor instanceof JSPMultiPageEditor){ + JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) activeEditor; + if(jspEditor.getVisualEditor().getController()!=null) + isVisualPartVisible=((VpeController)(jspEditor.getVisualEditor().getController())).isVisualEditorVisible(); + } - boolean enabled = file != null && file.exists(); + + boolean isFileExists = file != null && file.exists(); + boolean enabled=isFileExists&&isVisualPartVisible; if (isEnabled() != enabled) { setBaseEnabled(enabled); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PreferencesHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PreferencesHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/PreferencesHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.handlers; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage; @@ -19,14 +18,9 @@ /** * Handler for Preferences */ -public class PreferencesHandler extends AbstractHandler { +public class PreferencesHandler extends VisualPartAbstractHandler { + public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.preferencesCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public PreferencesHandler() { - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RefreshHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RefreshHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RefreshHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.handlers; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.IEditorPart; @@ -21,14 +20,10 @@ /** * Handler for Refresh */ -public class RefreshHandler extends AbstractHandler { +public class RefreshHandler extends VisualPartAbstractHandler { + + public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.refreshCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public RefreshHandler() { - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/RotateEditorsHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -24,11 +23,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.IPerspectiveDescriptor; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.menus.UIElement; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; @@ -39,9 +35,10 @@ /** * Handler for RotateEditors */ -public class RotateEditorsHandler extends AbstractHandler implements - IElementUpdater { - +public class RotateEditorsHandler extends VisualPartAbstractHandler{ + + public static final String COMMAND_ID="org.jboss.tools.vpe.commands.rotateEditorsCommand"; //$NON-NLS-1$ + private static List<String> layoutValues; private static Map<String, String> layoutIcons; private static Map<String, String> layoutNames; @@ -123,7 +120,7 @@ } public void updateElement(UIElement element, Map parameters) { - + super.updateElement(element, parameters); IPreferenceStore preferences = JspEditorPlugin.getDefault() .getPreferenceStore(); String orientation = preferences Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -13,7 +13,6 @@ import java.util.Map; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,7 +20,6 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.menus.UIElement; import org.jboss.tools.jst.jsp.JspEditorPlugin; @@ -32,16 +30,10 @@ /** * Handler for ShowBorder */ -public class ShowBorderHandler extends AbstractHandler implements - IElementUpdater { +public class ShowBorderHandler extends VisualPartAbstractHandler { + public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showBorderCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public ShowBorderHandler() { - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ @@ -64,7 +56,7 @@ } public void updateElement(UIElement element, Map parameters) { - + super.updateElement(element, parameters); boolean toggleState = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -13,7 +13,6 @@ import java.util.Map; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,7 +20,6 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.menus.UIElement; import org.jboss.tools.jst.jsp.JspEditorPlugin; @@ -32,16 +30,10 @@ /** * Handler for ShowBundleAsEL */ -public class ShowBundleAsELHandler extends AbstractHandler implements - IElementUpdater { +public class ShowBundleAsELHandler extends VisualPartAbstractHandler { + public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showBundleAsELCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public ShowBundleAsELHandler() { - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ @@ -65,7 +57,7 @@ } public void updateElement(UIElement element, Map parameters) { - + super.updateElement(element, parameters); boolean toggleState = JspEditorPlugin .getDefault() .getPreferenceStore() Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -13,7 +13,6 @@ import java.util.Map; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,7 +20,6 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.menus.UIElement; import org.jboss.tools.jst.jsp.JspEditorPlugin; @@ -32,16 +30,10 @@ /** * Handler for ShowNonVisualTags */ -public class ShowNonVisualTagsHandler extends AbstractHandler implements - IElementUpdater { +public class ShowNonVisualTagsHandler extends VisualPartAbstractHandler { + public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showNonVisualTagsCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public ShowNonVisualTagsHandler() { - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ @@ -64,7 +56,7 @@ } public void updateElement(UIElement element, Map parameters) { - + super.updateElement(element, parameters); boolean toggleState = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowTextFormattingHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowTextFormattingHandler.java 2010-11-05 15:59:58 UTC (rev 26298) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowTextFormattingHandler.java 2010-11-05 16:06:24 UTC (rev 26299) @@ -13,24 +13,18 @@ import java.util.Map; -import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.HandlerEvent; -import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.menus.UIElement; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; -import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.toolbar.IVpeToolBarManager; @@ -38,36 +32,10 @@ /** * Handler for ShowTextFormatting */ -public class ShowTextFormattingHandler extends AbstractHandler implements - IElementUpdater { +public class ShowTextFormattingHandler extends VisualPartAbstractHandler { public static final String COMMAND_ID = "org.jboss.tools.vpe.commands.showTextFormattingCommand"; //$NON-NLS-1$ /** - * The constructor. - */ - public ShowTextFormattingHandler() { - } - - @Override - public void setEnabled(Object evaluationContext) { - boolean enabled = false; - - if (evaluationContext instanceof IEvaluationContext) { - IEvaluationContext context = (IEvaluationContext) evaluationContext; - Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME); - if(activeEditor instanceof JSPMultiPageEditor){ - JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) activeEditor; - if(jspEditor.getVisualEditor().getController()!=null) - enabled=((VpeController)(jspEditor.getVisualEditor().getController())).isVisualEditorVisible(); - } - } - - if (enabled != isEnabled()) { - setBaseEnabled(enabled); - } - } - - /** * the command has been executed, so extract extract the needed information * from the application context. */ @@ -90,7 +58,7 @@ } public void updateElement(UIElement element, Map parameters) { - + super.updateElement(element, parameters); boolean toggleState = JspEditorPlugin.getDefault().getPreferenceStore() .getBoolean(IVpePreferencesPage.SHOW_TEXT_FORMATTING); @@ -101,7 +69,7 @@ IEditorPart editor = openedEditor.getEditor(true); toggleShowTextFormatting(editor, toggleState); } - fireHandlerChanged(new HandlerEvent(this, true, false)); + } private void toggleShowTextFormatting(IEditorPart editor,