Attachment 120619 Details for Bug 134073 – patch

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

[patch] patch

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

on 2008-12-16 14:02:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2008-12-16 14:02:37 EST

Size: 15.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.42
>diff -u -r1.42 StructuredTextViewerConfiguration.java
>--- src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java	10 Dec 2008 22:45:08 -0000	1.42
>+++ src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java	16 Dec 2008 18:05:48 -0000
>@@ -42,6 +42,8 @@
> import org.eclipse.jface.text.source.Annotation;
> import org.eclipse.jface.text.source.IAnnotationHover;
> import org.eclipse.jface.text.source.ISourceViewer;
>+import org.eclipse.jface.util.IPropertyChangeListener;
>+import org.eclipse.jface.util.PropertyChangeEvent;
> import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Color;
>@@ -87,7 +89,7 @@
>  * @see org.eclipse.wst.sse.ui.internal.StructuredTextViewer
>  * @since 1.0
>  */
>-public class StructuredTextViewerConfiguration extends TextSourceViewerConfiguration {
>+public class StructuredTextViewerConfiguration extends TextSourceViewerConfiguration implements IPropertyChangeListener {
> 	/*
> 	 * One instance per configuration because creating a second assistant that
> 	 * is added to a viewer can cause odd key-eating by the wrong one.
>@@ -117,6 +119,7 @@
> 		// initialize fPreferenceStore with same preference store used in
> 		// StructuredTextEditor
> 		fPreferenceStore = createCombinedPreferenceStore();
>+		fPreferenceStore.addPropertyChangeListener(this);
> 	}
> 
> 	/**
>@@ -273,6 +276,8 @@
> 				color = getColor(EditorPreferenceNames.CODEASSIST_PARAMETERS_FOREGROUND);
> 				fContentAssistant.setContextInformationPopupForeground(color);
> 				fContentAssistant.setContextSelectorForeground(color);
>+				
>+				fContentAssistant.enableAutoInsert(fPreferenceStore.getBoolean(EditorPreferenceNames.INSERT_SINGLE_SUGGESTION));
> 			}
> 		}
> 
>@@ -687,4 +692,12 @@
> 	public void setHighlighter(ReconcilerHighlighter highlighter) {
> 		fHighlighter = highlighter;
> 	}
>+
>+	public void propertyChange(PropertyChangeEvent event) {
>+		if(fContentAssistant != null && EditorPreferenceNames.INSERT_SINGLE_SUGGESTION.equals(event.getProperty())) {
>+			Object value = event.getNewValue();
>+			if (value instanceof Boolean)
>+				fContentAssistant.enableAutoInsert(((Boolean) value).booleanValue());
>+		}
>+	}
> }
>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.25
>diff -u -r1.25 SSEUIPluginResources.properties
>--- src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties	26 Feb 2008 02:53:29 -0000	1.25
>+++ src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties	16 Dec 2008 18:05:48 -0000
>@@ -175,6 +175,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/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.12
>diff -u -r1.12 PreferenceInitializer.java
>--- src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java	15 May 2008 21:52:10 -0000	1.12
>+++ src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java	16 Dec 2008 18:05:48 -0000
>@@ -75,6 +75,8 @@
> 		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);
> 	}
> 
> 	private void setMatchingBracketsPreferences(IPreferenceStore store, ColorRegistry registry) {
>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.22
>diff -u -r1.22 SSEUIMessages.java
>--- src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java	26 Feb 2008 02:53:29 -0000	1.22
>+++ src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java	16 Dec 2008 18:05:48 -0000
>@@ -201,6 +201,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/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.3
>diff -u -r1.3 EditorPreferenceNames.java
>--- src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java	13 Feb 2007 01:19:00 -0000	1.3
>+++ src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java	16 Dec 2008 18:05:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -145,4 +145,12 @@
> 	 * @see org.eclipse.jface.preference.PreferenceConverter
> 	 */
> 	public final static String CODEASSIST_PARAMETERS_FOREGROUND = "content_assist_parameters_foreground"; //$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.7
>diff -u -r1.7 StructuredTextEditorPreferencePage.java
>--- src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java	13 Feb 2007 01:19:00 -0000	1.7
>+++ src/org/eclipse/wst/sse/ui/internal/preferences/ui/StructuredTextEditorPreferencePage.java	16 Dec 2008 18:05:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2007 IBM Corporation and others.
>+ * Copyright (c) 2001, 2008 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
>@@ -159,6 +159,9 @@
> 		label = SSEUIMessages.StructuredTextEditorPreferencePage_3;
> 		addCheckBox(appearanceComposite, label, IStructuredTextFoldingProvider.FOLDING_ENABLED, 0);
> 
>+		label = SSEUIMessages.StructuredTextEditorPreferencePage_4;
>+		addCheckBox(appearanceComposite, label, EditorPreferenceNames.INSERT_SINGLE_SUGGESTION, 0);
>+
> 		Label l = new Label(appearanceComposite, SWT.LEFT);
> 		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
> 		gd.horizontalSpan = 2;
>@@ -294,6 +297,8 @@
> 
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, IStructuredTextFoldingProvider.FOLDING_ENABLED));
> 		
>+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceNames.INSERT_SINGLE_SUGGESTION));
>+
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceNames.CODEASSIST_PROPOSALS_BACKGROUND));
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceNames.CODEASSIST_PROPOSALS_FOREGROUND));
> 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, EditorPreferenceNames.CODEASSIST_PARAMETERS_BACKGROUND));
>#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	16 Dec 2008 18:05:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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.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	16 Dec 2008 18:05:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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;
>+	}
> }
>#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	16 Dec 2008 18:05:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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;
>+	}
> }

Actions: View | Diff

Attachments on bug 134073: 120619 | 120631 | 201956