Attachment #131729 for bug #272106

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

View | Details | Raw Unified | Return to bug 272106
Collapse All | Expand All




import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;

import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.xml.ui.internal.Logger;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Hyperlink for files within the workspace. (As long as there is an IFile,

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(XMLUIMessages.OPEN_HYPERLINK, fFile.getName());
	}

	public void open() {





import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchPage;

import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.xml.ui.internal.Logger;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;

/**
 * Hyperlink for external files.

	}

	public String getHyperlinkText() {
		return NLS.bind(XMLUIMessages.OPEN_HYPERLINK, fHyperlinkFile.getName());
	}

	public void open() {

Lines 299-305 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java (-1 / +1 lines)
299	public static String previousSibling_label;	299	public static String previousSibling_label;
300	public static String previousSibling_description;	300	public static String previousSibling_description;
301	public static String Use_XInclude;	301	public static String Use_XInclude;
302		302	public static String OPEN_HYPERLINK;
303		303
304	static {	304	static {
305	// load message values from bundle file	305	// load message values from bundle file

Lines 329-331 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties (+1 lines)
329	gotoMatchingTag_label=Matching Tag	329	gotoMatchingTag_label=Matching Tag
330	gotoMatchingTag_description=Go To Matching Tag	330	gotoMatchingTag_description=Go To Matching Tag
331		331
		332	OPEN_HYPERLINK=Open ''{0}''

Lines 10-15 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlinkDetector.java (-2 / +13 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.wst.jsdt.internal.ui.javaeditor;	11	package org.eclipse.wst.jsdt.internal.ui.javaeditor;
12		12
		13	import java.util.ArrayList;
		14	import java.util.List;
		15
13	import org.eclipse.jface.action.IAction;	16	import org.eclipse.jface.action.IAction;
14	import org.eclipse.jface.text.IDocument;	17	import org.eclipse.jface.text.IDocument;
15	import org.eclipse.jface.text.IRegion;	18	import org.eclipse.jface.text.IRegion;
Lines 56-63 Link Here
56		59
57	IJavaScriptElement[] elements= null;	60	IJavaScriptElement[] elements= null;
58	elements= ((ICodeAssist) input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());	61	elements= ((ICodeAssist) input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
59	if (elements != null && elements.length > 0)	62	if (elements != null && elements.length > 0) {
60	return new IHyperlink[] {new JavaElementHyperlink(wordRegion, openAction)};	63	if (canShowMultipleHyperlinks) {
		64	List links = new ArrayList(elements.length);
		65	for (int i = 0; i < elements.length; i++) {
		66	links.add(new JavaElementHyperlink(wordRegion, openAction, elements[i]));
		67	}
		68	return (IHyperlink[]) links.toArray(new JavaElementHyperlink[links.size()]);
		69	}
		70	return new IHyperlink[] {new JavaElementHyperlink(wordRegion, openAction, elements[0])};
		71	}
61	} catch (JavaScriptModelException e) {	72	} catch (JavaScriptModelException e) {
62	return null;	73	return null;
63	}	74	}




import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.jsdt.core.IJavaScriptElement;


/**


	private final IRegion fRegion;
	private final IAction fOpenAction;
	private IJavaScriptElement fElement;


	/**
	 * Creates a new Java element hyperlink.
	 */
	public JavaElementHyperlink(IRegion region, IAction openAction, IJavaScriptElement element) {
		Assert.isNotNull(openAction);
		Assert.isNotNull(region);
		Assert.isNotNull(element);

		fRegion= region;
		fOpenAction= openAction;
		fElement = element;
	}

	/*

	 * 
	 */
	public String getHyperlinkText() {
		return NLS.bind(JavaEditorMessages.Open, fElement.getDisplayName());
	}
}

Lines 113-115 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.properties (+2 lines)
113	Editor_OpenPropertiesFile_error_openEditor_dialogMessage= Could not open the properties file editor for: {0}	113	Editor_OpenPropertiesFile_error_openEditor_dialogMessage= Could not open the properties file editor for: {0}
114		114
115	Editor_MoveLines_IllegalMove_status= Move not possible - Uncheck "Show Source of Selected Element Only" to see the entire document	115	Editor_MoveLines_IllegalMove_status= Move not possible - Uncheck "Show Source of Selected Element Only" to see the entire document
		116
		117	Open=Open ''{0}''

Lines 118-123 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.java (+1 lines)
118	public static String Editor_OpenPropertiesFile_error_fileNotFound_dialogMessage;	118	public static String Editor_OpenPropertiesFile_error_fileNotFound_dialogMessage;
119	public static String Editor_OpenPropertiesFile_error_openEditor_dialogMessage;	119	public static String Editor_OpenPropertiesFile_error_openEditor_dialogMessage;
120	public static String Editor_MoveLines_IllegalMove_status;	120	public static String Editor_MoveLines_IllegalMove_status;
		121	public static String Open;
121		122
122	static {	123	static {
123	NLS.initializeMessages(BUNDLE_NAME, JavaEditorMessages.class);	124	NLS.initializeMessages(BUNDLE_NAME, JavaEditorMessages.class);

Lines 14-19 Link Here

(-)src/org/eclipse/wst/jsdt/internal/ui/javaeditor/NLSKeyHyperlink.java (-1 / +2 lines)
14	import org.eclipse.core.runtime.Assert;	14	import org.eclipse.core.runtime.Assert;
15	import org.eclipse.jface.text.IRegion;	15	import org.eclipse.jface.text.IRegion;
16	import org.eclipse.jface.text.hyperlink.IHyperlink;	16	import org.eclipse.jface.text.hyperlink.IHyperlink;
		17	import org.eclipse.osgi.util.NLS;
17	import org.eclipse.swt.widgets.Display;	18	import org.eclipse.swt.widgets.Display;
18	import org.eclipse.ui.IEditorPart;	19	import org.eclipse.ui.IEditorPart;
19	import org.eclipse.ui.PartInitException;	20	import org.eclipse.ui.PartInitException;
Lines 179-184 Link Here
179	* @see org.eclipse.wst.jsdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText()	180	* @see org.eclipse.wst.jsdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText()
180	*/	181	*/
181	public String getHyperlinkText() {	182	public String getHyperlinkText() {
182	return null;	183	return NLS.bind(JavaEditorMessages.Open, fKeyName);
183	}	184	}
184	}	185	}




import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchPage;

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fZipFilePath.lastSegment());
	}

	public void open() {





import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchPage;

	}

	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fHyperlinkFile.getName());
	}

	public void open() {

Lines 5-10 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java (-2 / +4 lines)
5	import org.eclipse.jst.jsp.core.taglib.IJarRecord;	5	import org.eclipse.jst.jsp.core.taglib.IJarRecord;
6	import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;	6	import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
7	import org.eclipse.jst.jsp.core.taglib.IURLRecord;	7	import org.eclipse.jst.jsp.core.taglib.IURLRecord;
		8	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
		9	import org.eclipse.osgi.util.NLS;
8		10
9	/**	11	/**
10	* Hyperlink for taglib files in jars or specified by urls.	12	* Hyperlink for taglib files in jars or specified by urls.
Lines 65-75 Link Here
65	switch (fTaglibRecord.getRecordType()) {	67	switch (fTaglibRecord.getRecordType()) {
66	case (ITaglibRecord.JAR) : {	68	case (ITaglibRecord.JAR) : {
67	IJarRecord record = (IJarRecord) fTaglibRecord;	69	IJarRecord record = (IJarRecord) fTaglibRecord;
68	return record.getLocation().toString();	70	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, record.getLocation().toString());
69	}	71	}
70	case (ITaglibRecord.URL) : {	72	case (ITaglibRecord.URL) : {
71	IURLRecord record = (IURLRecord) fTaglibRecord;	73	IURLRecord record = (IURLRecord) fTaglibRecord;
72	return record.getBaseLocation();	74	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, record.getURL().toString());
73	}	75	}
74	}	76	}
75	}	77	}




import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fFile.getName());
	}

	public void open() {




import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fURL.toString());
	}

	/*




import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;

	}

	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fResource.getName());
	}

	public String getTypeLabel() {




package org.eclipse.jst.jsp.ui.internal.hyperlink;

import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.ui.JavaElementLabels;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;

/**

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		long LABEL_FLAGS = JavaElementLabels.ALL_FULLY_QUALIFIED | JavaElementLabels.M_PRE_RETURNTYPE | JavaElementLabels.M_PARAMETER_TYPES | JavaElementLabels.M_PARAMETER_NAMES | JavaElementLabels.M_EXCEPTIONS | JavaElementLabels.F_PRE_TYPE_SIGNATURE | JavaElementLabels.M_PRE_TYPE_PARAMETERS | JavaElementLabels.T_TYPE_PARAMETERS | JavaElementLabels.USE_RESOLVED;
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, JavaElementLabels.getElementLabel(fElement, LABEL_FLAGS));
	}

	/*




import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.Logger;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fURL.toString());
	}

	/*

Lines 152-154 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties (+2 lines)
152	VALIDATION_TRANSLATION_USEBEAN_INVALID_ID=Invalid 'id' specified for jsp:useBean:	152	VALIDATION_TRANSLATION_USEBEAN_INVALID_ID=Invalid 'id' specified for jsp:useBean:
153	VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO=Missing type information for jsp:useBean:	153	VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO=Missing type information for jsp:useBean:
154	VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO=Ambiguous type information for jsp:useBean:	154	VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO=Ambiguous type information for jsp:useBean:
		155
		156	OPEN_HYPERLINK=Open ''{0}''

Lines 171-174 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java (+2 lines)
171	public static String VALIDATION_TRANSLATION_USEBEAN_INVALID_ID;	171	public static String VALIDATION_TRANSLATION_USEBEAN_INVALID_ID;
172	public static String VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO;	172	public static String VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO;
173	public static String VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO;	173	public static String VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO;
		174
		175	public static String OPEN_HYPERLINK;
174	}	176	}




import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.jsdt.web.ui.Messages;
import org.eclipse.wst.jsdt.web.ui.internal.Logger;
/**
*

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(Messages.getString(Messages.Open), fFile.getName());
		return null;
	}
	
	/*





import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.jsdt.web.ui.Messages;
import org.eclipse.wst.jsdt.web.ui.internal.Logger;

/**

	}
	
	public String getHyperlinkText() {
		return NLS.bind(Messages.getString(Messages.Open), fHyperlinkFile.getName());
	}
	
	public String getTypeLabel() {





import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorPart;
import org.eclipse.wst.jsdt.core.IJavaScriptElement;
import org.eclipse.wst.jsdt.ui.JavaScriptUI;
import org.eclipse.wst.jsdt.web.ui.Messages;
import org.eclipse.wst.jsdt.web.ui.internal.Logger;
/**
*

	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(Messages.getString(Messages.Open), fElement.getDisplayName());
		return null;
	}
	
	/*




import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;

import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.jsdt.web.ui.Messages;
import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
import org.eclipse.wst.jsdt.web.ui.internal.Logger;


	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
	 */
	public String getHyperlinkText() {
		return NLS.bind(Messages.getString(Messages.Open), fURL.toString());
		return null;
	}
	
	/*

Lines 9-11 Link Here

(-)src/org/eclipse/wst/jsdt/web/ui/messages.properties (+1 lines)
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
10	###############################################################################	10	###############################################################################
11	WebProjectJsGlobalScopeContainerInitializer.0=Web Project support for JSDT	11	WebProjectJsGlobalScopeContainerInitializer.0=Web Project support for JSDT
		12	Open=Open "{0}"

Lines 31-36 Link Here

(-)src/org/eclipse/wst/jsdt/web/ui/Messages.java (+3 lines)
31	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.messages"; //$NON-NLS-1$	31	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.messages"; //$NON-NLS-1$
32		32
33	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);	33	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
		34
34		35
35	private Messages() {	36	private Messages() {
36	}	37	}
Lines 43-46 Link Here
43	return '!' + key + '!';	44	return '!' + key + '!';
44	}	45	}
45	}	46	}
		47
		48	public static final String Open = "Open";
46	}	49	}

Return to bug 272106

Lines 13-18 Link Here

(-)src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java (-1 / +3 lines)
13	import org.eclipse.core.resources.IFile;	13	import org.eclipse.core.resources.IFile;
14	import org.eclipse.jface.text.IRegion;	14	import org.eclipse.jface.text.IRegion;
15	import org.eclipse.jface.text.hyperlink.IHyperlink;	15	import org.eclipse.jface.text.hyperlink.IHyperlink;
		16	import org.eclipse.osgi.util.NLS;
16	import org.eclipse.ui.IEditorPart;	17	import org.eclipse.ui.IEditorPart;
17	import org.eclipse.ui.IWorkbenchPage;	18	import org.eclipse.ui.IWorkbenchPage;
18	import org.eclipse.ui.PartInitException;	19	import org.eclipse.ui.PartInitException;
Lines 20-25 Link Here
20	import org.eclipse.ui.ide.IDE;	21	import org.eclipse.ui.ide.IDE;
21	import org.eclipse.ui.texteditor.ITextEditor;	22	import org.eclipse.ui.texteditor.ITextEditor;
22	import org.eclipse.wst.xml.ui.internal.Logger;	23	import org.eclipse.wst.xml.ui.internal.Logger;
		24	import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
23		25
24	/**	26	/**
25	* Hyperlink for files within the workspace. (As long as there is an IFile,	27	* Hyperlink for files within the workspace. (As long as there is an IFile,
Lines 66-72 Link Here
66	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()	68	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
67	*/	69	*/
68	public String getHyperlinkText() {	70	public String getHyperlinkText() {
69	return fFile.getFullPath().toString();	71	return NLS.bind(XMLUIMessages.OPEN_HYPERLINK, fFile.getName());
70	}	72	}
71		73
72	public void open() {	74	public void open() {

Lines 13-20 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java (-1 / +3 lines)
13	import org.eclipse.core.runtime.Status;	13	import org.eclipse.core.runtime.Status;
14	import org.eclipse.jface.text.IRegion;	14	import org.eclipse.jface.text.IRegion;
15	import org.eclipse.jface.text.hyperlink.IHyperlink;	15	import org.eclipse.jface.text.hyperlink.IHyperlink;
		16	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
16	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;	17	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
17	import org.eclipse.jst.jsp.ui.internal.Logger;	18	import org.eclipse.jst.jsp.ui.internal.Logger;
		19	import org.eclipse.osgi.util.NLS;
18	import org.eclipse.ui.IEditorDescriptor;	20	import org.eclipse.ui.IEditorDescriptor;
19	import org.eclipse.ui.IEditorInput;	21	import org.eclipse.ui.IEditorInput;
20	import org.eclipse.ui.IWorkbenchPage;	22	import org.eclipse.ui.IWorkbenchPage;
Lines 92-98 Link Here
92	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()	94	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
93	*/	95	*/
94	public String getHyperlinkText() {	96	public String getHyperlinkText() {
95	return fZipFilePath.toString();	97	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fZipFilePath.lastSegment());
96	}	98	}
97		99
98	public void open() {	100	public void open() {

Lines 12-19 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java (-1 / +3 lines)
12	import org.eclipse.jface.resource.ImageDescriptor;	12	import org.eclipse.jface.resource.ImageDescriptor;
13	import org.eclipse.jface.text.IRegion;	13	import org.eclipse.jface.text.IRegion;
14	import org.eclipse.jface.text.hyperlink.IHyperlink;	14	import org.eclipse.jface.text.hyperlink.IHyperlink;
		15	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
15	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;	16	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
16	import org.eclipse.jst.jsp.ui.internal.Logger;	17	import org.eclipse.jst.jsp.ui.internal.Logger;
		18	import org.eclipse.osgi.util.NLS;
17	import org.eclipse.ui.IEditorDescriptor;	19	import org.eclipse.ui.IEditorDescriptor;
18	import org.eclipse.ui.IEditorInput;	20	import org.eclipse.ui.IEditorInput;
19	import org.eclipse.ui.IPersistableElement;	21	import org.eclipse.ui.IPersistableElement;
Lines 146-152 Link Here
146	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()	148	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
147	*/	149	*/
148	public String getHyperlinkText() {	150	public String getHyperlinkText() {
149	return fURL.toString();	151	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fURL.toString());
150	}	152	}
151		153
152	/*	154	/*

Lines 18-25 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/hyperlink/TLDFileHyperlink.java (-1 / +3 lines)
18	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.jface.text.IRegion;	19	import org.eclipse.jface.text.IRegion;
20	import org.eclipse.jface.text.hyperlink.IHyperlink;	20	import org.eclipse.jface.text.hyperlink.IHyperlink;
		21	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
21	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;	22	import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
22	import org.eclipse.jst.jsp.ui.internal.Logger;	23	import org.eclipse.jst.jsp.ui.internal.Logger;
		24	import org.eclipse.osgi.util.NLS;
23	import org.eclipse.ui.IWorkbenchPage;	25	import org.eclipse.ui.IWorkbenchPage;
24	import org.eclipse.ui.IWorkbenchWindow;	26	import org.eclipse.ui.IWorkbenchWindow;
25	import org.eclipse.ui.PartInitException;	27	import org.eclipse.ui.PartInitException;
Lines 58-64 Link Here
58	}	60	}
59		61
60	public String getHyperlinkText() {	62	public String getHyperlinkText() {
61	return fResource.getFullPath().toString();	63	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fResource.getName());
62	}	64	}
63		65
64	public String getTypeLabel() {	66	public String getTypeLabel() {

Lines 1-10 Link Here

(-)src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java (-1 / +5 lines)
1	package org.eclipse.jst.jsp.ui.internal.hyperlink;	1	package org.eclipse.jst.jsp.ui.internal.hyperlink;
2		2
3	import org.eclipse.jdt.core.IJavaElement;	3	import org.eclipse.jdt.core.IJavaElement;
		4	import org.eclipse.jdt.ui.JavaElementLabels;
4	import org.eclipse.jdt.ui.JavaUI;	5	import org.eclipse.jdt.ui.JavaUI;
5	import org.eclipse.jface.text.IRegion;	6	import org.eclipse.jface.text.IRegion;
6	import org.eclipse.jface.text.hyperlink.IHyperlink;	7	import org.eclipse.jface.text.hyperlink.IHyperlink;
		8	import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
7	import org.eclipse.jst.jsp.ui.internal.Logger;	9	import org.eclipse.jst.jsp.ui.internal.Logger;
		10	import org.eclipse.osgi.util.NLS;
8	import org.eclipse.ui.IEditorPart;	11	import org.eclipse.ui.IEditorPart;
9		12
10	/**	13	/**
Lines 43-49 Link Here
43	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()	46	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
44	*/	47	*/
45	public String getHyperlinkText() {	48	public String getHyperlinkText() {
46	return fElement.getElementName();	49	long LABEL_FLAGS = JavaElementLabels.ALL_FULLY_QUALIFIED \| JavaElementLabels.M_PRE_RETURNTYPE \| JavaElementLabels.M_PARAMETER_TYPES \| JavaElementLabels.M_PARAMETER_NAMES \| JavaElementLabels.M_EXCEPTIONS \| JavaElementLabels.F_PRE_TYPE_SIGNATURE \| JavaElementLabels.M_PRE_TYPE_PARAMETERS \| JavaElementLabels.T_TYPE_PARAMETERS \| JavaElementLabels.USE_RESOLVED;
		50	return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, JavaElementLabels.getElementLabel(fElement, LABEL_FLAGS));
47	}	51	}
48		52
49	/*	53	/*

Lines 13-24 Link Here

(-)src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java (-2 / +3 lines)
13	import org.eclipse.core.resources.IFile;	13	import org.eclipse.core.resources.IFile;
14	import org.eclipse.jface.text.IRegion;	14	import org.eclipse.jface.text.IRegion;
15	import org.eclipse.jface.text.hyperlink.IHyperlink;	15	import org.eclipse.jface.text.hyperlink.IHyperlink;
		16	import org.eclipse.osgi.util.NLS;
16	import org.eclipse.ui.IEditorPart;	17	import org.eclipse.ui.IEditorPart;
17	import org.eclipse.ui.IWorkbenchPage;	18	import org.eclipse.ui.IWorkbenchPage;
18	import org.eclipse.ui.PartInitException;	19	import org.eclipse.ui.PartInitException;
19	import org.eclipse.ui.PlatformUI;	20	import org.eclipse.ui.PlatformUI;
20	import org.eclipse.ui.ide.IDE;	21	import org.eclipse.ui.ide.IDE;
21	import org.eclipse.ui.texteditor.ITextEditor;	22	import org.eclipse.ui.texteditor.ITextEditor;
		23	import org.eclipse.wst.jsdt.web.ui.Messages;
22	import org.eclipse.wst.jsdt.web.ui.internal.Logger;	24	import org.eclipse.wst.jsdt.web.ui.internal.Logger;
23	/**	25	/**
24	*	26	*
Lines 58-65 Link Here
58	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()	60	* @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
59	*/	61	*/
60	public String getHyperlinkText() {	62	public String getHyperlinkText() {
61	// TODO Auto-generated method stub	63	return NLS.bind(Messages.getString(Messages.Open), fFile.getName());
62	return null;
63	}	64	}
64		65
65	/*	66	/*