[jbosstools-commits] JBoss Tools SVN: r26294 - in trunk: jst/plugins/org.jboss.tools.neweditor.sidebyside/src and 2 other directories.

Author: mareshkau Date: 2010-11-05 11:08:45 -0400 (Fri, 05 Nov 2010) New Revision: 26294 Removed: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 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/VpeEditorPart.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/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-11-05 15:04:41 UTC (rev 26293) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-11-05 15:08:45 UTC (rev 26294) @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; + import org.eclipse.core.runtime.SafeRunner; import org.eclipse.jface.util.Assert; import org.eclipse.jface.util.SafeRunnable; @@ -36,7 +37,6 @@ import org.eclipse.ui.IKeyBindingService; import org.eclipse.ui.INestableKeyBindingService; import org.eclipse.ui.IPropertyListener; -import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.EditorPart; 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:04:41 UTC (rev 26293) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-11-05 15:08:45 UTC (rev 26294) @@ -55,6 +55,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.internal.keys.WorkbenchKeyboard; import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.progress.UIJob; @@ -125,7 +126,9 @@ import org.jboss.tools.vpe.editor.util.DocTypeUtil; import org.jboss.tools.vpe.editor.util.SelectionUtil; 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.ShowTextFormattingHandler; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; import org.jboss.tools.vpe.resref.core.CSSReferenceList; @@ -356,6 +359,7 @@ // yradtsevich: we have to refresh VPE selection on init (fix of // JBIDE-4037) sourceSelectionChanged(true); + refreshCommands(); } public void dispose() { @@ -2366,6 +2370,7 @@ } public void setVisualEditorVisible(boolean visualEditorVisible) { + VpeDebugUtil.debugInfo(visualEditorVisible+""); this.visualEditorVisible = visualEditorVisible; } @@ -2455,7 +2460,16 @@ } } + /** + * + */ + public void refreshCommands(){ + ICommandService commandService = (ICommandService) PlatformUI + .getWorkbench().getService(ICommandService.class); + commandService.refreshElements(ShowTextFormattingHandler.COMMAND_ID, null); + } + /** * @return the visualSelectionController */ @@ -2516,4 +2530,5 @@ public VpeDropWindow getDropWindow() { return dropWindow; } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-05 15:04:41 UTC (rev 26293) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-05 15:08:45 UTC (rev 26294) @@ -27,6 +27,8 @@ import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.ShellAdapter; import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.graphics.Point; @@ -400,6 +402,9 @@ } break; } + if(visualEditor!=null&&visualEditor.getController()!=null){ + visualEditor.getController().refreshCommands(); + } container.layout(); if (visualMode == SOURCE_MODE && type != SOURCE_MODE) { visualMode = type; @@ -455,6 +460,21 @@ * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=302950 */ cmpEdTl = parent; + cmpEdTl.addFocusListener(new FocusListener() { + + @Override + public void focusLost(FocusEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void focusGained(FocusEvent e) { + System.out.println(); + + } + }); + GridLayout layoutEdTl = new GridLayout(2, false); layoutEdTl.verticalSpacing = 0; layoutEdTl.marginHeight = 0; @@ -1032,6 +1052,8 @@ } private void handleActivation() { + if(visualEditor!=null&&visualEditor.getController()!=null) + visualEditor.getController().refreshCommands(); if (fIsHandlingActivation) return; 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:04:41 UTC (rev 26293) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowTextFormattingHandler.java 2010-11-05 15:08:45 UTC (rev 26294) @@ -17,8 +17,11 @@ 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; @@ -27,6 +30,7 @@ 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; @@ -36,12 +40,32 @@ */ public class ShowTextFormattingHandler extends AbstractHandler implements IElementUpdater { + 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 @@ -77,6 +101,7 @@ IEditorPart editor = openedEditor.getEditor(true); toggleShowTextFormatting(editor, toggleState); } + fireHandlerChanged(new HandlerEvent(this, true, false)); } private void toggleShowTextFormatting(IEditorPart editor,