Attachment 202473 Details for Bug 356139 – patch for additonal information

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

[patch] patch for additonal information

PatchForAdditionalInformation (text/plain), 5.40 KB, created by Xiao Bin Chen

on 2011-08-30 23:02:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Xiao Bin Chen

Created: 2011-08-30 23:02:18 EDT

Size: 5.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.edt.ide.ui
>Index: src/org/eclipse/edt/ide/ui/internal/contentassist/proposalhandlers/EGLTemplateProposal.java
>===================================================================
>RCS file: src/org/eclipse/edt/ide/ui/internal/contentassist/proposalhandlers/EGLTemplateProposal.java
>diff -N src/org/eclipse/edt/ide/ui/internal/contentassist/proposalhandlers/EGLTemplateProposal.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/edt/ide/ui/internal/contentassist/proposalhandlers/EGLTemplateProposal.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,40 @@
>+package org.eclipse.edt.ide.ui.internal.contentassist.proposalhandlers;
>+
>+import org.eclipse.jface.text.BadLocationException;
>+import org.eclipse.jface.text.IRegion;
>+import org.eclipse.jface.text.templates.Template;
>+import org.eclipse.jface.text.templates.TemplateBuffer;
>+import org.eclipse.jface.text.templates.TemplateContext;
>+import org.eclipse.jface.text.templates.TemplateException;
>+import org.eclipse.jface.text.templates.TemplateProposal;
>+import org.eclipse.swt.graphics.Image;
>+
>+public class EGLTemplateProposal extends TemplateProposal {
>+
>+	private String delimiter;
>+	
>+	public EGLTemplateProposal(Template template, TemplateContext context,
>+			IRegion region, Image image, String adelimiter) {
>+		super(template, context, region, image);
>+		
>+		delimiter = adelimiter;
>+	}
>+	
>+	public String getAdditionalProposalInfo() {
>+	    try {
>+		    getContext().setReadOnly(true);
>+			TemplateBuffer templateBuffer;
>+			try {
>+				templateBuffer= getContext().evaluate(getTemplate());
>+			} catch (TemplateException e) {
>+				return null;
>+			}
>+
>+			return templateBuffer.getString().replace(delimiter, "<br>");
>+
>+	    } catch (BadLocationException e) {
>+			return null;
>+		}
>+	}
>+
>+}
>Index: src/org/eclipse/edt/ide/ui/internal/templates/EGLTemplateContext.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.edt/ide/org.eclipse.edt.ide.ui/src/org/eclipse/edt/ide/ui/internal/templates/EGLTemplateContext.java,v
>retrieving revision 1.1
>diff -u -r1.1 EGLTemplateContext.java
>--- src/org/eclipse/edt/ide/ui/internal/templates/EGLTemplateContext.java	19 May 2011 19:39:35 -0000	1.1
>+++ src/org/eclipse/edt/ide/ui/internal/templates/EGLTemplateContext.java	31 Aug 2011 03:00:49 -0000
>@@ -20,7 +20,7 @@
> import org.eclipse.edt.ide.core.internal.errors.ParseStack;
> import org.eclipse.edt.ide.ui.EDTUIPlugin;
> import org.eclipse.edt.ide.ui.internal.CodeFormatterUtil;
>-import org.eclipse.jdt.internal.corext.util.Strings;
>+import org.eclipse.edt.ide.ui.internal.Strings;
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.IRegion;
>Index: src/org/eclipse/edt/ide/ui/internal/templates/TemplateEngine.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.edt/ide/org.eclipse.edt.ide.ui/src/org/eclipse/edt/ide/ui/internal/templates/TemplateEngine.java,v
>retrieving revision 1.1
>diff -u -r1.1 TemplateEngine.java
>--- src/org/eclipse/edt/ide/ui/internal/templates/TemplateEngine.java	19 May 2011 19:39:35 -0000	1.1
>+++ src/org/eclipse/edt/ide/ui/internal/templates/TemplateEngine.java	31 Aug 2011 03:00:49 -0000
>@@ -18,12 +18,13 @@
> import org.eclipse.edt.ide.core.internal.errors.TokenStream;
> import org.eclipse.edt.ide.ui.EDTUIPlugin;
> import org.eclipse.edt.ide.ui.internal.PluginImages;
>+import org.eclipse.edt.ide.ui.internal.contentassist.proposalhandlers.EGLTemplateProposal;
>+import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.ITextViewer;
> import org.eclipse.jface.text.Region;
> import org.eclipse.jface.text.templates.Template;
>-import org.eclipse.jface.text.templates.TemplateProposal;
> import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData;
> import org.eclipse.swt.graphics.Point;
> 
>@@ -52,12 +53,18 @@
> 	/**
> 	 * Returns the array of matching templates.
> 	 */
>-	public TemplateProposal[] getResults() {
>-		return (TemplateProposal[]) fProposals.toArray(new TemplateProposal[fProposals.size()]);
>+	public EGLTemplateProposal[] getResults() {
>+		return (EGLTemplateProposal[]) fProposals.toArray(new EGLTemplateProposal[fProposals.size()]);
> 	}
> 
> 	public void complete(TokenStream tokenStream, ITextViewer viewer, int completionPosition, ParseStack parseStack, String prefix) {
> 		IDocument document = viewer.getDocument();
>+		String lineDelimiter = "\n";
>+		try {
>+			lineDelimiter =document.getLineDelimiter(0);
>+		} catch (BadLocationException e) {
>+		}
>+		
> 		Point selection = viewer.getSelectedRange();
> 		EGLTemplateContext context = fContextType.createContext(document, completionPosition - prefix.length(), selection.y + prefix.length(), parseStack, prefix);
> 		int start = context.getStart();
>@@ -68,11 +75,11 @@
> 			// If the template matches the prefix, then set up the necessary info and add to list of completions.
> 			if (context.canEvaluate(templates[i])) {
> 				fProposals.add(
>-					new TemplateProposal(
>+					new EGLTemplateProposal(
> 						templates[i],
> 						context,
> 						region,
>-						PluginImages.get(PluginImages.IMG_OBJS_TEMPLATE)));
>+						PluginImages.get(PluginImages.IMG_OBJS_TEMPLATE),lineDelimiter));
> 			}
> 		}
> 	}

Flags:

lasher: iplog+

Actions: View | Diff

Attachments on bug 356139: 202473