Attachment 131729 Details for Bug 272106 – proposed patch

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

[patch] proposed patch

hyperlinkText.patch (text/plain), 28.95 KB, created by Nitin Dahyabhai

on 2009-04-13 23:37:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nitin Dahyabhai

Created: 2009-04-13 23:37:20 EDT

Size: 28.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.ui
>Index: src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 WorkspaceFileHyperlink.java
>--- src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java	21 Apr 2008 23:01:55 -0000	1.4
>+++ src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java	14 Apr 2009 03:30:30 -0000
>@@ -13,6 +13,7 @@
> 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;
>@@ -20,6 +21,7 @@
> 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,
>@@ -66,7 +68,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fFile.getFullPath().toString();
>+		return NLS.bind(XMLUIMessages.OPEN_HYPERLINK, fFile.getName());
> 	}
> 
> 	public void open() {
>Index: src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java,v
>retrieving revision 1.6
>diff -u -r1.6 ExternalFileHyperlink.java
>--- src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java	21 Apr 2008 23:01:55 -0000	1.6
>+++ src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java	14 Apr 2009 03:30:30 -0000
>@@ -14,6 +14,7 @@
> 
> 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;
>@@ -21,6 +22,7 @@
> 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.
>@@ -48,7 +50,7 @@
> 	}
> 
> 	public String getHyperlinkText() {
>-		return fHyperlinkFile.getName();
>+		return NLS.bind(XMLUIMessages.OPEN_HYPERLINK, fHyperlinkFile.getName());
> 	}
> 
> 	public void open() {
>Index: src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java,v
>retrieving revision 1.23
>diff -u -r1.23 XMLUIMessages.java
>--- src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java	27 Mar 2008 07:16:33 -0000	1.23
>+++ src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java	14 Apr 2009 03:30:30 -0000
>@@ -299,7 +299,7 @@
> 	public static String previousSibling_label;
> 	public static String previousSibling_description;
> 	public static String Use_XInclude;
>-
>+	public static String OPEN_HYPERLINK;
> 
> 	static {
> 		// load message values from bundle file
>Index: src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties,v
>retrieving revision 1.28
>diff -u -r1.28 XMLUIPluginResources.properties
>--- src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties	27 Mar 2008 07:16:33 -0000	1.28
>+++ src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties	14 Apr 2009 03:30:30 -0000
>@@ -329,3 +329,4 @@
> gotoMatchingTag_label=Matching Tag
> gotoMatchingTag_description=Go To Matching Tag
> 
>+OPEN_HYPERLINK=Open ''{0}''
>#P org.eclipse.wst.jsdt.ui
>Index: src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlinkDetector.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlinkDetector.java,v
>retrieving revision 1.6
>diff -u -r1.6 JavaElementHyperlinkDetector.java
>--- src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlinkDetector.java	22 May 2008 15:53:16 -0000	1.6
>+++ src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlinkDetector.java	14 Apr 2009 03:30:30 -0000
>@@ -10,6 +10,9 @@
>  *******************************************************************************/
> package org.eclipse.wst.jsdt.internal.ui.javaeditor;
> 
>+import java.util.ArrayList;
>+import java.util.List;
>+
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.IRegion;
>@@ -56,8 +59,16 @@
> 			
> 			IJavaScriptElement[] elements= null;
> 			elements= ((ICodeAssist) input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
>-			if (elements != null && elements.length > 0)
>-				return new IHyperlink[] {new JavaElementHyperlink(wordRegion, openAction)};
>+			if (elements != null && elements.length > 0) {
>+				if (canShowMultipleHyperlinks) {
>+					List links = new ArrayList(elements.length);
>+					for (int i = 0; i < elements.length; i++) {
>+						links.add(new JavaElementHyperlink(wordRegion, openAction, elements[i]));
>+					}
>+					return (IHyperlink[]) links.toArray(new JavaElementHyperlink[links.size()]);
>+				}
>+				return new IHyperlink[] {new JavaElementHyperlink(wordRegion, openAction, elements[0])};
>+			}
> 		} catch (JavaScriptModelException e) {
> 			return null;
> 		}
>Index: src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 JavaElementHyperlink.java
>--- src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlink.java	14 May 2008 15:43:52 -0000	1.4
>+++ src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaElementHyperlink.java	14 Apr 2009 03:30:30 -0000
>@@ -14,6 +14,8 @@
> 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;
> 
> 
> /**
>@@ -25,17 +27,20 @@
> 
> 	private final IRegion fRegion;
> 	private final IAction fOpenAction;
>+	private IJavaScriptElement fElement;
> 
> 
> 	/**
> 	 * Creates a new Java element hyperlink.
> 	 */
>-	public JavaElementHyperlink(IRegion region, IAction openAction) {
>+	public JavaElementHyperlink(IRegion region, IAction openAction, IJavaScriptElement element) {
> 		Assert.isNotNull(openAction);
> 		Assert.isNotNull(region);
>+		Assert.isNotNull(element);
> 
> 		fRegion= region;
> 		fOpenAction= openAction;
>+		fElement = element;
> 	}
> 
> 	/*
>@@ -67,6 +72,6 @@
> 	 * 
> 	 */
> 	public String getHyperlinkText() {
>-		return null;
>+		return NLS.bind(JavaEditorMessages.Open, fElement.getDisplayName());
> 	}
> }
>Index: src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.properties,v
>retrieving revision 1.8
>diff -u -r1.8 JavaEditorMessages.properties
>--- src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.properties	7 May 2008 21:23:40 -0000	1.8
>+++ src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.properties	14 Apr 2009 03:30:30 -0000
>@@ -113,3 +113,5 @@
> Editor_OpenPropertiesFile_error_openEditor_dialogMessage= Could not open the properties file editor for: {0}
> 
> Editor_MoveLines_IllegalMove_status= Move not possible - Uncheck "Show Source of Selected Element Only" to see the entire document
>+
>+Open=Open ''{0}''
>Index: src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.java,v
>retrieving revision 1.9
>diff -u -r1.9 JavaEditorMessages.java
>--- src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.java	14 May 2008 15:43:53 -0000	1.9
>+++ src/org/eclipse/wst/jsdt/internal/ui/javaeditor/JavaEditorMessages.java	14 Apr 2009 03:30:30 -0000
>@@ -118,6 +118,7 @@
> 	public static String Editor_OpenPropertiesFile_error_fileNotFound_dialogMessage;
> 	public static String Editor_OpenPropertiesFile_error_openEditor_dialogMessage;
> 	public static String Editor_MoveLines_IllegalMove_status;
>+	public static String Open;
> 
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, JavaEditorMessages.class);
>Index: src/org/eclipse/wst/jsdt/internal/ui/javaeditor/NLSKeyHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/javaeditor/NLSKeyHyperlink.java,v
>retrieving revision 1.6
>diff -u -r1.6 NLSKeyHyperlink.java
>--- src/org/eclipse/wst/jsdt/internal/ui/javaeditor/NLSKeyHyperlink.java	14 May 2008 15:43:53 -0000	1.6
>+++ src/org/eclipse/wst/jsdt/internal/ui/javaeditor/NLSKeyHyperlink.java	14 Apr 2009 03:30:30 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.hyperlink.IHyperlink;
>+import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.ui.IEditorPart;
> import org.eclipse.ui.PartInitException;
>@@ -179,6 +180,6 @@
> 	 * @see org.eclipse.wst.jsdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return null;
>+		return NLS.bind(JavaEditorMessages.Open, fKeyName);
> 	}
> }
>#P org.eclipse.jst.jsp.ui
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java,v
>retrieving revision 1.3
>diff -u -r1.3 TaglibJarHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java	21 Apr 2008 23:01:52 -0000	1.3
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -13,8 +13,10 @@
> 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;
>@@ -92,7 +94,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fZipFilePath.toString();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fZipFilePath.lastSegment());
> 	}
> 
> 	public void open() {
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileHyperlink.java,v
>retrieving revision 1.3
>diff -u -r1.3 ExternalFileHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileHyperlink.java	21 Apr 2008 23:01:52 -0000	1.3
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/ExternalFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -4,7 +4,9 @@
> 
> 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;
>@@ -38,7 +40,7 @@
> 	}
> 
> 	public String getHyperlinkText() {
>-		return fHyperlinkFile.getName();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fHyperlinkFile.getName());
> 	}
> 
> 	public void open() {
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java,v
>retrieving revision 1.5
>diff -u -r1.5 TaglibJarUriHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java	21 Apr 2008 23:01:52 -0000	1.5
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibJarUriHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -5,6 +5,8 @@
> import org.eclipse.jst.jsp.core.taglib.IJarRecord;
> import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
> import org.eclipse.jst.jsp.core.taglib.IURLRecord;
>+import org.eclipse.jst.jsp.ui.internal.JSPUIMessages;
>+import org.eclipse.osgi.util.NLS;
> 
> /**
>  * Hyperlink for taglib files in jars or specified by urls.
>@@ -65,11 +67,11 @@
> 			switch (fTaglibRecord.getRecordType()) {
> 				case (ITaglibRecord.JAR) : {
> 					IJarRecord record = (IJarRecord) fTaglibRecord;
>-					return record.getLocation().toString();
>+					return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, record.getLocation().toString());
> 				}
> 				case (ITaglibRecord.URL) : {
> 					IURLRecord record = (IURLRecord) fTaglibRecord;
>-					return record.getBaseLocation();
>+					return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, record.getURL().toString());
> 				}
> 			}
> 		}
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/WorkspaceFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/WorkspaceFileHyperlink.java,v
>retrieving revision 1.3
>diff -u -r1.3 WorkspaceFileHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/WorkspaceFileHyperlink.java	21 Apr 2008 23:01:52 -0000	1.3
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/WorkspaceFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -3,7 +3,9 @@
> 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;
>@@ -56,7 +58,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fFile.getFullPath().toString();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fFile.getName());
> 	}
> 
> 	public void open() {
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 URLFileHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java	21 Apr 2008 23:01:52 -0000	1.4
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -12,8 +12,10 @@
> 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;
>@@ -146,7 +148,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fURL.toString();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fURL.toString());
> 	}
> 
> 	/*
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/TLDFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TLDFileHyperlink.java,v
>retrieving revision 1.2
>diff -u -r1.2 TLDFileHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/TLDFileHyperlink.java	21 Apr 2008 23:01:52 -0000	1.2
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/TLDFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -18,8 +18,10 @@
> 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;
>@@ -58,7 +60,7 @@
> 	}
> 
> 	public String getHyperlinkText() {
>-		return fResource.getFullPath().toString();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fResource.getName());
> 	}
> 
> 	public String getTypeLabel() {
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java,v
>retrieving revision 1.2
>diff -u -r1.2 JSPJavaHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java	21 Apr 2008 23:01:52 -0000	1.2
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/JSPJavaHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -1,10 +1,13 @@
> 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;
> 
> /**
>@@ -43,7 +46,8 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fElement.getElementName();
>+		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));
> 	}
> 
> 	/*
>Index: src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileRegionHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileRegionHyperlink.java,v
>retrieving revision 1.2
>diff -u -r1.2 URLFileRegionHyperlink.java
>--- src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileRegionHyperlink.java	21 Apr 2008 23:01:52 -0000	1.2
>+++ src/org/eclipse/jst/jsp/ui/internal/hyperlink/URLFileRegionHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -23,8 +23,10 @@
> 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;
>@@ -165,7 +167,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		return fURL.toString();
>+		return NLS.bind(JSPUIMessages.OPEN_HYPERLINK, fURL.toString());
> 	}
> 
> 	/*
>Index: src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties,v
>retrieving revision 1.23
>diff -u -r1.23 JSPUIPluginResources.properties
>--- src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties	7 Apr 2008 22:39:20 -0000	1.23
>+++ src/org/eclipse/jst/jsp/ui/internal/JSPUIPluginResources.properties	14 Apr 2009 03:30:31 -0000
>@@ -152,3 +152,5 @@
> VALIDATION_TRANSLATION_USEBEAN_INVALID_ID=Invalid 'id' specified for jsp:useBean:
> VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO=Missing type information for jsp:useBean:
> VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO=Ambiguous type information for jsp:useBean:
>+
>+OPEN_HYPERLINK=Open ''{0}''
>Index: src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java,v
>retrieving revision 1.20
>diff -u -r1.20 JSPUIMessages.java
>--- src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java	31 Mar 2008 17:00:58 -0000	1.20
>+++ src/org/eclipse/jst/jsp/ui/internal/JSPUIMessages.java	14 Apr 2009 03:30:31 -0000
>@@ -171,4 +171,6 @@
> 	public static String VALIDATION_TRANSLATION_USEBEAN_INVALID_ID;
> 	public static String VALIDATION_TRANSLATION_USBEAN_MISSING_TYPE_INFO;
> 	public static String VALIDATION_TRANSLATION_USEBEAN_AMBIGUOUS_TYPE_INFO;
>+	
>+	public static String OPEN_HYPERLINK;
> }
>#P org.eclipse.wst.jsdt.web.ui
>Index: src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 WorkspaceFileHyperlink.java
>--- src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java	30 Apr 2008 19:06:29 -0000	1.4
>+++ src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -13,12 +13,14 @@
> 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;
> /**
> *
>@@ -58,8 +60,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		// TODO Auto-generated method stub
>-		return null;
>+		return NLS.bind(Messages.getString(Messages.Open), fFile.getName());
> 	}
> 	
> 	/*
>Index: src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 ExternalFileHyperlink.java
>--- src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java	30 Apr 2008 19:06:29 -0000	1.4
>+++ src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -14,12 +14,14 @@
> 
> 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;
> 
> /**
>@@ -48,7 +50,7 @@
> 	}
> 	
> 	public String getHyperlinkText() {
>-		return null;
>+		return NLS.bind(Messages.getString(Messages.Open), fHyperlinkFile.getName());
> 	}
> 	
> 	public String getTypeLabel() {
>Index: src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java,v
>retrieving revision 1.3
>diff -u -r1.3 JSDTHyperlink.java
>--- src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java	30 Apr 2008 19:06:29 -0000	1.3
>+++ src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -12,9 +12,11 @@
> 
> 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;
> /**
> *
>@@ -48,8 +50,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		// TODO Auto-generated method stub
>-		return null;
>+		return NLS.bind(Messages.getString(Messages.Open), fElement.getDisplayName());
> 	}
> 	
> 	/*
>Index: src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/Attic/URLFileHyperlink.java,v
>retrieving revision 1.4
>diff -u -r1.4 URLFileHyperlink.java
>--- src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java	30 Apr 2008 19:06:29 -0000	1.4
>+++ src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/URLFileHyperlink.java	14 Apr 2009 03:30:31 -0000
>@@ -22,6 +22,7 @@
> 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;
>@@ -30,6 +31,7 @@
> 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;
> 
>@@ -132,8 +134,7 @@
> 	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
> 	 */
> 	public String getHyperlinkText() {
>-		// TODO Auto-generated method stub
>-		return null;
>+		return NLS.bind(Messages.getString(Messages.Open), fURL.toString());
> 	}
> 	
> 	/*
>Index: src/org/eclipse/wst/jsdt/web/ui/messages.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/messages.properties,v
>retrieving revision 1.3
>diff -u -r1.3 messages.properties
>--- src/org/eclipse/wst/jsdt/web/ui/messages.properties	30 Apr 2008 19:06:30 -0000	1.3
>+++ src/org/eclipse/wst/jsdt/web/ui/messages.properties	14 Apr 2009 03:30:31 -0000
>@@ -9,3 +9,4 @@
> #     IBM Corporation - initial API and implementation
> ###############################################################################
> WebProjectJsGlobalScopeContainerInitializer.0=Web Project support for JSDT
>+Open=Open "{0}"
>\ No newline at end of file
>Index: src/org/eclipse/wst/jsdt/web/ui/Messages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/Messages.java,v
>retrieving revision 1.2
>diff -u -r1.2 Messages.java
>--- src/org/eclipse/wst/jsdt/web/ui/Messages.java	30 Apr 2008 19:06:30 -0000	1.2
>+++ src/org/eclipse/wst/jsdt/web/ui/Messages.java	14 Apr 2009 03:30:31 -0000
>@@ -31,6 +31,7 @@
> 	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.messages"; //$NON-NLS-1$
> 
> 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
>+	
> 
> 	private Messages() {
> 	}
>@@ -43,4 +44,6 @@
> 			return '!' + key + '!';
> 		}
> 	}
>+
>+	public static final String Open = "Open"; 
> }

Actions: View | Diff

Attachments on bug 272106: 131729