[jbosstools-commits] JBoss Tools SVN: r12927 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/menu and 3 other directories.

Author: sdzmitrovich Date: 2009-01-08 08:00:11 -0500 (Thu, 08 Jan 2009) New Revision: 12927 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-2017 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2009-01-08 09:10:41 UTC (rev 12926) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2009-01-08 13:00:11 UTC (rev 12927) @@ -78,4 +78,39 @@ point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory"> <visualEditorImplementation name="XulRunner Visual Editor" class="org.jboss.tools.vpe.editor.VpeEditorPartFactory"/> </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=paste"> + <separator + name="org.jboss.tools.insertGroup" visible="true" > + </separator> + <dynamic + class="org.jboss.tools.vpe.editor.menu.InsertContributionItem" + id="org.jboss.tools.vpe.editor.menu.InsertContributionItem"> + </dynamic> + </menuContribution> + </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=paste"> + <separator + name="org.jboss.tools.insertGroup" visible="true" > + </separator> + <dynamic + class="org.jboss.tools.vpe.editor.menu.InsertContributionItem" + id="org.jboss.tools.vpe.editor.menu.InsertContributionItem"> + </dynamic> + </menuContribution> + </extension> + <extension + point="org.eclipse.ui.commands"> + <command + id="org.jboss.tools.vpe.insert" + name="org.jboss.tools.vpe.insert" + defaultHandler="org.jboss.tools.vpe.editor.menu.InsertAction" + > + </command> + </extension> </plugin> Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/InsertContributionItem.java 2009-01-08 13:00:11 UTC (rev 12927) @@ -0,0 +1,246 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.vpe.editor.menu; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.action.ContributionItem; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.ui.util.ModelUtilities; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.VpeEditorPart; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.menu.action.InsertAction; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; +import org.jboss.tools.vpe.editor.util.SelectionUtil; +import org.jboss.tools.vpe.messages.VpeUIMessages; +import org.w3c.dom.Node; + +/** + * @author Sergey Dzmitrovich + * + */ +public class InsertContributionItem extends ContributionItem { + + private StructuredTextEditor sourceEditor; + + private VpePageContext pageContext; + + private final static String NAME_PROPERTY = "name"; //$NON-NLS-1$ + + private final static String HIDDEN_PROPERTY = "hidden"; //$NON-NLS-1$ + + private final static String ELEMENT_TYPE_PROPERTY = "element type"; //$NON-NLS-1$ + + private final static String END_TEXT_PROPERTY = "end text";//$NON-NLS-1$ + + private final static String TAG_ELEMENT_TYPE = "macro"; //$NON-NLS-1$ + + private static List<String> INSERT_ITEMS; + static { + INSERT_ITEMS = new ArrayList<String>(); + INSERT_ITEMS.add(VpeUIMessages.INSERT_AROUND); // id = 0 + INSERT_ITEMS.add(VpeUIMessages.INSERT_BEFORE); // id = 1 + INSERT_ITEMS.add(VpeUIMessages.INSERT_AFTER); // id = 2 + INSERT_ITEMS.add(VpeUIMessages.REPLACE_WITH); // id = 3 + } + + // ids correspond to order of items in INSERT_ITEMS + private int INSERT_AROUND = 0; + private int INSERT_BEFORE = 1; + private int INSERT_AFTER = 2; + private int REPLACE_WITH = 3; + + public InsertContributionItem() { + JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .getActiveEditor(); + this.sourceEditor = editor.getSourceEditor(); + this.pageContext = ((VpeEditorPart) editor.getVisualEditor()) + .getController().getPageContext(); + } + + public InsertContributionItem(StructuredTextEditor sourceEditor, + VpePageContext pageContext) { + this.sourceEditor = sourceEditor; + this.pageContext = pageContext; + } + + @Override + public void fill(Menu menu, int index) { + + for (int i = 0; i < INSERT_ITEMS.size(); i++) { + + String itemName = INSERT_ITEMS.get(i); + + MenuItem item = new MenuItem(menu, SWT.CASCADE, index + i); + item.setText(itemName); + + Menu paletteManu = new Menu(menu); + + item.setMenu(paletteManu); + + MenuManager paletteManuManager = new MenuManager( + VpeUIMessages.FROM_PALETTE); + + XModelObject model = ModelUtilities.getPreferenceModel().getByPath( + "%Palette%"); //$NON-NLS-1$ + + paletteManuManager + .addMenuListener(new InsertMenuListener(model, i)); + + paletteManuManager.fill(paletteManu, -1); + + } + + } + + /** + * + * @param sourceEditor + * @return + */ + private Point getSelectionRange(StructuredTextEditor sourceEditor) { + + // IStructuredSelection selection = (IStructuredSelection) sourceEditor + // .getSelectionProvider().getSelection(); + + // Object[] selectedObjects = selection.toArray(); + + // Node firstElement = (Node) selectedObjects[0]; + // Node endElement = (Node) selectedObjects[selectedObjects.length - 1]; + + Point selectionRange = SelectionUtil + .getSourceSelectionRange(sourceEditor); + + Node firstElement = SelectionUtil.getNodeBySourcePosition(sourceEditor, + selectionRange.x); + Node endElement = SelectionUtil.getNodeBySourcePosition(sourceEditor, + selectionRange.x + selectionRange.y); + + int start; + int length; + + if (firstElement.getNodeType() == Node.TEXT_NODE) + start = selectionRange.x; + else + start = NodesManagingUtil.getStartOffsetNode(firstElement); + + if (endElement.getNodeType() == Node.TEXT_NODE) + length = selectionRange.x + selectionRange.y - start; + else + length = NodesManagingUtil.getEndOffsetNode(endElement) - start; + + return new Point(start, length); + + } + + /** + * @author Sergey Dzmitrovich + * + * fill contextMenu run-time + * + */ + public class InsertMenuListener implements IMenuListener { + + private XModelObject modelObject; + private int typeAction; + + public InsertMenuListener(XModelObject modelObject, int typeAction) { + this.modelObject = modelObject; + this.typeAction = typeAction; + } + + public void menuAboutToShow(IMenuManager manager) { + + XModelObject[] modelObjects = modelObject.getChildren(); + for (int i = 0; i < modelObjects.length; i++) { + if (Constants.YES_STRING.equals(modelObjects[i] + .getAttributeValue(HIDDEN_PROPERTY))) { + continue; + } + + if (TAG_ELEMENT_TYPE.equals(modelObjects[i] + .getAttributeValue(ELEMENT_TYPE_PROPERTY))) { + + String endText = modelObjects[i] + .getAttributeValue(END_TEXT_PROPERTY); + + if (!((typeAction == INSERT_AROUND) && ((endText == null) || (endText + .length() == 0)))) { + + Point selectionRange = getSelectionRange(sourceEditor); + + if (typeAction == INSERT_BEFORE) { + selectionRange.y = 0; + } else if (typeAction == INSERT_AFTER) { + selectionRange.x += selectionRange.y; + selectionRange.y = 0; + } + + manager.add(new InsertAction(modelObjects[i] + .getAttributeValue(NAME_PROPERTY), + selectionRange, modelObjects[i], pageContext, + sourceEditor, REPLACE_WITH == this.typeAction)); + } + } + + else { + MenuManager subMenu = new InsertSubMenuManager( + modelObjects[i].getAttributeValue(NAME_PROPERTY)); + + subMenu.addMenuListener(new InsertMenuListener( + modelObjects[i], typeAction)); + + manager.add(subMenu); + + subMenu.fill(((MenuManager) manager).getMenu(), -1); + + } + + } + + } + + } + + /** + * @author Sergey Dzmitrovich + * + * class was created to override method isVisible ( because of it + * there is possibility to fill context menu run-time ) + */ + public class InsertSubMenuManager extends MenuManager { + + @Override + public boolean isVisible() { + return true; + } + + public InsertSubMenuManager(String text) { + super(text); + } + + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java 2009-01-08 09:10:41 UTC (rev 12926) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java 2009-01-08 13:00:11 UTC (rev 12927) @@ -36,6 +36,7 @@ private VpePageContext pageContext = null; private StructuredTextEditor sourceEditor = null; + private boolean replace= false; /** * Constructor. @@ -54,6 +55,25 @@ this.pageContext = pageContext; this.sourceEditor = sourceEditor; } + + /** + * Constructor. + * + * @param title the name of the action + * @param region the Point object + * @param item XModelObject object + * @param pageContext the VpePageContext element + * @param sourceEditor the StructuredTextEditor element + */ + public InsertAction(String title, Point region, XModelObject item, VpePageContext pageContext, + StructuredTextEditor sourceEditor, boolean replace) { + super(title); + this.item = item; + this.region = region; + this.pageContext = pageContext; + this.sourceEditor = sourceEditor; + this.replace = replace; + } /** * @see org.eclipse.jface.action.Action#run() @@ -76,8 +96,15 @@ */ String startText = Constants.EMPTY + item.getAttributeValue("start text"); //$NON-NLS-1$ String endText = Constants.EMPTY + item.getAttributeValue("end text"); //$NON-NLS-1$ + + if (this.replace) { + getSourceEditor().getTextViewer().getTextWidget().replaceTextRange( + region.x, region.y, ""); //$NON-NLS-1$ + region.y = 0; + } + if (region != null) { - //set source selection + // set source selection SelectionUtil.setSourceSelection(pageContext, region.x, region.y); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2009-01-08 09:10:41 UTC (rev 12926) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2009-01-08 13:00:11 UTC (rev 12927) @@ -30,14 +30,14 @@ /** * Utility class for selection manipulating. - * + * * @author S.Dzmitrovich */ public class SelectionUtil { /** * get selected visual node from nsISelection - * + * * @param selection * @return */ @@ -72,8 +72,10 @@ int start = NodesManagingUtil.getStartOffsetNode(node); int length = NodesManagingUtil.getNodeLength(node); - pageContext.getSourceBuilder().getStructuredTextViewer().setSelectedRange(start, length); - pageContext.getSourceBuilder().getStructuredTextViewer().revealRange(start, length); + pageContext.getSourceBuilder().getStructuredTextViewer() + .setSelectedRange(start, length); + pageContext.getSourceBuilder().getStructuredTextViewer().revealRange( + start, length); } /** @@ -95,9 +97,11 @@ * @param node * @param offset */ - public static void setSourceSelection(VpePageContext pageContext, Node node, int offset) { + public static void setSourceSelection(VpePageContext pageContext, + Node node, int offset) { int start = NodesManagingUtil.getStartOffsetNode(node); - pageContext.getSourceBuilder().getStructuredTextViewer().getTextWidget().setSelection(start + offset); + pageContext.getSourceBuilder().getStructuredTextViewer() + .getTextWidget().setSelection(start + offset); } /** @@ -106,13 +110,17 @@ * @param offset * @param length */ - public static void setSourceSelection(VpePageContext pageContext, int offset, int length) { - pageContext.getSourceBuilder().getStructuredTextViewer().setSelectedRange(offset, length); - pageContext.getSourceBuilder().getStructuredTextViewer().revealRange(offset, length); + public static void setSourceSelection(VpePageContext pageContext, + int offset, int length) { + pageContext.getSourceBuilder().getStructuredTextViewer() + .setSelectedRange(offset, length); + pageContext.getSourceBuilder().getStructuredTextViewer().revealRange( + offset, length); } public static VpeNodeMapping getNodeMappingBySourceSelection( - IStructuredModel model, VpeDomMapping domMapping, int focus, int anchor) { + IStructuredModel model, VpeDomMapping domMapping, int focus, + int anchor) { /* * implementation of IDOMModel's method getIndexedRegion(...) has one * feature : if cursor is situated at the border of elements then this @@ -131,43 +139,48 @@ Node focusNode = getSourceNodeByPosition(model, focus); // if focus node also contain anchor point (selected only 1 element) - if (focusNode != null && NodesManagingUtil.isNodeContainsPosition(focusNode, anchor)) { + if (focusNode != null + && NodesManagingUtil.isNodeContainsPosition(focusNode, anchor)) { return NodesManagingUtil.getNodeMapping(domMapping, focusNode); } return null; } - public static Node getSourceNodeByPosition(IStructuredModel model, int position) { - //if we state at the end of text node, model will return - //for us next node or null if on page exists only text node, - //but we still in the end of text node, so we should check - //this situation + private static Node getSourceNodeByPosition(IStructuredModel model, + int position) { + // if we state at the end of text node, model will return + // for us next node or null if on page exists only text node, + // but we still in the end of text node, so we should check + // this situation // get source node by position - //see jbide-3163 + // see jbide-3163 IndexedRegion node = model.getIndexedRegion(position); - IndexedRegion possibleNode = position >= 1 ? model.getIndexedRegion(position - 1) : null; + IndexedRegion possibleNode = position >= 1 ? model + .getIndexedRegion(position - 1) : null; if (node == null && position >= 1) { node = possibleNode; - } else if ((node!=null) && (((Node)node).getNodeType() != Node.TEXT_NODE) - && (node.getStartOffset() == position) - && (position >= 1)) { - //check for such situation #text<h1></h1> + } else if ((node != null) + && (((Node) node).getNodeType() != Node.TEXT_NODE) + && (node.getStartOffset() == position) && (position >= 1)) { + // check for such situation #text<h1></h1> node = possibleNode; - } else if((node != null) && (((Node)node).getNodeType() != Node.TEXT_NODE) + } else if ((node != null) + && (((Node) node).getNodeType() != Node.TEXT_NODE) && (possibleNode != null) - && ((Node)possibleNode).getNodeType() == Node.TEXT_NODE) { + && ((Node) possibleNode).getNodeType() == Node.TEXT_NODE) { node = possibleNode; } - return (Node)node; + return (Node) node; } /** * Returns selection range for visual part of editor Focus offset and anchor * offset can be not equals to source focus offset and anchor offset * - * @param selection the selection in visual part of editor + * @param selection + * the selection in visual part of editor * @return selection range for visual part of editor */ public static Point getVisualSelectionRange(nsISelection selection) { @@ -183,11 +196,13 @@ /** * Return source editor part selection range, range returns relatively to * start of text in source, not for start of document - * - * @param selection the selection in visual part of editor + * + * @param selection + * the selection in visual part of editor * @return source editor selection range */ - public static Point getSourceSelectionRange(nsISelection selection, Node sourceNode) { + public static Point getSourceSelectionRange(nsISelection selection, + Node sourceNode) { nsIDOMNode focusedNode = getSelectedNode(selection); // gets visual selection range Point sourceRange = new Point(0, 0); @@ -210,7 +225,8 @@ IStructuredModel model = null; try { - model = StructuredModelManager.getModelManager().getExistingModelForRead(document); + model = StructuredModelManager.getModelManager() + .getExistingModelForRead(document); int anchor = range.x; int focus = range.x + range.y; @@ -238,15 +254,17 @@ // fixed JBIDE-3388: Incorrect selection after Copy/Cut actions IndexedRegion node = model.getIndexedRegion(focus); if (node != null) { - focusNode = (Node)node; + focusNode = (Node) node; } } - // if focus node also contains anchor point (selected only 1 element) + // if focus node also contains anchor point (selected only 1 + // element) if (focusNode != null) { -// if (NodesManagingUtil.isNodeContainsPosition(focusNode, anchor)) { - return NodesManagingUtil.getNodeMapping(domMapping, focusNode); -// } + // if (NodesManagingUtil.isNodeContainsPosition(focusNode, + // anchor)) { + return NodesManagingUtil.getNodeMapping(domMapping, focusNode); + // } } } finally { if (model != null) { @@ -257,23 +275,51 @@ return null; } + public static Node getNodeBySourcePosition( + StructuredTextEditor sourceEditor, int position) { + Point range = sourceEditor.getTextViewer().getSelectedRange(); + + IDocument document = sourceEditor.getTextViewer().getDocument(); + + IStructuredModel model = null; + + Node node = null; + try { + model = StructuredModelManager.getModelManager() + .getExistingModelForRead(document); + + node = (Node) model.getIndexedRegion(position); + + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + + return node; + } + /** * Method is used to select the last selected node. - * - * @param pageContext VpePageContext object + * + * @param pageContext + * VpePageContext object * @return nsIDOMNode the last selected node */ public static nsIDOMNode getLastSelectedNode(VpePageContext pageContext) { - return pageContext.getVisualBuilder().getXulRunnerEditor().getLastSelectedNode(); + return pageContext.getVisualBuilder().getXulRunnerEditor() + .getLastSelectedNode(); } /** * Returns sourceSelectionRange - * - * @param sourceEditor StructuredTextEditor object + * + * @param sourceEditor + * StructuredTextEditor object * @return sourceSelectionRange */ - public static Point getSourceSelectionRange(StructuredTextEditor sourceEditor) { + public static Point getSourceSelectionRange( + StructuredTextEditor sourceEditor) { ITextViewer textViewer = sourceEditor.getTextViewer(); if (textViewer != null) { return textViewer.getSelectedRange(); @@ -283,9 +329,11 @@ /** * - * @param selectionController VpeSelectionController object + * @param selectionController + * VpeSelectionController object */ public static void clearSelection(VpeSelectionController selectionController) { - selectionController.getSelection(nsISelectionController.SELECTION_NORMAL).removeAllRanges(); + selectionController.getSelection( + nsISelectionController.SELECTION_NORMAL).removeAllRanges(); } } \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-01-08 09:10:41 UTC (rev 12926) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-01-08 13:00:11 UTC (rev 12927) @@ -87,4 +87,10 @@ public static String RESTORE_PREVIOUS_LOCATION; public static String BACKGROUND_COLOR_TIP; public static String SETUP_TEMPLATE_FOR_MENU; + public static String INSERT_AROUND; + public static String INSERT_BEFORE; + public static String INSERT_AFTER; + public static String REPLACE_WITH; + public static String FROM_PALETTE; + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-01-08 09:10:41 UTC (rev 12926) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-01-08 13:00:11 UTC (rev 12927) @@ -65,3 +65,8 @@ RESTORE_PREVIOUS_LOCATION=Restore Previous Location BACKGROUND_COLOR_TIP=Choose background color SETUP_TEMPLATE_FOR_MENU=Setup Template for {0} +INSERT_AROUND=Insert Around +INSERT_BEFORE=Insert Before +INSERT_AFTER=Insert After +REPLACE_WITH=Replace With +FROM_PALETTE=From Palette \ No newline at end of file