Attachment #27094 for bug #109468

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




###############################################################################
_UI_XML_VALIDATOR                   = XML Validator
_UI_REF_FILE_SHOW_DETAILS           = Show Details...
_UI_MENU_VALIDATE_XML               = Validate XML File
##
CleanupDocument_label=Cleanup Document...
CleanupDocument_tooltip=Cleanup Document
ToggleComment_label=Toggle Comment
ToggleComment_tooltip=Toggle Comment
AddBlockComment_label=Add Block Comment
AddBlockComment_tooltip=Add Block Comment
RemoveBlockComment_label=Remove Block Comment
RemoveBlockComment_tooltip=Remove Block Comment
FindOccurrences_label=Occurrences in File
StructureSelectEnclosing_label=Enclosing Element
StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
StructureSelectNext_label=Next Element
StructureSelectNext_tooltip=Expand selection to include next sibling
StructureSelectPrevious_label=Previous Element
StructureSelectPrevious_tooltip=Expand selection to include previous sibling
StructureSelectHistory_label=Restore Last Selection
StructureSelectHistory_tooltip=Restore last selection




		</validator>
	</extension>

	<extension point="org.eclipse.ui.editorActions">
		<editorContribution
			id="org.eclipse.core.runtime.xml.source.editorActions"
			targetID="org.eclipse.core.runtime.xml.source">
			<action
				id="CleanupDocument"
				label="%CleanupDocument_label"
				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
				tooltip="%CleanupDocument_tooltip"
				class="org.eclipse.wst.xml.ui.internal.actions.CleanupActionXMLDelegate"
				actionID="CleanupDocument">
			</action>
			<action
				id="ToggleComment"
				label="%ToggleComment_label"
				definitionId="org.eclipse.wst.sse.ui.toggle.comment"
				tooltip="%ToggleComment_tooltip"
				class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
				actionID="ToggleComment">
			</action>
			<action
				id="AddBlockComment"
				label="%AddBlockComment_label"
				definitionId="org.eclipse.wst.sse.ui.add.block.comment"
				tooltip="%AddBlockComment_tooltip"
				class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
				actionID="AddBlockComment">
			</action>
			<action
				id="RemoveBlockComment"
				label="%RemoveBlockComment_label"
				definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
				tooltip="%RemoveBlockComment_tooltip"
				class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
				actionID="RemoveBlockComment">
			</action>
			<action
				id="FindOccurrences"
				label="%FindOccurrences_label"
				definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
				class="org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesActionDelegate"
				actionID="FindOccurrences">
			</action>
			<action
				id="StructureSelectEnclosing"
				label="%StructureSelectEnclosing_label"
				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
				tooltip="%StructureSelectEnclosing_tooltip"
				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
				actionID="StructureSelectEnclosing">
			</action>
			<action
				id="StructureSelectNext"
				label="%StructureSelectNext_label"
				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
				tooltip="%StructureSelectNext_tooltip"
				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
				actionID="StructureSelectNext">
			</action>
			<action
				id="StructureSelectPrevious"
				label="%StructureSelectPrevious_label"
				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
				tooltip="%StructureSelectPrevious_tooltip"
				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
				actionID="StructureSelectPrevious">
			</action>
			<action
				id="StructureSelectHistory"
				label="%StructureSelectHistory_label"
				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
				tooltip="%StructureSelectHistory_tooltip"
				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
				actionID="StructureSelectHistory">
			</action>
		</editorContribution>
	</extension>
</plugin>

Lines 27-32 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
27	org.eclipse.wst.xml.ui.internal.provisional,	27	org.eclipse.wst.xml.ui.internal.provisional,
28	org.eclipse.wst.xml.ui.internal.registry,	28	org.eclipse.wst.xml.ui.internal.registry,
29	org.eclipse.wst.xml.ui.internal.search,	29	org.eclipse.wst.xml.ui.internal.search,
		30	org.eclipse.wst.xml.ui.internal.selection,
30	org.eclipse.wst.xml.ui.internal.style,	31	org.eclipse.wst.xml.ui.internal.style,
31	org.eclipse.wst.xml.ui.internal.tabletree,	32	org.eclipse.wst.xml.ui.internal.tabletree,
32	org.eclipse.wst.xml.ui.internal.taginfo,	33	org.eclipse.wst.xml.ui.internal.taginfo,

Lines 271-276 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java (+9 lines)
271	public static String OpenFileFromSource_tooltip; // Resource bundle	271	public static String OpenFileFromSource_tooltip; // Resource bundle
272	public static String OpenFileFromSource_description; // Resource bundle	272	public static String OpenFileFromSource_description; // Resource bundle
273	public static String XMLContentOutlineConfiguration_0;	273	public static String XMLContentOutlineConfiguration_0;
		274	public static String StructureSelectEnclosing_label;
		275	public static String StructureSelectEnclosing_tooltip;
		276	public static String StructureSelectEnclosing_description;
		277	public static String StructureSelectNext_label;
		278	public static String StructureSelectNext_tooltip;
		279	public static String StructureSelectNext_description;
		280	public static String StructureSelectPrevious_label;
		281	public static String StructureSelectPrevious_tooltip;
		282	public static String StructureSelectPrevious_description;
274		283
275	static {	284	static {
276	// load message values from bundle file	285	// load message values from bundle file




Uncomment_label=&Uncomment
Uncomment_tooltip=Uncomment
Uncomment_description=Uncomment
ToggleComment_label=Toggle Comment
ToggleComment_tooltip=Toggle Comment
ToggleComment_description=Toggle Comment
AddBlockComment_label=Add Block Comment
AddBlockComment_tooltip=Add Block Comment
AddBlockComment_description=Add Block Comment
RemoveBlockComment_label=Remove Block Comment
RemoveBlockComment_tooltip=Remove Block Comment
RemoveBlockComment_description=Remove Block Comment
CleanupDocument_label=Cleanup Document...
CleanupDocument_tooltip=Cleanup Document
CleanupDocument_description=Cleanup Document
FindOccurrences_label=Occurrences in File
ShowTooltipDesc_label=Show &Tooltip Description
ShowTooltipDesc_tooltip=Displays the hover help for the selected element
ShowTooltipDesc_description=Displays the hover help for the selected element

OpenFileFromSource_tooltip=Open an editor on the selected link
OpenFileFromSource_description=Open an editor on the selected link
XMLContentOutlineConfiguration_0=Show Attributes
StructureSelectEnclosing_label=Enclosing Element
StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
StructureSelectEnclosing_description=Expand selection to include enclosing element
StructureSelectNext_label=Next Element
StructureSelectNext_tooltip=Expand selection to include next sibling
StructureSelectNext_description=Expand selection to include next sibling
StructureSelectPrevious_label=Previous Element
StructureSelectPrevious_tooltip=Expand selection to include previous sibling
StructureSelectPrevious_description=Expand selection to include previous sibling

Lines 21-26 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/AddBlockCommentActionXML.java (+3 lines)
21	import org.eclipse.wst.xml.core.internal.document.CommentImpl;	21	import org.eclipse.wst.xml.core.internal.document.CommentImpl;
22	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;	22	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
23		23
		24	/**
		25	* @deprecated use AddBlockCommentActionXMLDelegate instead
		26	*/
24	public class AddBlockCommentActionXML extends CommentActionXML {	27	public class AddBlockCommentActionXML extends CommentActionXML {
25	protected int fCloseCommentOffset;	28	protected int fCloseCommentOffset;
26	protected int fOpenCommentOffset;	29	protected int fOpenCommentOffset;

Lines 21-27 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/CleanupActionXML.java (-1 / +3 lines)
21	import org.eclipse.wst.sse.ui.internal.actions.CleanupAction;	21	import org.eclipse.wst.sse.ui.internal.actions.CleanupAction;
22	import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;	22	import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
23		23
24		24	/**
		25	* @deprecated Use CleanupActionXMLDelegate instead.
		26	*/
25	public class CleanupActionXML extends CleanupAction {	27	public class CleanupActionXML extends CleanupAction {
26	protected IStructuredCleanupProcessor fCleanupProcessor;	28	protected IStructuredCleanupProcessor fCleanupProcessor;
27		29

Lines 32-37 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/CommentActionXML.java (+4 lines)
32	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;	32	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
33	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;	33	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
34		34
		35	/**
		36	* @deprecated use AbstractCommentActionXMLDelegate or
		37	* ToggleCommentActionXMLDelegate instead
		38	*/
35	public class CommentActionXML extends TextEditorAction {	39	public class CommentActionXML extends TextEditorAction {
36	protected static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$	40	protected static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$
37	protected static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$	41	protected static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$

Lines 20-25 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/RemoveBlockCommentActionXML.java (+3 lines)
20	import org.eclipse.wst.xml.core.internal.document.CommentImpl;	20	import org.eclipse.wst.xml.core.internal.document.CommentImpl;
21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;	21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
22		22
		23	/**
		24	* @deprecated use RemoveBlockCommentActionXMLDelegate instead
		25	*/
23	public class RemoveBlockCommentActionXML extends AddBlockCommentActionXML {	26	public class RemoveBlockCommentActionXML extends AddBlockCommentActionXML {
24	public RemoveBlockCommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {	27	public RemoveBlockCommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {
25	super(bundle, prefix, editor);	28	super(bundle, prefix, editor);

Lines 20-25 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/ToggleCommentActionXML.java (+3 lines)
20	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;	20	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;	21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
22		22
		23	/**
		24	* @deprecated use ToggleCommentActionXMLDelegate instead
		25	*/
23	public class ToggleCommentActionXML extends UncommentActionXML {	26	public class ToggleCommentActionXML extends UncommentActionXML {
24	public ToggleCommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {	27	public ToggleCommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {
25	super(bundle, prefix, editor);	28	super(bundle, prefix, editor);

Lines 20-25 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/UncommentActionXML.java (+3 lines)
20	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;	20	import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;	21	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
22		22
		23	/**
		24	* @deprecated use ToggleCommentActionXMLDelegate instead
		25	*/
23	public class UncommentActionXML extends CommentActionXML {	26	public class UncommentActionXML extends CommentActionXML {
24	public UncommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {	27	public UncommentActionXML(ResourceBundle bundle, String prefix, ITextEditor editor) {
25	super(bundle, prefix, editor);	28	super(bundle, prefix, editor);

Lines 27-32 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/provisional/StructuredTextEditorXML.java (+4 lines)
27	import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;	27	import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
28	import org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesAction;	28	import org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesAction;
29		29
		30	/**
		31	* @deprecated XML editor is created from StructuredTextEditor with
		32	* XML configurations
		33	*/
30	public class StructuredTextEditorXML extends StructuredTextEditor {	34	public class StructuredTextEditorXML extends StructuredTextEditor {
31	private final static String UNDERSCORE = "_"; //$NON-NLS-1$	35	private final static String UNDERSCORE = "_"; //$NON-NLS-1$
32		36

Lines 30-36 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesAction.java (-1 / +1 lines)
30	* Uses default <code>getSearchQuery()</code>.	30	* Uses default <code>getSearchQuery()</code>.
31	* </p>	31	* </p>
32	*	32	*
33	* @author pavery	33	* @deprecated use XMLFindOccurrencesProcessor instead
34	*/	34	*/
35	public class XMLFindOccurrencesAction extends BasicFindOccurrencesAction {	35	public class XMLFindOccurrencesAction extends BasicFindOccurrencesAction {
36		36

Lines 42-50 Link Here

(-)src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java (-2 / +8 lines)
42	import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;	42	import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;
43	import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;	43	import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
44	import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;	44	import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
		45	import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
45	import org.eclipse.wst.xml.ui.internal.Logger;	46	import org.eclipse.wst.xml.ui.internal.Logger;
46	import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;	47	import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
47	import org.eclipse.wst.xml.ui.internal.provisional.StructuredTextEditorXML;
48		48
49	public class XMLMultiPageEditorPart extends PostSelectionMultiPageEditorPart {	49	public class XMLMultiPageEditorPart extends PostSelectionMultiPageEditorPart {
50		50
Lines 467-472 Link Here
467	}	467	}
468	return contributor;	468	return contributor;
469	}	469	}
		470
		471	public String getId() {
		472	// sets this id so nested editor is considered xml source
		473	// page
		474	return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
		475	}
470	};	476	};
471	}	477	}
472	else {	478	else {
Lines 494-500 Link Here
494	* @return StructuredTextEditor	500	* @return StructuredTextEditor
495	*/	501	*/
496	private StructuredTextEditor createTextEditor() {	502	private StructuredTextEditor createTextEditor() {
497	return new StructuredTextEditorXML();	503	return new StructuredTextEditor();
498	}	504	}
499		505
500	private void disconnectDesignPage() {	506	private void disconnectDesignPage() {




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.IActionDelegate2;
import org.eclipse.ui.IEditorActionDelegate;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.xml.ui.internal.Logger;

/**
 * Abstract comment action delegate for XML editors
 */
abstract public class AbstractCommentActionXMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
	static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$
	static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$

	IEditorPart fEditor;

	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
		fEditor = targetEditor;
	}

	public void dispose() {
		// nulling out just in case
		fEditor = null;
	}

	public void runWithEvent(IAction action, Event event) {
		run(action);
	}

	public void run(IAction action) {
		if (fEditor instanceof ITextEditor) {
			ITextEditor textEditor = (ITextEditor) fEditor;
			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
			if (document != null) {
				// get current text selection
				ITextSelection textSelection = getCurrentSelection();
				if (textSelection.isEmpty())
					return;

				processAction(document, textSelection);
			}
		}
	}

	public void init(IViewPart view) {
		// do nothing
	}

	public void selectionChanged(IAction action, ISelection selection) {
		// do nothing
	}

	private ITextSelection getCurrentSelection() {
		if (fEditor instanceof ITextEditor) {
			ISelectionProvider provider = ((ITextEditor) fEditor).getSelectionProvider();
			if (provider != null) {
				ISelection selection = provider.getSelection();
				if (selection instanceof ITextSelection)
					return (ITextSelection) selection;
			}
		}
		return TextSelection.emptySelection();
	}

	abstract void processAction(IDocument document, ITextSelection textSelection);

	void removeOpenCloseComments(IDocument document, int offset, int length) {
		try {
			int adjusted_length = length;

			// remove open comments
			String string = document.get(offset, length);
			int index = string.lastIndexOf(OPEN_COMMENT);
			while (index != -1) {
				document.replace(offset + index, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
				index = string.lastIndexOf(OPEN_COMMENT, index - 1);
				adjusted_length -= OPEN_COMMENT.length();
			}

			// remove close comments
			string = document.get(offset, adjusted_length);
			index = string.lastIndexOf(CLOSE_COMMENT);
			while (index != -1) {
				document.replace(offset + index, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
				index = string.lastIndexOf(CLOSE_COMMENT, index - 1);
			}
		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.xml.core.internal.document.CommentImpl;
import org.eclipse.wst.xml.ui.internal.Logger;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Add block comment action delegate for XML editor
 */
public class AddBlockCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.AddBlockComment_label);
			action.setToolTipText(XMLUIMessages.AddBlockComment_tooltip);
			action.setDescription(XMLUIMessages.AddBlockComment_description);
		}
	}

	void processAction(IDocument document, ITextSelection textSelection) {
		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
		if (model != null) {
			try {
				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());

				if (selectionStartIndexedRegion == null)
					return;
				if (selectionEndIndexedRegion == null && textSelection.getLength() > 0) {
					selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength() - 1);
				}
				if (selectionEndIndexedRegion == null)
					return;

				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() + OPEN_COMMENT.length();


				if (textSelection.getLength() == 0 && selectionStartIndexedRegion instanceof CommentImpl)
					return;

				model.beginRecording(this, XMLUIMessages.AddBlockComment_tooltip);
				model.aboutToChangeModel();

				try {
					document.replace(openCommentOffset, 0, OPEN_COMMENT);
					document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
				}
				catch (BadLocationException e) {
					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
				}
				finally {
					model.changedModel();
					model.endRecording(this);
				}
			}
			finally {
				model.releaseFromEdit();
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.IActionDelegate2;
import org.eclipse.ui.IEditorActionDelegate;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Cleanup action delegate for CSS editor
 */
public class CleanupActionXMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
	private IEditorPart fEditor;
	private IStructuredCleanupProcessor fCleanupProcessor;

	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
		fEditor = targetEditor;
	}

	public void dispose() {
		// nulling out just in case
		fEditor = null;
		fCleanupProcessor = null;
	}

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.CleanupDocument_label);
			action.setToolTipText(XMLUIMessages.CleanupDocument_tooltip);
			action.setDescription(XMLUIMessages.CleanupDocument_description);
		}
	}

	public void runWithEvent(IAction action, Event event) {
		run(action);
	}

	public void init(IViewPart view) {
		// do nothing
	}

	public void run(IAction action) {
		if (fEditor instanceof StructuredTextEditor) {
			final StructuredTextEditor editor = (StructuredTextEditor) fEditor;
			Dialog cleanupDialog = new CleanupDialogXML(editor.getSite().getShell());
			if (cleanupDialog.open() == Window.OK) {
				// setup runnable
				Runnable runnable = new Runnable() {
					public void run() {
						IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor();
						if (cleanupProcessor != null) {
							IStructuredModel model = null;
							try {
								model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
								if (model != null)
									cleanupProcessor.cleanupModel(model);
							}
							finally {
								if (model != null)
									model.releaseFromEdit();
							}
						}
					}
				};

				// TODO: make independent of 'model'.
				IStructuredModel model = null;
				try {
					model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
					if (model != null) {
						// begin recording
						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
						model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$

						// tell the model that we are about to make a big
						// model change
						model.aboutToChangeModel();

						// run
						BusyIndicator.showWhile(editor.getTextViewer().getControl().getDisplay(), runnable);
					}
				}
				finally {
					if (model != null) {
						// tell the model that we are done with the big
						// model
						// change
						model.changedModel();

						// end recording
						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
						model.endRecording(this, selection.getOffset(), selection.getLength());
						model.releaseFromEdit();
					}
				}
			}
		}
	}

	public void selectionChanged(IAction action, ISelection selection) {
		// do nothing
	}

	IStructuredCleanupProcessor getCleanupProcessor() {
		if (fCleanupProcessor == null)
			fCleanupProcessor = new CleanupProcessorXML();

		return fCleanupProcessor;
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.xml.core.internal.document.CommentImpl;
import org.eclipse.wst.xml.ui.internal.Logger;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Remove block comment action delegate for XML editor
 */
public class RemoveBlockCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {

	void processAction(IDocument document, ITextSelection textSelection) {
		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
		if (model != null) {
			try {
				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());

				if (selectionStartIndexedRegion == null || selectionEndIndexedRegion == null)
					return;

				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() - OPEN_COMMENT.length() - CLOSE_COMMENT.length();

				model.beginRecording(this, XMLUIMessages.RemoveBlockComment_tooltip);
				model.aboutToChangeModel();

				try {
					if (textSelection.getLength() == 0) {
						if (selectionStartIndexedRegion instanceof CommentImpl) {
							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
						}
					}
					else {
						if (selectionStartIndexedRegion instanceof CommentImpl) {
							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
						}

						if (selectionEndIndexedRegion instanceof CommentImpl) {
							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
						}
					}
					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
				}
				catch (BadLocationException e) {
					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
				}
				finally {
					model.changedModel();
					model.endRecording(this);
				}
			}
			finally {
				model.releaseFromEdit();
			}
		}
	}

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.RemoveBlockComment_label);
			action.setToolTipText(XMLUIMessages.RemoveBlockComment_tooltip);
			action.setDescription(XMLUIMessages.RemoveBlockComment_description);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.xml.ui.internal.Logger;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Toggle comment action delegate for XML editor
 */
public class ToggleCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {
	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.ToggleComment_label);
			action.setToolTipText(XMLUIMessages.ToggleComment_tooltip);
			action.setDescription(XMLUIMessages.ToggleComment_description);
		}
	}

	void processAction(IDocument document, ITextSelection textSelection) {
		// get text selection lines info
		int selectionStartLine = textSelection.getStartLine();
		int selectionEndLine = textSelection.getEndLine();
		try {
			int selectionEndLineOffset = document.getLineOffset(selectionEndLine);
			int selectionEndOffset = textSelection.getOffset() + textSelection.getLength();

			// adjust selection end line
			if (selectionEndLine > selectionStartLine && selectionEndLineOffset == selectionEndOffset)
				selectionEndLine--;

		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}

		// save the selection position since it will be changing
		Position selectionPosition = null;
		boolean updateStartOffset = false;
		try {
			selectionPosition = new Position(textSelection.getOffset(), textSelection.getLength());
			document.addPosition(selectionPosition);

			// extra check if commenting from beginning of line
			int selectionStartLineOffset = document.getLineOffset(selectionStartLine);
			if (textSelection.getLength() > 0 && selectionStartLineOffset == textSelection.getOffset() && !isCommentLine(document, selectionStartLine))
				updateStartOffset = true;
		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}

		processAction(document, selectionStartLine, selectionEndLine);

		updateCurrentSelection(selectionPosition, document, updateStartOffset);
	}

	private void processAction(IDocument document, int selectionStartLine, int selectionEndLine) {
		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
		if (model != null) {
			try {
				model.beginRecording(this, XMLUIMessages.ToggleComment_tooltip);
				model.aboutToChangeModel();

				for (int i = selectionStartLine; i <= selectionEndLine; i++) {
					try {
						if (document.getLineLength(i) > 0) {
							if (isCommentLine(document, i)) {
								int lineOffset = document.getLineOffset(i);
								IRegion region = document.getLineInformation(i);
								String string = document.get(region.getOffset(), region.getLength());
								int openCommentOffset = lineOffset + string.indexOf(OPEN_COMMENT);
								int closeCommentOffset = lineOffset + string.indexOf(CLOSE_COMMENT) - OPEN_COMMENT.length();
								uncomment(document, openCommentOffset, closeCommentOffset);
							}
							else {
								int openCommentOffset = document.getLineOffset(i);
								int lineDelimiterLength = document.getLineDelimiter(i) == null ? 0 : document.getLineDelimiter(i).length();
								int closeCommentOffset = openCommentOffset + document.getLineLength(i) - lineDelimiterLength + OPEN_COMMENT.length();
								comment(document, openCommentOffset, closeCommentOffset);
							}
						}
					}
					catch (BadLocationException e) {
						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
					}
				}
			}
			finally {
				model.changedModel();
				model.endRecording(this);
				model.releaseFromEdit();
			}
		}
	}

	private boolean isCommentLine(IDocument document, int line) {
		boolean isComment = false;

		try {
			IRegion region = document.getLineInformation(line);
			String string = document.get(region.getOffset(), region.getLength()).trim();
			isComment = string.length() >= OPEN_COMMENT.length() + CLOSE_COMMENT.length() && string.startsWith(OPEN_COMMENT) && string.endsWith(CLOSE_COMMENT);
		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}
		return isComment;
	}

	private void comment(IDocument document, int openCommentOffset, int closeCommentOffset) {
		try {
			document.replace(openCommentOffset, 0, OPEN_COMMENT);
			document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
			removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}
	}

	private void uncomment(IDocument document, int openCommentOffset, int closeCommentOffset) {
		try {
			document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
			document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
		}
		catch (BadLocationException e) {
			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
		}
	}

	private void updateCurrentSelection(Position selectionPosition, IDocument document, boolean updateStartOffset) {
		if (fEditor instanceof ITextEditor) {
			// update the selection if text selection changed
			if (selectionPosition != null) {
				ITextSelection selection = null;
				if (updateStartOffset)
					selection = new TextSelection(document, selectionPosition.getOffset() - OPEN_COMMENT.length(), selectionPosition.getLength() + OPEN_COMMENT.length());
				else
					selection = new TextSelection(document, selectionPosition.getOffset(), selectionPosition.getLength());
				ISelectionProvider provider = ((ITextEditor) fEditor).getSelectionProvider();
				if (provider != null) {
					provider.setSelection(selection);
				}
				document.removePosition(selectionPosition);
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.search;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionDelegate;

/**
 * Sets up FindOccurrencesActionDelegate for xml find occurrences processors
 */
public class XMLFindOccurrencesActionDelegate extends FindOccurrencesActionDelegate {
	private List fProcessors;

	protected List getProcessors() {
		if (fProcessors == null) {
			fProcessors = new ArrayList();
			XMLFindOccurrencesProcessor htmlProcessor = new XMLFindOccurrencesProcessor();
			fProcessors.add(htmlProcessor);
		}
		return fProcessors;
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.search;

import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;

/**
 * Configures a FindOccurrencesProcessor with XML partitions and regions
 */
public class XMLFindOccurrencesProcessor extends FindOccurrencesProcessor {

	protected String[] getPartitionTypes() {
		return new String[]{IXMLPartitions.XML_DEFAULT};
	}

	protected String[] getRegionTypes() {
		return new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE};
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.selection;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Region;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
import org.w3c.dom.Node;

public class StructuredSelectEnclosingXMLActionDelegate extends StructuredSelectActionDelegate {

	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
		IndexedRegion indexedRegion = null;
		
		indexedRegion = getIndexedRegion(document, textSelection.getOffset());

		return indexedRegion;
	}

	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
		Region newRegion = null;
		if (indexedRegion instanceof Node) {
			Node cursorNode = (Node) indexedRegion;

			// use parent node for empty text node
			if (cursorNode.getNodeType() == Node.TEXT_NODE && cursorNode.getNodeValue().trim().length() == 0) {
				cursorNode = cursorNode.getParentNode();

				if (cursorNode instanceof IndexedRegion)
					indexedRegion = (IndexedRegion) cursorNode;
			}

			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());

			if (cursorNodeRegion.getOffset() >= textSelection.getOffset() && cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength()) {
				Node newNode = cursorNode.getParentNode();

				if (newNode instanceof IndexedRegion) {
					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
				}
			}
			else
				newRegion = cursorNodeRegion;
		}
		return newRegion;
	}

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.StructureSelectEnclosing_label);
			action.setToolTipText(XMLUIMessages.StructureSelectEnclosing_tooltip);
			action.setDescription(XMLUIMessages.StructureSelectEnclosing_description);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.selection;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
import org.w3c.dom.Node;

public class StructuredSelectNextXMLActionDelegate extends StructuredSelectActionDelegate {

	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
		int offset = textSelection.getOffset() + textSelection.getLength();
		if (offset < 0)
			offset = 0;

		IndexedRegion indexedRegion = null;

		indexedRegion = getIndexedRegion(document, offset);

		return indexedRegion;
	}

	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
		Region newRegion = null;
		if (indexedRegion instanceof Node) {
			Node cursorNode = (Node) indexedRegion;

			// use parent node for empty text node
			if (cursorNode.getNodeType() == Node.TEXT_NODE && cursorNode.getNodeValue().trim().length() == 0) {
				cursorNode = cursorNode.getParentNode();

				if (cursorNode instanceof IndexedRegion)
					indexedRegion = (IndexedRegion) cursorNode;
			}

			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());

			if (cursorNodeRegion.getOffset() >= textSelection.getOffset() && cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength()) {
				Node newNode = cursorNode.getNextSibling();
				if (newNode == null) {
					newNode = cursorNode.getParentNode();

					if (newNode instanceof IndexedRegion) {
						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
					}
				}
				else {
					if (newNode instanceof IndexedRegion) {
						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
						newRegion = new Region(textSelection.getOffset(), newIndexedRegion.getEndOffset() - textSelection.getOffset());

						if (newNode.getNodeType() == Node.TEXT_NODE)
							newRegion = getNewSelectionRegion(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
					}
				}
			}
			else
				newRegion = cursorNodeRegion;
		}
		return newRegion;
	}

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.StructureSelectNext_label);
			action.setToolTipText(XMLUIMessages.StructureSelectNext_tooltip);
			action.setDescription(XMLUIMessages.StructureSelectNext_description);
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are 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
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     
 *******************************************************************************/

package org.eclipse.wst.xml.ui.internal.selection;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
import org.w3c.dom.Node;

public class StructuredSelectPreviousXMLActionDelegate extends StructuredSelectActionDelegate {

	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
		IndexedRegion indexedRegion = null;

		indexedRegion = getIndexedRegion(document, textSelection.getOffset());

		return indexedRegion;
	}

	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
		Region newRegion = null;
		if (indexedRegion instanceof Node) {
			Node cursorNode = (Node) indexedRegion;

			// use parent node for empty text node
			if (cursorNode.getNodeType() == Node.TEXT_NODE && cursorNode.getNodeValue().trim().length() == 0) {
				cursorNode = cursorNode.getParentNode();

				if (cursorNode instanceof IndexedRegion)
					indexedRegion = (IndexedRegion) cursorNode;
			}

			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());

			if (cursorNodeRegion.getOffset() >= textSelection.getOffset() && cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset() && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength()) {
				Node newNode = cursorNode.getPreviousSibling();
				if (newNode == null) {
					newNode = cursorNode.getParentNode();

					if (newNode instanceof IndexedRegion) {
						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
					}
				}
				else {
					if (newNode instanceof IndexedRegion) {
						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
						newRegion = new Region(newIndexedRegion.getStartOffset(), textSelection.getOffset() + textSelection.getLength() - newIndexedRegion.getStartOffset());

						if (newNode.getNodeType() == Node.TEXT_NODE)
							newRegion = getNewSelectionRegion(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
					}
				}

			}
			else
				newRegion = cursorNodeRegion;
		}
		return newRegion;
	}

	public void init(IAction action) {
		if (action != null) {
			action.setText(XMLUIMessages.StructureSelectPrevious_label);
			action.setToolTipText(XMLUIMessages.StructureSelectPrevious_tooltip);
			action.setDescription(XMLUIMessages.StructureSelectPrevious_description);
		}
	}

}

Return to bug 109468

Lines 49-52 Link Here

(-)plugin.properties (-1 / +19 lines)
49	###############################################################################	49	###############################################################################
50	_UI_XML_VALIDATOR = XML Validator	50	_UI_XML_VALIDATOR = XML Validator
51	_UI_REF_FILE_SHOW_DETAILS = Show Details...	51	_UI_REF_FILE_SHOW_DETAILS = Show Details...
52	_UI_MENU_VALIDATE_XML = Validate XML File	52	_UI_MENU_VALIDATE_XML = Validate XML File
		53	##
		54	CleanupDocument_label=Cleanup Document...
		55	CleanupDocument_tooltip=Cleanup Document
		56	ToggleComment_label=Toggle Comment
		57	ToggleComment_tooltip=Toggle Comment
		58	AddBlockComment_label=Add Block Comment
		59	AddBlockComment_tooltip=Add Block Comment
		60	RemoveBlockComment_label=Remove Block Comment
		61	RemoveBlockComment_tooltip=Remove Block Comment
		62	FindOccurrences_label=Occurrences in File
		63	StructureSelectEnclosing_label=Enclosing Element
		64	StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
		65	StructureSelectNext_label=Next Element
		66	StructureSelectNext_tooltip=Expand selection to include next sibling
		67	StructureSelectPrevious_label=Previous Element
		68	StructureSelectPrevious_tooltip=Expand selection to include previous sibling
		69	StructureSelectHistory_label=Restore Last Selection
		70	StructureSelectHistory_tooltip=Restore last selection

Lines 477-481 Link Here

(-)plugin.xml (-1 / +77 lines)
477	</validator>	477	</validator>
478	</extension>	478	</extension>
479		479
480		480	<extension point="org.eclipse.ui.editorActions">
		481	<editorContribution
		482	id="org.eclipse.core.runtime.xml.source.editorActions"
		483	targetID="org.eclipse.core.runtime.xml.source">
		484	<action
		485	id="CleanupDocument"
		486	label="%CleanupDocument_label"
		487	definitionId="org.eclipse.wst.sse.ui.cleanup.document"
		488	tooltip="%CleanupDocument_tooltip"
		489	class="org.eclipse.wst.xml.ui.internal.actions.CleanupActionXMLDelegate"
		490	actionID="CleanupDocument">
		491	</action>
		492	<action
		493	id="ToggleComment"
		494	label="%ToggleComment_label"
		495	definitionId="org.eclipse.wst.sse.ui.toggle.comment"
		496	tooltip="%ToggleComment_tooltip"
		497	class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
		498	actionID="ToggleComment">
		499	</action>
		500	<action
		501	id="AddBlockComment"
		502	label="%AddBlockComment_label"
		503	definitionId="org.eclipse.wst.sse.ui.add.block.comment"
		504	tooltip="%AddBlockComment_tooltip"
		505	class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
		506	actionID="AddBlockComment">
		507	</action>
		508	<action
		509	id="RemoveBlockComment"
		510	label="%RemoveBlockComment_label"
		511	definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
		512	tooltip="%RemoveBlockComment_tooltip"
		513	class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
		514	actionID="RemoveBlockComment">
		515	</action>
		516	<action
		517	id="FindOccurrences"
		518	label="%FindOccurrences_label"
		519	definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
		520	class="org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesActionDelegate"
		521	actionID="FindOccurrences">
		522	</action>
		523	<action
		524	id="StructureSelectEnclosing"
		525	label="%StructureSelectEnclosing_label"
		526	definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
		527	tooltip="%StructureSelectEnclosing_tooltip"
		528	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
		529	actionID="StructureSelectEnclosing">
		530	</action>
		531	<action
		532	id="StructureSelectNext"
		533	label="%StructureSelectNext_label"
		534	definitionId="org.eclipse.wst.sse.ui.structure.select.next"
		535	tooltip="%StructureSelectNext_tooltip"
		536	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
		537	actionID="StructureSelectNext">
		538	</action>
		539	<action
		540	id="StructureSelectPrevious"
		541	label="%StructureSelectPrevious_label"
		542	definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
		543	tooltip="%StructureSelectPrevious_tooltip"
		544	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
545	actionID="StructureSelectPrevious">
546	</action>
547	<action
548	id="StructureSelectHistory"
549	label="%StructureSelectHistory_label"
550	definitionId="org.eclipse.wst.sse.ui.structure.select.last"
551	tooltip="%StructureSelectHistory_tooltip"
552	class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
553	actionID="StructureSelectHistory">
554	</action>
555	</editorContribution>
556	</extension>
481	</plugin>	557	</plugin>

Lines 269-287 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties (-5 / +14 lines)
269	Uncomment_label=&Uncomment	269	Uncomment_label=&Uncomment
270	Uncomment_tooltip=Uncomment	270	Uncomment_tooltip=Uncomment
271	Uncomment_description=Uncomment	271	Uncomment_description=Uncomment
272	ToggleComment_label=Togg&le Comment	272	ToggleComment_label=Toggle Comment
273	ToggleComment_tooltip=Toggle Comment	273	ToggleComment_tooltip=Toggle Comment
274	ToggleComment_description=Toggle Comment	274	ToggleComment_description=Toggle Comment
275	AddBlockComment_label=Add &Block Comment	275	AddBlockComment_label=Add Block Comment
276	AddBlockComment_tooltip=Add Block Comment	276	AddBlockComment_tooltip=Add Block Comment
277	AddBlockComment_description=Add Block Comment	277	AddBlockComment_description=Add Block Comment
278	RemoveBlockComment_label=Remove Bloc&k Comment	278	RemoveBlockComment_label=Remove Block Comment
279	RemoveBlockComment_tooltip=Remove Block Comment	279	RemoveBlockComment_tooltip=Remove Block Comment
280	RemoveBlockComment_description=Remove Block Comment	280	RemoveBlockComment_description=Remove Block Comment
281	CleanupDocument_label=C&leanup Document...	281	CleanupDocument_label=Cleanup Document...
282	CleanupDocument_tooltip=Cleanup Document	282	CleanupDocument_tooltip=Cleanup Document
283	CleanupDocument_description=Cleanup Document	283	CleanupDocument_description=Cleanup Document
284	FindOccurrences_label=O&ccurrences in File	284	FindOccurrences_label=Occurrences in File
285	ShowTooltipDesc_label=Show &Tooltip Description	285	ShowTooltipDesc_label=Show &Tooltip Description
286	ShowTooltipDesc_tooltip=Displays the hover help for the selected element	286	ShowTooltipDesc_tooltip=Displays the hover help for the selected element
287	ShowTooltipDesc_description=Displays the hover help for the selected element	287	ShowTooltipDesc_description=Displays the hover help for the selected element
Lines 301-303 Link Here
301	OpenFileFromSource_tooltip=Open an editor on the selected link	301	OpenFileFromSource_tooltip=Open an editor on the selected link
302	OpenFileFromSource_description=Open an editor on the selected link	302	OpenFileFromSource_description=Open an editor on the selected link
303	XMLContentOutlineConfiguration_0=Show Attributes	303	XMLContentOutlineConfiguration_0=Show Attributes
		304	StructureSelectEnclosing_label=Enclosing Element
		305	StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
		306	StructureSelectEnclosing_description=Expand selection to include enclosing element
		307	StructureSelectNext_label=Next Element
		308	StructureSelectNext_tooltip=Expand selection to include next sibling
		309	StructureSelectNext_description=Expand selection to include next sibling
		310	StructureSelectPrevious_label=Previous Element
		311	StructureSelectPrevious_tooltip=Expand selection to include previous sibling
		312	StructureSelectPrevious_description=Expand selection to include previous sibling

Added Link Here

(-)src/org/eclipse/wst/xml/ui/internal/actions/AbstractCommentActionXMLDelegate.java (+115 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*
11	*******************************************************************************/
12
13	package org.eclipse.wst.xml.ui.internal.actions;
14
15	import org.eclipse.jface.action.IAction;
16	import org.eclipse.jface.text.BadLocationException;
17	import org.eclipse.jface.text.IDocument;
18	import org.eclipse.jface.text.ITextSelection;
19	import org.eclipse.jface.text.TextSelection;
20	import org.eclipse.jface.viewers.ISelection;
21	import org.eclipse.jface.viewers.ISelectionProvider;
22	import org.eclipse.swt.widgets.Event;
23	import org.eclipse.ui.IActionDelegate2;
24	import org.eclipse.ui.IEditorActionDelegate;
25	import org.eclipse.ui.IEditorPart;
26	import org.eclipse.ui.IViewActionDelegate;
27	import org.eclipse.ui.IViewPart;
28	import org.eclipse.ui.texteditor.ITextEditor;
29	import org.eclipse.wst.xml.ui.internal.Logger;
30
31	/**
32	* Abstract comment action delegate for XML editors
33	*/
34	abstract public class AbstractCommentActionXMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
35	static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$
36	static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$
37
38	IEditorPart fEditor;
39
40	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
41	fEditor = targetEditor;
42	}
43
44	public void dispose() {
45	// nulling out just in case
46	fEditor = null;
47	}
48
49	public void runWithEvent(IAction action, Event event) {
50	run(action);
51	}
52
53	public void run(IAction action) {
54	if (fEditor instanceof ITextEditor) {
55	ITextEditor textEditor = (ITextEditor) fEditor;
56	IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
57	if (document != null) {
58	// get current text selection
59	ITextSelection textSelection = getCurrentSelection();
60	if (textSelection.isEmpty())
61	return;
62
63	processAction(document, textSelection);
64	}
65	}
66	}
67
68	public void init(IViewPart view) {
69	// do nothing
70	}
71
72	public void selectionChanged(IAction action, ISelection selection) {
73	// do nothing
74	}
75
76	private ITextSelection getCurrentSelection() {
77	if (fEditor instanceof ITextEditor) {
78	ISelectionProvider provider = ((ITextEditor) fEditor).getSelectionProvider();
79	if (provider != null) {
80	ISelection selection = provider.getSelection();
81	if (selection instanceof ITextSelection)
82	return (ITextSelection) selection;
83	}
84	}
85	return TextSelection.emptySelection();
86	}
87
88	abstract void processAction(IDocument document, ITextSelection textSelection);
89
90	void removeOpenCloseComments(IDocument document, int offset, int length) {
91	try {
92	int adjusted_length = length;
93
94	// remove open comments
95	String string = document.get(offset, length);
96	int index = string.lastIndexOf(OPEN_COMMENT);
97	while (index != -1) {
98	document.replace(offset + index, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
99	index = string.lastIndexOf(OPEN_COMMENT, index - 1);
100	adjusted_length -= OPEN_COMMENT.length();
101	}
102
103	// remove close comments
104	string = document.get(offset, adjusted_length);
105	index = string.lastIndexOf(CLOSE_COMMENT);
106	while (index != -1) {
107	document.replace(offset + index, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
108	index = string.lastIndexOf(CLOSE_COMMENT, index - 1);
109	}
110	}
111	catch (BadLocationException e) {
112	Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
113	}
114	}
115	}