Attachment #27089 for bug #109468

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




AddBookmark.tooltip=Add Bookmark...
## EL Error Message
JSPEL_Syntax_Error=JSP EL Syntax Error
##
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
RenameElement_label=Rename
MoveElement_label=Move
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




			icon="icons//full/obj16/sourceEditor.gif"
			extensions="jsp, jsf, jspf, jspx, tag, tagf"
			contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"
			class="org.eclipse.wst.sse.ui.internal.StructuredTextEditor"
			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
			id="org.eclipse.jst.jsp.core.jspsource.source">
			<contentTypeBinding

	<!-- JSP Editor specific actions                                                          -->
	<!--======================================================================================-->
	<extension point="org.eclipse.ui.commands">
		<scope
			name="%scope.structured.text.editor.jsp.name"
			parent="org.eclipse.ui.textEditorScope"
			description="%scope.structured.text.editor.jsp.description"
			id="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope" />

		<!-- dmw 6/6 removed from 'scope'      parentId="org.eclipse.ui.textEditorScope" -->
		<!-- rename refactor -->
		<command
			name="%command.jsp.refactor.rename.name"
			description="%command.jsp.refactor.rename.description"
			categoryId="org.eclipse.ui.category.edit"
			id="org.eclipse.jst.jsp.ui.refactor.rename" />

		<keyBinding
			string="Alt+Shift+R"
			scope="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
			command="org.eclipse.jst.jsp.ui.refactor.rename"
			configuration="org.eclipse.ui.defaultAcceleratorConfiguration" />

		<!-- move refactor -->
		<command
			name="%command.jsp.refactor.move.name"
			description="%command.jsp.refactor.move.description"
			categoryId="org.eclipse.ui.category.edit"
			id="org.eclipse.jst.jsp.ui.refactor.move" />
	</extension>
	
	<!-- Keybinding scope for jsp source editor -->
	<extension point="org.eclipse.ui.contexts">
		<context
			name="%scope.structured.text.editor.jsp.name"
			parentId="org.eclipse.ui.textEditorScope"
			description="%scope.structured.text.editor.jsp.description"
			id="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope">
		</context>
	</extension>
	
	<!-- Keybindings for jsp source editor -->
	<extension point="org.eclipse.ui.bindings">
		<!-- rename refactor -->
		<key
			sequence="Alt+Shift+R"
			contextId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
			commandId="org.eclipse.jst.jsp.ui.refactor.rename"
			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
		</key>

		<!-- move refactor -->
		<key
			sequence="Alt+Shift+V"
			contextId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
			commandId="org.eclipse.jst.jsp.ui.refactor.move"
			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
		</key>
	</extension>

	<!--======================================================================================-->

		</viewerContribution>
	</extension>

	<extension point="org.eclipse.ui.editorActions">
		<editorContribution
			id="org.eclipse.jst.jsp.core.jspsource.source.editorActions"
			targetID="org.eclipse.jst.jsp.core.jspsource.source">
			<action
				id="CleanupDocument"
				label="%CleanupDocument_label"
				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
				tooltip="%CleanupDocument_tooltip"
				class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupActionHTMLDelegate"
				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="RenameElement"
				label="%RenameElement_label"
				definitionId="org.eclipse.jst.jsp.ui.refactor.rename"
				class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
				actionID="RenameElement">
			</action>
			<action
				id="MoveElement"
				label="%MoveElement_label"
				definitionId="org.eclipse.jst.jsp.ui.refactor.move"
				class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
				actionID="MoveElement">
			</action>
			<action
				id="FindOccurrences"
				label="%FindOccurrences_label"
				definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
				class="org.eclipse.jst.jsp.ui.internal.java.search.JSPFindOccurrencesActionDelegate"
				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>




## Welcome!
Sample_JSP_doc=<%@ page \n\tlanguage=\"java\" \n\tcontentType=\"text/html; charset=ISO-8859-1\"\n%>\n<jsp:include flush=\"true\" page=\"titleBar.jsp\"/>\n\n<%-- Use below tags ONLY for JSP 1.1 --%>\n<%\n\tSystem.out.println(\"Welcome!\");\n%>\n<%-- Use below tags ONLY for JSP 1.2 --%>\n<jsp:scriptlet>\n\tSystem.out.println(\"Welcome!\");\n</jsp:scriptlet>
JSP_Delimiters_UI_=JSP Delimiters
Refactor_label=Refactor
RenameElement_label=Rename
MoveElement_label=Move
MoveElementWizard=Move the selected elements
#
OK=OK

NewJSPTemplatesWizardPage_5=Preview
NewJSPTemplatesWizardPage_6=Templates are 'New JSP' templates found in the <a>JSP Templates</a> preference page.
# Copied from sse.ui
CleanupDocument_label=Cleanup Document...
CleanupDocument_tooltip=Cleanup Document
CleanupDocument_description=Cleanup Document
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
FindOccurrences_label=Occurrences in File
OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}
OccurrencesSearchQuery_2=file
Content_Assist_not_availab_UI_=Content Assist not available at the current location

Lines 32-37 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/editor/StructuredTextEditorJSP.java (+4 lines)
32	import org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXML;	32	import org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXML;
33	import org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXML;	33	import org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXML;
34		34
		35	/**
		36	* @deprecated JSP editor is created from StructuredTextEditor with
		37	* JSP configurations
		38	*/
35	public class StructuredTextEditorJSP extends StructuredTextEditor {	39	public class StructuredTextEditorJSP extends StructuredTextEditor {
36	private final static String UNDERSCORE = "_"; //$NON-NLS-1$	40	private final static String UNDERSCORE = "_"; //$NON-NLS-1$
37		41

Lines 41-47 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMoveElementAction.java (-1 / +2 lines)
41	* Still relies heavily on internal API	41	* Still relies heavily on internal API
42	* will change post 3.0 with public move support	42	* will change post 3.0 with public move support
43	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817	43	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
44	* @author pavery	44	*
		45	* @deprecated use JSPMoveElementActionDelegate instead
45	*/	46	*/
46	public class JSPMoveElementAction extends TextEditorAction {	47	public class JSPMoveElementAction extends TextEditorAction {
47		48

Lines 28-34 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPRenameElementAction.java (-1 / +1 lines)
28	/**	28	/**
29	* A TextEditorAction that launches JDT rename element wizard	29	* A TextEditorAction that launches JDT rename element wizard
30	*	30	*
31	* @author pavery	31	* @deprecated use JSPRenameElementActionDelegate instead
32	*/	32	*/
33	public class JSPRenameElementAction extends TextEditorAction {	33	public class JSPRenameElementAction extends TextEditorAction {
34		34

Lines 36-42 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesAction.java (-1 / +1 lines)
36	* Finds occurrences of Java elements in a JSP file using JSPSearchSupport.	36	* Finds occurrences of Java elements in a JSP file using JSPSearchSupport.
37	* </p>	37	* </p>
38	*	38	*
39	* @author pavery	39	* @deprecated use JSPFindOccurrencesProcessor instead
40	*/	40	*/
41	public class JSPFindOccurrencesAction extends BasicFindOccurrencesAction implements IJavaSearchConstants {	41	public class JSPFindOccurrencesAction extends BasicFindOccurrencesAction implements IJavaSearchConstants {
42		42




/*******************************************************************************
 * 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.jst.jsp.ui.internal.java.refactoring;

import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor;
import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter;
import org.eclipse.jdt.internal.ui.refactoring.reorg.CreateTargetQueries;
import org.eclipse.jdt.internal.ui.refactoring.reorg.ReorgMoveWizard;
import org.eclipse.jdt.internal.ui.refactoring.reorg.ReorgQueries;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
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.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;

/**
 * An action delegate that launches JDT move element wizard
 * 
 * Still relies heavily on internal API
 * will change post 3.0 with public move support
 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817 
 */
public class JSPMoveElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
	private IEditorPart fEditor;

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

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

	public void init(IAction action) {
		if (action != null) {
			action.setText(JSPUIMessages.MoveElement_label);
			action.setToolTipText(JSPUIMessages.MoveElement_label);
		}
	}

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

	public void run(IAction action) {
		IJavaElement[] elements = getSelectedElements();
		if (elements.length > 0) {

			// need to check if it's movable
			try {
				JavaMoveProcessor processor = JavaMoveProcessor.create(getResources(elements), elements/*
																										 * ,
																										 * getCodeGenerationSettings()
																										 */);
				Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();

				MoveRefactoring refactoring = new MoveRefactoring(processor);

				RefactoringWizard wizard = createWizard(refactoring);

				/*
				 * We want to get the shell from the refactoring dialog but
				 * it's not known at this point, so we pass the wizard and
				 * then, once the dialog is open, we will have access to its
				 * shell.
				 */

				processor.setCreateTargetQueries(new CreateTargetQueries(wizard));
				processor.setReorgQueries(new ReorgQueries(wizard));
				// String openRefactoringWizMsg =
				// RefactoringMessages.getString("OpenRefactoringWizardAction.refactoring");
				// //$NON-NLS-1$
				String openRefactoringWizMsg = JSPUIMessages.MoveElementWizard; // "Move
																				// the
																				// selected
																				// elements";
																				// //$NON-NLS-1$
				new RefactoringStarter().activate(refactoring, wizard, parent, openRefactoringWizMsg, true);

				PlatformStatusLineUtil.clearStatusLine();

			}
			catch (JavaModelException e) {
				Logger.logException(e);
			}
		}
		else {
			PlatformStatusLineUtil.displayErrorMessage(JSPUIMessages.JSPMoveElementAction_0); //$NON-NLS-1$
		}
	}

	public void selectionChanged(IAction action, ISelection selection) {
		PlatformStatusLineUtil.clearStatusLine();
	}

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

	private IJavaElement[] getSelectedElements() {

		IJavaElement[] elements = new IJavaElement[0];
		if (fEditor instanceof ITextEditor)
			elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor);
		return elements;
	}

	private IResource[] getResources(IJavaElement[] elements) {
		IResource[] resources = new IResource[elements.length];
		for (int i = 0; i < elements.length; i++) {
			try {
				resources[i] = elements[i].getPrimaryElement().getCorrespondingResource();// elements[i].getResource();
			}
			catch (JavaModelException e) {
				Logger.logException(e);
			}
		}
		return resources;
	}
	
	/**
	 * will change post 3.0 with public move support
	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
	 */
	private RefactoringWizard createWizard(MoveRefactoring refactoring) {
		return new ReorgMoveWizard(refactoring);
	}
}




/*******************************************************************************
 * 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.jst.jsp.ui.internal.java.refactoring;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.ui.refactoring.RenameSupport;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.Logger;
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.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;

/**
 * An action delegate that launches JDT rename element wizard
 */
public class JSPRenameElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
	private IEditorPart fEditor;
	
	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
		fEditor = targetEditor;
	}

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

	public void init(IAction action) {
		if (action != null) {
			action.setText(JSPUIMessages.RenameElement_label);
			action.setToolTipText(JSPUIMessages.RenameElement_label);
		}
	}

	public void runWithEvent(IAction action, Event event) {
		run(action);
	}
	
	public void run(IAction action) {
		IJavaElement element = getSelectedElement();
		if(element != null) {
			RenameSupport renameSupport = null;
			try {
				switch(element.getElementType()) {
					case IJavaElement.TYPE:
						renameSupport= RenameSupport.create((IType)element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
						break;
					case IJavaElement.METHOD:
						renameSupport= RenameSupport.create((IMethod)element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
						break;
					case IJavaElement.PACKAGE_FRAGMENT:
						renameSupport= RenameSupport.create((IPackageFragment)element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
						break;
				}
				if(renameSupport != null) {
					renameSupport.openDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
					PlatformStatusLineUtil.clearStatusLine();
				}
			}
			catch (CoreException e) {
				Logger.logException(e);
			}
		}
		else  {
			PlatformStatusLineUtil.displayErrorMessage(JSPUIMessages.JSPRenameElementAction_0); //$NON-NLS-1$
			PlatformStatusLineUtil.addOneTimeClearListener();
		}
	}
	
	public void selectionChanged(IAction action, ISelection selection) {
		PlatformStatusLineUtil.clearStatusLine();
	}

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

	private IJavaElement getSelectedElement() {
		IJavaElement element = null;
		if (fEditor instanceof ITextEditor) {
			IJavaElement[] elements = JSPJavaSelectionProvider.getSelection((ITextEditor)fEditor);
			if (elements.length == 1)
				element = elements[0];
		}
		return element;
	}
}




/*******************************************************************************
 * 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.jst.jsp.ui.internal.java.search;

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

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

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

	protected List getProcessors() {
		if (fProcessors == null) {
			fProcessors = new ArrayList();
			HTMLFindOccurrencesProcessor htmlProcessor = new HTMLFindOccurrencesProcessor();
			fProcessors.add(htmlProcessor);
//			 temporary, workaround to disable function, since using the function 
//			 can easily cause deadlock to occur.
//					 See https://bugs.eclipse.org/bugs/show_bug.cgi?id=103662
//			JSPFindOccurrencesProcessor jspProcessor = new JSPFindOccurrencesProcessor();
//			fProcessors.add(jspProcessor);
		}
		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.jst.jsp.ui.internal.java.search;

import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
import org.eclipse.jst.jsp.core.internal.provisional.text.IJSPPartitionTypes;
import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
import org.eclipse.search.ui.ISearchQuery;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;

/**
 * Configures a FindOccurrencesProcessor with JSP partitions and regions
 */
public class JSPFindOccurrencesProcessor extends FindOccurrencesProcessor {

	protected String[] getPartitionTypes() {
		return new String[]{IJSPPartitionTypes.JSP_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_JAVA};
	}

	protected String[] getRegionTypes() {
		return new String[]{DOMRegionContext.BLOCK_TEXT, DOMJSPRegionContexts.JSP_CONTENT};
	}

	protected ISearchQuery getSearchQuery(IFile file, IStructuredDocument document, String regionText, String regionType, ITextSelection textSelection) {
		return new JSPSearchQuery(file, getJavaElement(document, textSelection));
	}

	private IJavaElement getJavaElement(IDocument document, ITextSelection textSelection) {
		IJavaElement[] elements = getJavaElementsForCurrentSelection(document, textSelection);
		return elements.length > 0 ? elements[0] : null;
	}

	/**
	 * uses JSPTranslation to get currently selected Java elements.
	 * 
	 * @return currently selected IJavaElements
	 */
	private IJavaElement[] getJavaElementsForCurrentSelection(IDocument document, ITextSelection selection) {
		IJavaElement[] elements = new IJavaElement[0];
		// get JSP translation object for this viewer's document
		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
		try {
			if (model != null && model instanceof IDOMModel) {
				IDOMDocument xmlDoc = ((IDOMModel) model).getDocument();
				JSPTranslationAdapter adapter = (JSPTranslationAdapter) xmlDoc.getAdapterFor(IJSPTranslation.class);
				if (adapter != null) {
					JSPTranslation translation = adapter.getJSPTranslation();

					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102211
					elements = translation.getElementsFromJspRange(selection.getOffset(), selection.getOffset() + selection.getLength());
				}
			}
		}
		finally {
			if (model != null)
				model.releaseFromRead();
		}
		return elements;
	}
}

Return to bug 109468

Lines 8-14 Link Here

(-)plugin.xml (-23 / +122 lines)
8	icon="icons//full/obj16/sourceEditor.gif"	8	icon="icons//full/obj16/sourceEditor.gif"
9	extensions="jsp, jsf, jspf, jspx, tag, tagf"	9	extensions="jsp, jsf, jspf, jspx, tag, tagf"
10	contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"	10	contributorClass="org.eclipse.jst.jsp.ui.internal.editor.ActionContributorJSP"
11	class="org.eclipse.jst.jsp.ui.internal.editor.StructuredTextEditorJSP"	11	class="org.eclipse.wst.sse.ui.internal.StructuredTextEditor"
12	symbolicFontName="org.eclipse.wst.sse.ui.textfont"	12	symbolicFontName="org.eclipse.wst.sse.ui.textfont"
13	id="org.eclipse.jst.jsp.core.jspsource.source">	13	id="org.eclipse.jst.jsp.core.jspsource.source">
14	<contentTypeBinding	14	<contentTypeBinding
Lines 277-315 Link Here
277	<!-- JSP Editor specific actions -->	277	<!-- JSP Editor specific actions -->
278	<!--======================================================================================-->	278	<!--======================================================================================-->
279	<extension point="org.eclipse.ui.commands">	279	<extension point="org.eclipse.ui.commands">
280	<scope
281	name="%scope.structured.text.editor.jsp.name"
282	parent="org.eclipse.ui.textEditorScope"
283	description="%scope.structured.text.editor.jsp.description"
284	id="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope" />
285
286	<!-- dmw 6/6 removed from 'scope' parentId="org.eclipse.ui.textEditorScope" -->
287	<!-- rename refactor -->	280	<!-- rename refactor -->
288	<command	281	<command
289	name="%command.jsp.refactor.rename.name"	282	name="%command.jsp.refactor.rename.name"
290	description="%command.jsp.refactor.rename.description"	283	description="%command.jsp.refactor.rename.description"
291	category="org.eclipse.ui.category.edit"	284	categoryId="org.eclipse.ui.category.edit"
292	id="org.eclipse.jst.jsp.ui.refactor.rename" />	285	id="org.eclipse.jst.jsp.ui.refactor.rename" />
293		286
294	<keyBinding
295	string="Alt+Shift+R"
296	scope="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
297	command="org.eclipse.jst.jsp.ui.refactor.rename"
298	configuration="org.eclipse.ui.defaultAcceleratorConfiguration" />
299
300	<!-- move refactor -->	287	<!-- move refactor -->
301	<command	288	<command
302	name="%command.jsp.refactor.move.name"	289	name="%command.jsp.refactor.move.name"
303	description="%command.jsp.refactor.move.description"	290	description="%command.jsp.refactor.move.description"
304	category="org.eclipse.ui.category.edit"	291	categoryId="org.eclipse.ui.category.edit"
305	id="org.eclipse.jst.jsp.ui.refactor.move" />	292	id="org.eclipse.jst.jsp.ui.refactor.move" />
		293	</extension>
		294
		295	<!-- Keybinding scope for jsp source editor -->
		296	<extension point="org.eclipse.ui.contexts">
		297	<context
		298	name="%scope.structured.text.editor.jsp.name"
		299	parentId="org.eclipse.ui.textEditorScope"
		300	description="%scope.structured.text.editor.jsp.description"
		301	id="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope">
		302	</context>
		303	</extension>
		304
		305	<!-- Keybindings for jsp source editor -->
		306	<extension point="org.eclipse.ui.bindings">
		307	<!-- rename refactor -->
		308	<key
		309	sequence="Alt+Shift+R"
		310	contextId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
		311	commandId="org.eclipse.jst.jsp.ui.refactor.rename"
		312	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
		313	</key>
306		314
307	<keyBinding	315	<!-- move refactor -->
308	string="Alt+Shift+V"	316	<key
309	scope="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"	317	sequence="Alt+Shift+V"
310	command="org.eclipse.jst.jsp.ui.refactor.move"	318	contextId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope"
311	configuration="org.eclipse.ui.defaultAcceleratorConfiguration" />	319	commandId="org.eclipse.jst.jsp.ui.refactor.move"
312		320	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
		321	</key>
313	</extension>	322	</extension>
314		323
315	<!--======================================================================================-->	324	<!--======================================================================================-->
Lines 434-438 Link Here
434	</viewerContribution>	443	</viewerContribution>
435	</extension>	444	</extension>
436		445
437		446	<extension point="org.eclipse.ui.editorActions">
		447	<editorContribution
		448	id="org.eclipse.jst.jsp.core.jspsource.source.editorActions"
		449	targetID="org.eclipse.jst.jsp.core.jspsource.source">
		450	<action
		451	id="CleanupDocument"
		452	label="%CleanupDocument_label"
		453	definitionId="org.eclipse.wst.sse.ui.cleanup.document"
		454	tooltip="%CleanupDocument_tooltip"
		455	class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupActionHTMLDelegate"
		456	actionID="CleanupDocument">
		457	</action>
		458	<action
		459	id="ToggleComment"
		460	label="%ToggleComment_label"
		461	definitionId="org.eclipse.wst.sse.ui.toggle.comment"
		462	tooltip="%ToggleComment_tooltip"
		463	class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
		464	actionID="ToggleComment">
		465	</action>
		466	<action
		467	id="AddBlockComment"
		468	label="%AddBlockComment_label"
		469	definitionId="org.eclipse.wst.sse.ui.add.block.comment"
		470	tooltip="%AddBlockComment_tooltip"
		471	class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
		472	actionID="AddBlockComment">
		473	</action>
		474	<action
		475	id="RemoveBlockComment"
		476	label="%RemoveBlockComment_label"
		477	definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
		478	tooltip="%RemoveBlockComment_tooltip"
		479	class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
		480	actionID="RemoveBlockComment">
		481	</action>
		482	<action
		483	id="RenameElement"
		484	label="%RenameElement_label"
		485	definitionId="org.eclipse.jst.jsp.ui.refactor.rename"
		486	class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
		487	actionID="RenameElement">
		488	</action>
		489	<action
		490	id="MoveElement"
		491	label="%MoveElement_label"
		492	definitionId="org.eclipse.jst.jsp.ui.refactor.move"
		493	class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
		494	actionID="MoveElement">
		495	</action>
		496	<action
		497	id="FindOccurrences"
		498	label="%FindOccurrences_label"
		499	definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
		500	class="org.eclipse.jst.jsp.ui.internal.java.search.JSPFindOccurrencesActionDelegate"
		501	actionID="FindOccurrences">
		502	</action>
		503	<action
		504	id="StructureSelectEnclosing"
		505	label="%StructureSelectEnclosing_label"
		506	definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
		507	tooltip="%StructureSelectEnclosing_tooltip"
		508	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
		509	actionID="StructureSelectEnclosing">
		510	</action>
511	<action
512	id="StructureSelectNext"
513	label="%StructureSelectNext_label"
514	definitionId="org.eclipse.wst.sse.ui.structure.select.next"
515	tooltip="%StructureSelectNext_tooltip"
516	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
517	actionID="StructureSelectNext">
518	</action>
519	<action
520	id="StructureSelectPrevious"
521	label="%StructureSelectPrevious_label"
522	definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
523	tooltip="%StructureSelectPrevious_tooltip"
524	class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
525	actionID="StructureSelectPrevious">
526	</action>
527	<action
528	id="StructureSelectHistory"
529	label="%StructureSelectHistory_label"
530	definitionId="org.eclipse.wst.sse.ui.structure.select.last"
531	tooltip="%StructureSelectHistory_tooltip"
532	class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
533	actionID="StructureSelectHistory">
534	</action>
535	</editorContribution>
536	</extension>
438	</plugin>	537	</plugin>

Lines 63-65 Link Here

(-)plugin.properties (+20 lines)
63	AddBookmark.tooltip=Add Bookmark...	63	AddBookmark.tooltip=Add Bookmark...
64	## EL Error Message	64	## EL Error Message
65	JSPEL_Syntax_Error=JSP EL Syntax Error	65	JSPEL_Syntax_Error=JSP EL Syntax Error
		66	##
		67	CleanupDocument_label=Cleanup Document...
		68	CleanupDocument_tooltip=Cleanup Document
		69	ToggleComment_label=Toggle Comment
		70	ToggleComment_tooltip=Toggle Comment
		71	AddBlockComment_label=Add Block Comment
		72	AddBlockComment_tooltip=Add Block Comment
		73	RemoveBlockComment_label=Remove Block Comment
		74	RemoveBlockComment_tooltip=Remove Block Comment
		75	FindOccurrences_label=Occurrences in File
		76	RenameElement_label=Rename
		77	MoveElement_label=Move
		78	StructureSelectEnclosing_label=Enclosing Element
		79	StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
		80	StructureSelectNext_label=Next Element
		81	StructureSelectNext_tooltip=Expand selection to include next sibling
		82	StructureSelectPrevious_label=Previous Element
		83	StructureSelectPrevious_tooltip=Expand selection to include previous sibling
		84	StructureSelectHistory_label=Restore Last Selection
		85	StructureSelectHistory_tooltip=Restore last selection

Lines 15-23 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties (-8 / +8 lines)
15	## Welcome!	15	## Welcome!
16	Sample_JSP_doc=<%@ page \n\tlanguage=\"java\" \n\tcontentType=\"text/html; charset=ISO-8859-1\"\n%>\n<jsp:include flush=\"true\" page=\"titleBar.jsp\"/>\n\n<%-- Use below tags ONLY for JSP 1.1 --%>\n<%\n\tSystem.out.println(\"Welcome!\");\n%>\n<%-- Use below tags ONLY for JSP 1.2 --%>\n<jsp:scriptlet>\n\tSystem.out.println(\"Welcome!\");\n</jsp:scriptlet>	16	Sample_JSP_doc=<%@ page \n\tlanguage=\"java\" \n\tcontentType=\"text/html; charset=ISO-8859-1\"\n%>\n<jsp:include flush=\"true\" page=\"titleBar.jsp\"/>\n\n<%-- Use below tags ONLY for JSP 1.1 --%>\n<%\n\tSystem.out.println(\"Welcome!\");\n%>\n<%-- Use below tags ONLY for JSP 1.2 --%>\n<jsp:scriptlet>\n\tSystem.out.println(\"Welcome!\");\n</jsp:scriptlet>
17	JSP_Delimiters_UI_=JSP Delimiters	17	JSP_Delimiters_UI_=JSP Delimiters
18	Refactor_label=R&efactor	18	Refactor_label=Refactor
19	RenameElement_label=Re&name	19	RenameElement_label=Rename
20	MoveElement_label=Mo&ve	20	MoveElement_label=Move
21	MoveElementWizard=Move the selected elements	21	MoveElementWizard=Move the selected elements
22	#	22	#
23	OK=OK	23	OK=OK
Lines 45-63 Link Here
45	NewJSPTemplatesWizardPage_5=Preview	45	NewJSPTemplatesWizardPage_5=Preview
46	NewJSPTemplatesWizardPage_6=Templates are 'New JSP' templates found in the <a>JSP Templates</a> preference page.	46	NewJSPTemplatesWizardPage_6=Templates are 'New JSP' templates found in the <a>JSP Templates</a> preference page.
47	# Copied from sse.ui	47	# Copied from sse.ui
48	CleanupDocument_label=C&leanup Document...	48	CleanupDocument_label=Cleanup Document...
49	CleanupDocument_tooltip=Cleanup Document	49	CleanupDocument_tooltip=Cleanup Document
50	CleanupDocument_description=Cleanup Document	50	CleanupDocument_description=Cleanup Document
51	ToggleComment_label=Togg&le Comment	51	ToggleComment_label=Toggle Comment
52	ToggleComment_tooltip=Toggle Comment	52	ToggleComment_tooltip=Toggle Comment
53	ToggleComment_description=Toggle Comment	53	ToggleComment_description=Toggle Comment
54	AddBlockComment_label=Add &Block Comment	54	AddBlockComment_label=Add Block Comment
55	AddBlockComment_tooltip=Add Block Comment	55	AddBlockComment_tooltip=Add Block Comment
56	AddBlockComment_description=Add Block Comment	56	AddBlockComment_description=Add Block Comment
57	RemoveBlockComment_label=Remove Bloc&k Comment	57	RemoveBlockComment_label=Remove Block Comment
58	RemoveBlockComment_tooltip=Remove Block Comment	58	RemoveBlockComment_tooltip=Remove Block Comment
59	RemoveBlockComment_description=Remove Block Comment	59	RemoveBlockComment_description=Remove Block Comment
60	FindOccurrences_label=O&ccurrences in File	60	FindOccurrences_label=Occurrences in File
61	OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}	61	OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}
62	OccurrencesSearchQuery_2=file	62	OccurrencesSearchQuery_2=file
63	Content_Assist_not_availab_UI_=Content Assist not available at the current location	63	Content_Assist_not_availab_UI_=Content Assist not available at the current location

Added Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java (+153 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.jst.jsp.ui.internal.java.refactoring;
14
15	import org.eclipse.core.resources.IResource;
16	import org.eclipse.jdt.core.IJavaElement;
17	import org.eclipse.jdt.core.JavaModelException;
18	import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor;
19	import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter;
20	import org.eclipse.jdt.internal.ui.refactoring.reorg.CreateTargetQueries;
21	import org.eclipse.jdt.internal.ui.refactoring.reorg.ReorgMoveWizard;
22	import org.eclipse.jdt.internal.ui.refactoring.reorg.ReorgQueries;
23	import org.eclipse.jface.action.IAction;
24	import org.eclipse.jface.viewers.ISelection;
25	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
26	import org.eclipse.jst.jsp.ui.internal.Logger;
27	import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
28	import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
29	import org.eclipse.swt.widgets.Event;
30	import org.eclipse.swt.widgets.Shell;
31	import org.eclipse.ui.IActionDelegate2;
32	import org.eclipse.ui.IEditorActionDelegate;
33	import org.eclipse.ui.IEditorPart;
34	import org.eclipse.ui.IViewActionDelegate;
35	import org.eclipse.ui.IViewPart;
36	import org.eclipse.ui.PlatformUI;
37	import org.eclipse.ui.texteditor.ITextEditor;
38	import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
39
40	/**
41	* An action delegate that launches JDT move element wizard
42	*
43	* Still relies heavily on internal API
44	* will change post 3.0 with public move support
45	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
46	*/
47	public class JSPMoveElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
48	private IEditorPart fEditor;
49
50	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
51	fEditor = targetEditor;
52	}
53
54	public void dispose() {
55	// nulling out just in case
56	fEditor = null;
57	}
58
59	public void init(IAction action) {
60	if (action != null) {
61	action.setText(JSPUIMessages.MoveElement_label);
62	action.setToolTipText(JSPUIMessages.MoveElement_label);
63	}
64	}
65
66	public void runWithEvent(IAction action, Event event) {
67	run(action);
68	}
69
70	public void run(IAction action) {
71	IJavaElement[] elements = getSelectedElements();
72	if (elements.length > 0) {
73
74	// need to check if it's movable
75	try {
76	JavaMoveProcessor processor = JavaMoveProcessor.create(getResources(elements), elements/*
77	* ,
78	* getCodeGenerationSettings()
79	*/);
80	Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
81
82	MoveRefactoring refactoring = new MoveRefactoring(processor);
83
84	RefactoringWizard wizard = createWizard(refactoring);
85
86	/*
87	* We want to get the shell from the refactoring dialog but
88	* it's not known at this point, so we pass the wizard and
89	* then, once the dialog is open, we will have access to its
90	* shell.
91	*/
92
93	processor.setCreateTargetQueries(new CreateTargetQueries(wizard));
94	processor.setReorgQueries(new ReorgQueries(wizard));
95	// String openRefactoringWizMsg =
96	// RefactoringMessages.getString("OpenRefactoringWizardAction.refactoring");
97	// //$NON-NLS-1$
98	String openRefactoringWizMsg = JSPUIMessages.MoveElementWizard; // "Move
99	// the
100	// selected
101	// elements";
102	// //$NON-NLS-1$
103	new RefactoringStarter().activate(refactoring, wizard, parent, openRefactoringWizMsg, true);
104
105	PlatformStatusLineUtil.clearStatusLine();
106
107	}
108	catch (JavaModelException e) {
109	Logger.logException(e);
110	}
111	}
112	else {
113	PlatformStatusLineUtil.displayErrorMessage(JSPUIMessages.JSPMoveElementAction_0); //$NON-NLS-1$
114	}
115	}
116
117	public void selectionChanged(IAction action, ISelection selection) {
118	PlatformStatusLineUtil.clearStatusLine();
119	}
120
121	public void init(IViewPart view) {
122	// do nothing
123	}
124
125	private IJavaElement[] getSelectedElements() {
126
127	IJavaElement[] elements = new IJavaElement[0];
128	if (fEditor instanceof ITextEditor)
129	elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor);
130	return elements;
131	}
132
133	private IResource[] getResources(IJavaElement[] elements) {
134	IResource[] resources = new IResource[elements.length];
135	for (int i = 0; i < elements.length; i++) {
136	try {
137	resources[i] = elements[i].getPrimaryElement().getCorrespondingResource();// elements[i].getResource();
138	}
139	catch (JavaModelException e) {
140	Logger.logException(e);
141	}
142	}
143	return resources;
144	}
145
146	/**
147	* will change post 3.0 with public move support
148	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
149	*/
150	private RefactoringWizard createWizard(MoveRefactoring refactoring) {
151	return new ReorgMoveWizard(refactoring);
152	}
153	}