Attachment 201956 Details for Bug 134073 – updated patch

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

[patch] updated patch

134073.patch (text/plain), 14.45 KB, created by Nick Sandonato

on 2011-08-22 16:52:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2011-08-22 16:52:31 EDT

Size: 14.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.ui
>Index: src/org/eclipse/jst/jsp/ui/internal/contentassist/CustomTemplateProposal.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/CustomTemplateProposal.java,v
>retrieving revision 1.7
>diff -u -r1.7 CustomTemplateProposal.java
>--- src/org/eclipse/jst/jsp/ui/internal/contentassist/CustomTemplateProposal.java	10 Apr 2007 17:03:49 -0000	1.7
>+++ src/org/eclipse/jst/jsp/ui/internal/contentassist/CustomTemplateProposal.java	22 Aug 2011 20:50:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -12,6 +12,7 @@
> package org.eclipse.jst.jsp.ui.internal.contentassist;
> 
> import org.eclipse.jface.text.IRegion;
>+import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
> import org.eclipse.jface.text.templates.Template;
> import org.eclipse.jface.text.templates.TemplateContext;
> import org.eclipse.jface.text.templates.TemplateProposal;
>@@ -25,7 +26,7 @@
>  * 
>  * @plannedfor 1.0
>  */
>-class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal {
>+class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal, ICompletionProposalExtension4 {
> 	// copies of this class exist in:
> 	// org.eclipse.jst.jsp.ui.internal.contentassist
> 	// org.eclipse.wst.html.ui.internal.contentassist
>@@ -39,4 +40,8 @@
> 		String additionalInfo = super.getAdditionalProposalInfo();
> 		return StringUtils.convertToHTMLContent(additionalInfo);
> 	}
>+
>+	public boolean isAutoInsertable() {
>+		return false;
>+	}
> }
>#P org.eclipse.wst.html.ui
>Index: src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java,v
>retrieving revision 1.5
>diff -u -r1.5 CustomTemplateProposal.java
>--- src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java	10 Apr 2007 18:30:15 -0000	1.5
>+++ src/org/eclipse/wst/html/ui/internal/contentassist/CustomTemplateProposal.java	22 Aug 2011 20:50:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -12,6 +12,7 @@
> package org.eclipse.wst.html.ui.internal.contentassist;
> 
> import org.eclipse.jface.text.IRegion;
>+import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
> import org.eclipse.jface.text.templates.Template;
> import org.eclipse.jface.text.templates.TemplateContext;
> import org.eclipse.jface.text.templates.TemplateProposal;
>@@ -23,7 +24,7 @@
>  * Purpose of this class is to make the additional proposal info into content
>  * fit for an HTML viewer (by escaping characters)
>  */
>-class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal {
>+class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal, ICompletionProposalExtension4 {
> 	// copies of this class exist in:
> 	// org.eclipse.jst.jsp.ui.internal.contentassist
> 	// org.eclipse.wst.html.ui.internal.contentassist
>@@ -37,4 +38,8 @@
> 		String additionalInfo = super.getAdditionalProposalInfo();
> 		return StringUtils.convertToHTMLContent(additionalInfo);
> 	}
>+
>+	public boolean isAutoInsertable() {
>+		return false;
>+	}
> }
>#P org.eclipse.wst.sse.ui
>Index: src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java,v
>retrieving revision 1.51
>diff -u -r1.51 StructuredTextViewerConfiguration.java
>--- src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java	23 Feb 2011 20:52:53 -0000	1.51
>+++ src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java	22 Aug 2011 20:50:50 -0000
>@@ -280,6 +280,8 @@
> 				color = getColor(EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND);
> 				fContentAssistant.setContextInformationPopupForeground(color);
> 				fContentAssistant.setContextSelectorForeground(color);
>+
>+				fContentAssistant.enableAutoInsert(fPreferenceStore.getBoolean(EditorPreferenceNames.INSERT_SINGLE_SUGGESTION));
> 			}
> 			
> 			// add content assist processors for each partition type
>Index: src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java,v
>retrieving revision 1.15
>diff -u -r1.15 PreferenceInitializer.java
>--- src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java	26 Aug 2009 20:50:37 -0000	1.15
>+++ src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java	22 Aug 2011 20:50:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2009 IBM Corporation and others.
>+ * Copyright (c) 2001, 2011 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
>@@ -75,6 +75,7 @@
> 		PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0)));
> 		PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND, new RGB(255, 255, 255)));
> 		PreferenceConverter.setDefault(store, EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND, ColorHelper.findRGB(registry, EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND, new RGB(0, 0, 0)));
>+		store.setDefault(EditorPreferenceNames.INSERT_SINGLE_SUGGESTION, true);
> 
> 		store.setDefault(EditorPreferenceNames.SEMANTIC_HIGHLIGHTING, true);
> 	}
>Index: src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java,v
>retrieving revision 1.31
>diff -u -r1.31 SSEUIMessages.java
>--- src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java	8 Mar 2011 19:41:41 -0000	1.31
>+++ src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java	22 Aug 2011 20:50:50 -0000
>@@ -205,6 +205,7 @@
> 	public static String StructuredTextEditorPreferencePage_30;
> 	public static String StructuredTextEditorPreferencePage_37;
> 	public static String StructuredTextEditorPreferencePage_38;
>+	public static String StructuredTextEditorPreferencePage_4;
> 	public static String StructuredTextEditorPreferencePage_40;
> 	public static String StructuredTextEditorPreferencePage_41;
> 	public static String StructuredTextEditorPreferencePage_42;
>Index: src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties,v
>retrieving revision 1.42
>diff -u -r1.42 SSEUIPluginResources.properties
>--- src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties	8 Mar 2011 19:41:41 -0000	1.42
>+++ src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties	22 Aug 2011 20:50:50 -0000
>@@ -179,6 +179,7 @@
> StructuredTextEditorPreferencePage_37=Empty input
> StructuredTextEditorPreferencePage_38=is not a valid input.
> StructuredTextEditorPreferencePage_39=Inform when &unsupported content type is in editor
>+StructuredTextEditorPreferencePage_4=Insert single proposals automatically
> StructuredTextEditorPreferencePage_40=Also see the <a>''{0}''</a> preferences.
> StructuredTextEditorPreferencePage_41=Completion proposal background
> StructuredTextEditorPreferencePage_42=Completion proposal foreground
>Index: src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java,v
>retrieving revision 1.4
>diff -u -r1.4 EditorPreferenceNames.java
>--- src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java	26 Jan 2009 22:45:19 -0000	1.4
>+++ src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java	22 Aug 2011 20:50:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -153,4 +153,12 @@
> 	 * </p>
> 	 */
> 	public final static String SEMANTIC_HIGHLIGHTING = "semanticHighlighting"; //$NON-NLS-1$
>+
>+	/**
>+	 * A named preference that controls whether content assist will automatically insert single suggestions
>+	 * <p>
>+	 * Value is of type <code>Boolean</code>.
>+	 * </p>
>+	 */
>+	public final static String INSERT_SINGLE_SUGGESTION = "insertSingleSuggestion"; //$NON-NLS-1$
> }
>Index: src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java,v
>retrieving revision 1.9
>diff -u -r1.9 StructuredTextEditorPreferencePage.java
>--- src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java	26 Aug 2009 20:50:37 -0000	1.9
>+++ src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java	22 Aug 2011 20:50:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2009 IBM Corporation and others.
>+ * Copyright (c) 2001, 2011 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
>@@ -158,7 +158,10 @@
> 
> 		label = SSEUIMessages.StructuredTextEditorPreferencePage_3;
> 		addCheckBox(appearanceComposite, label, AbstractStructuredFoldingStrategy.FOLDING_ENABLED, 0);
>-		
>+
>+		label = SSEUIMessages.StructuredTextEditorPreferencePage_4;
>+		addCheckBox(appearanceComposite, label, EditorPreferenceNames.INSERT_SINGLE_SUGGESTION, 0);
>+
> 		label = SSEUIMessages.StructuredTextEditorPreferencePage_1;
> 		addCheckBox(appearanceComposite, label, EditorPreferenceNames.SEMANTIC_HIGHLIGHTING, 0);
> 
>@@ -296,7 +299,9 @@
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceNames.SHOW_UNKNOWN_CONTENT_TYPE_MSG));
> 
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractStructuredFoldingStrategy.FOLDING_ENABLED));
>-		
>+
>+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceNames.INSERT_SINGLE_SUGGESTION));
>+
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceNames.SEMANTIC_HIGHLIGHTING));
> 
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceNames.CODEASSIST_PROPOSALS_BACKGROUND));
>#P org.eclipse.wst.xml.ui
>Index: src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java,v
>retrieving revision 1.3
>diff -u -r1.3 CustomTemplateProposal.java
>--- src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java	10 Apr 2007 20:04:56 -0000	1.3
>+++ src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java	22 Aug 2011 20:50:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -12,6 +12,7 @@
> package org.eclipse.wst.xml.ui.internal.contentassist;
> 
> import org.eclipse.jface.text.IRegion;
>+import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
> import org.eclipse.jface.text.templates.Template;
> import org.eclipse.jface.text.templates.TemplateContext;
> import org.eclipse.jface.text.templates.TemplateProposal;
>@@ -23,7 +24,7 @@
>  * Purpose of this class is to make the additional proposal info into content
>  * fit for an HTML viewer (by escaping characters)
>  */
>-class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal {
>+class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal, ICompletionProposalExtension4 {
> 	// copies of this class exist in:
> 	// org.eclipse.jst.jsp.ui.internal.contentassist
> 	// org.eclipse.wst.html.ui.internal.contentassist
>@@ -37,4 +38,8 @@
> 		String additionalInfo = super.getAdditionalProposalInfo();
> 		return StringUtils.convertToHTMLContent(additionalInfo);
> 	}
>+
>+	public boolean isAutoInsertable() {
>+		return false;
>+	}
> }

Actions: View | Diff

Attachments on bug 134073: 120619 | 120631 | 201956