[cdt-patch] Solution to Code Assist Preferences bugs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[cdt-patch] Solution to Code Assist Preferences bugs

From: Hoda Amer <hamer@xxxxxxxxxx>
Date: Fri, 26 Sep 2003 10:45:50 -0400
Delivered-to: cdt-patch@xxxxxxxxxxx
List-archive: <http://dev.eclipse.org/pipermail/cdt-patch/>
List-help: <mailto:cdt-patch-request@eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=unsubscribe>

UI:
Solution to :
bug#43149: Code Assist Preferences: Background Color not working....
bug#43153: Code Assist Preferences: Disabling "Insert single proposa...
bug#43154: Code Assist Preferences: Enable Auto activation not working
bug#42224: Code Assist preferences Do not work properly

Hoda Amer
Staff Software Engineer
Rational Software - IBM Software Group

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.191
diff -u -r1.191 ChangeLog
--- ChangeLog	25 Sep 2003 19:51:42 -0000	1.191
+++ ChangeLog	26 Sep 2003 14:44:15 -0000
@@ -1,3 +1,10 @@
+2003-09-26 Hoda Amer
+	Solution to :
+	bug#43149: Code Assist Preferences: Background Color not working.... 
+	bug#43153:  Code Assist Preferences: Disabling "Insert single proposa... 
+	bug#43154: Code Assist Preferences: Enable Auto activation not working 
+	bug#42224: Code Assist preferences Do not work properly 
+	
 2003-09-25 Hoda Amer
 	Solution to bug#43646: Code Assist won't work if missing end bracket
 
Index: src/org/eclipse/cdt/internal/ui/editor/CEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java,v
retrieving revision 1.30
diff -u -r1.30 CEditor.java
--- src/org/eclipse/cdt/internal/ui/editor/CEditor.java	11 Sep 2003 17:13:00 -0000	1.30
+++ src/org/eclipse/cdt/internal/ui/editor/CEditor.java	26 Sep 2003 14:44:15 -0000
@@ -23,6 +23,7 @@
 import org.eclipse.cdt.internal.ui.text.CPairMatcher;
 import org.eclipse.cdt.internal.ui.text.CSourceViewerConfiguration;
 import org.eclipse.cdt.internal.ui.text.CTextTools;
+import org.eclipse.cdt.internal.ui.text.ContentAssistPreference;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IWorkingCopyManager;
 import org.eclipse.core.resources.IFile;
@@ -43,6 +44,8 @@
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.ITextViewerExtension;
 import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.IAnnotationAccess;
 import org.eclipse.jface.text.source.IAnnotationModel;
@@ -257,6 +260,11 @@
 						stopTabConversion();
 					return;
 				}
+				
+				IContentAssistant c= asv.getContentAssistant();
+				if (c instanceof ContentAssistant)
+					ContentAssistPreference.changeConfiguration((ContentAssistant) c, getPreferenceStore(), event);
+				
 			}
 		} finally {
 			super.handlePreferenceStoreChanged(event);
@@ -708,6 +716,9 @@
 			String language) {
 			super(parent, ruler, fOverviewRuler, isOverviewRulerShowing, styles);
 			fDisplayLanguage = language;
+		}
+		public IContentAssistant getContentAssistant() {
+			return fContentAssistant;
 		}
 
 		/*
Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java,v
retrieving revision 1.13
diff -u -r1.13 CEditorPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java	25 Sep 2003 14:09:58 -0000	1.13
+++ src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java	26 Sep 2003 14:44:16 -0000
@@ -233,6 +233,12 @@
 		overlayKeys.add(
 			new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ContentAssistPreference.PROPOSALS_BACKGROUND));
 		overlayKeys.add(
+			new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ContentAssistPreference.PROPOSALS_FOREGROUND));
+		overlayKeys.add(
+			new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ContentAssistPreference.PARAMETERS_BACKGROUND));
+		overlayKeys.add(
+			new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ContentAssistPreference.PARAMETERS_FOREGROUND));
+		overlayKeys.add(
 			new OverlayPreferenceStore.OverlayKey(
 				OverlayPreferenceStore.STRING,
 				ContentAssistPreference.AUTOACTIVATION_TRIGGERS_C));
@@ -331,9 +337,9 @@
 
 		store.setDefault(ContentAssistPreference.AUTOINSERT, true);
 		PreferenceConverter.setDefault(store, ContentAssistPreference.PROPOSALS_BACKGROUND, new RGB(254, 241, 233));
-		//PreferenceConverter.setDefault(store, ContentAssistPreference.PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
-		//PreferenceConverter.setDefault(store, ContentAssistPreference.PARAMETERS_BACKGROUND, new RGB(254, 241, 233));
-		//PreferenceConverter.setDefault(store, ContentAssistPreference.PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
+		PreferenceConverter.setDefault(store, ContentAssistPreference.PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
+		PreferenceConverter.setDefault(store, ContentAssistPreference.PARAMETERS_BACKGROUND, new RGB(254, 241, 233));
+		PreferenceConverter.setDefault(store, ContentAssistPreference.PARAMETERS_FOREGROUND, new RGB(0, 0, 0));
 		//store.setDefault(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_C, ".,");
 		//store.setDefault(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVADOC, "@");
 		//store.setDefault(ContentAssistPreference.SHOW_VISIBLE_PROPOSALS, true);
@@ -912,14 +918,14 @@
 		label = "&Background for completion proposals:";
 		addColorButton(contentAssistComposite, label, ContentAssistPreference.PROPOSALS_BACKGROUND, 0);
 
-		//label= "&Foreground for completion proposals:";
-		//addColorButton(contentAssistComposite, label, ContentAssistPreference.PROPOSALS_FOREGROUND, 0);
-
-		//label= "Bac&kground for method parameters:";
-		//addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_BACKGROUND, 0);
+		label= "&Foreground for completion proposals:";
+		addColorButton(contentAssistComposite, label, ContentAssistPreference.PROPOSALS_FOREGROUND, 0);
 
-		//label= "Fo&reground for method parameters:";
-		//addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_FOREGROUND, 0);
+//		label= "Bac&kground for method parameters:";
+//		addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_BACKGROUND, 0);
+//
+//		label= "Fo&reground for method parameters:";
+//		addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_FOREGROUND, 0);
 
 		return contentAssistComposite;
 	}
Index: src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java,v
retrieving revision 1.6
diff -u -r1.6 EditTemplateDialog.java
--- src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java	4 Feb 2003 20:00:46 -0000	1.6
+++ src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java	26 Sep 2003 14:44:16 -0000
@@ -118,13 +118,13 @@
 			
 			Color background= createColor(store, ContentAssistPreference.PROPOSALS_BACKGROUND, display);			
 			assistant.setContextInformationPopupBackground(background);
-			//assistant.setContextSelectorBackground(background);
-			//assistant.setProposalSelectorBackground(background);
+			assistant.setContextSelectorBackground(background);
+			assistant.setProposalSelectorBackground(background);
 
-			//Color foreground= createColor(store, ContentAssistPreference.PROPOSALS_FOREGROUND, display);
-			//assistant.setContextInformationPopupForeground(foreground);
-			//assistant.setContextSelectorForeground(foreground);
-			//assistant.setProposalSelectorForeground(foreground);
+			Color foreground= createColor(store, ContentAssistPreference.PROPOSALS_FOREGROUND, display);
+			assistant.setContextInformationPopupForeground(foreground);
+			assistant.setContextSelectorForeground(foreground);
+			assistant.setProposalSelectorForeground(foreground);
 			
 			return assistant;
 		}	
Index: src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java,v
retrieving revision 1.14
diff -u -r1.14 CCompletionProcessor.java
--- src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java	25 Sep 2003 19:40:29 -0000	1.14
+++ src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java	26 Sep 2003 14:44:16 -0000
@@ -588,7 +588,8 @@
 			
 			// The info string could be populated with documentation info.
 			// For now, it has the name and the parent's name if available.
-			proposal.setAdditionalProposalInfo(infoString.toString());
+			if(!displayString.equals(infoString.toString()))
+				proposal.setAdditionalProposalInfo(infoString.toString());
 		}
 	}
 
Index: src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java,v
retrieving revision 1.11
diff -u -r1.11 CSourceViewerConfiguration.java
--- src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java	24 Jun 2003 14:22:14 -0000	1.11
+++ src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java	26 Sep 2003 14:44:16 -0000
@@ -177,13 +177,9 @@
 		assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
 
 		//Will this work as a replacement for the configuration lines below?
-		//ContentAssistPreference.configure(assistant, getPreferenceStore());
-		
-		assistant.enableAutoInsert(CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.AUTOINSERT));
-		assistant.enableAutoActivation(true);
-		assistant.setAutoActivationDelay(500);
-		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
+		ContentAssistPreference.configure(assistant, getPreferenceStore());
 		
+		assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);		
 		assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
 		assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
 
Index: src/org/eclipse/cdt/internal/ui/text/ContentAssistPreference.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/ContentAssistPreference.java,v
retrieving revision 1.2
diff -u -r1.2 ContentAssistPreference.java
--- src/org/eclipse/cdt/internal/ui/text/ContentAssistPreference.java	29 Oct 2002 21:40:58 -0000	1.2
+++ src/org/eclipse/cdt/internal/ui/text/ContentAssistPreference.java	26 Sep 2003 14:44:16 -0000
@@ -90,34 +90,33 @@
 	/**
 	 * Configure the given content assistant from the given store.
 	 */
-	public static void configure(ContentAssistant assistant, IPreferenceStore store) {
-		
+	public static void configure(ContentAssistant assistant, IPreferenceStore store) {	
+			
 		CTextTools textTools= CUIPlugin.getDefault().getTextTools();
 		IColorManager manager= textTools.getColorManager();		
 		
-		
 		boolean enabled= store.getBoolean(AUTOACTIVATION);
 		assistant.enableAutoActivation(enabled);
 		
 		int delay= store.getInt(AUTOACTIVATION_DELAY);
 		assistant.setAutoActivationDelay(delay);
 		
-		//Color c= getColor(store, PROPOSALS_FOREGROUND, manager);
-		//assistant.setProposalSelectorForeground(c);
+		Color c1= getColor(store, PROPOSALS_FOREGROUND, manager);
+		assistant.setProposalSelectorForeground(c1);
 		
-		Color c= getColor(store, PROPOSALS_BACKGROUND, manager);
-		assistant.setContextInformationPopupBackground(c);
+		Color c2= getColor(store, PROPOSALS_BACKGROUND, manager);
+		assistant.setProposalSelectorBackground(c2);
 		
-		c= getColor(store, PARAMETERS_FOREGROUND, manager);
-		//assistant.setContextInformationPopupForeground(c);
-		//assistant.setContextSelectorForeground(c);
-		
-		c= getColor(store, PARAMETERS_BACKGROUND, manager);
-		assistant.setContextInformationPopupBackground(c);
-		//assistant.setContextSelectorBackground(c);
+		Color c3= getColor(store, PARAMETERS_FOREGROUND, manager);
+		assistant.setContextInformationPopupForeground(c3);
+		assistant.setContextSelectorForeground(c3);
+		
+		Color c4= getColor(store, PARAMETERS_BACKGROUND, manager);
+		assistant.setContextInformationPopupBackground(c4);
+		assistant.setContextSelectorBackground(c4);
 		
 		enabled= store.getBoolean(AUTOINSERT);
-		//assistant.enableAutoInsert(enabled);
+		assistant.enableAutoInsert(enabled);
 
 		configureCProcessor(assistant, store);
 	}
@@ -162,22 +161,22 @@
 			int delay= store.getInt(AUTOACTIVATION_DELAY);
 			assistant.setAutoActivationDelay(delay);
 		} else if (PROPOSALS_FOREGROUND.equals(p)) {
-			//Color c= getColor(store, PROPOSALS_FOREGROUND);
-			//assistant.setProposalSelectorForeground(c);
+			Color c= getColor(store, PROPOSALS_FOREGROUND);
+			assistant.setProposalSelectorForeground(c);
 		} else if (PROPOSALS_BACKGROUND.equals(p)) {
-			//Color c= getColor(store, PROPOSALS_BACKGROUND);
-			//assistant.setProposalSelectorBackground(c);
+			Color c= getColor(store, PROPOSALS_BACKGROUND);
+			assistant.setProposalSelectorBackground(c);
 		} else if (PARAMETERS_FOREGROUND.equals(p)) {
-			//Color c= getColor(store, PARAMETERS_FOREGROUND);
-			//assistant.setContextInformationPopupForeground(c);
-			//assistant.setContextSelectorForeground(c);
+			Color c= getColor(store, PARAMETERS_FOREGROUND);
+			assistant.setContextInformationPopupForeground(c);
+			assistant.setContextSelectorForeground(c);
 		} else if (PARAMETERS_BACKGROUND.equals(p)) {
 			Color c= getColor(store, PARAMETERS_BACKGROUND);
 			assistant.setContextInformationPopupBackground(c);
-			//assistant.setContextSelectorBackground(c);
+			assistant.setContextSelectorBackground(c);
 		} else if (AUTOINSERT.equals(p)) {
-			//boolean enabled= store.getBoolean(AUTOINSERT);
-			//assistant.enableAutoInsert(enabled);
+			boolean enabled= store.getBoolean(AUTOINSERT);
+			assistant.enableAutoInsert(enabled);
 		}
 		
 		changeCProcessor(assistant, store, p);

Follow-Ups:
- [cdt-patch] Solution to Bug#: 43827 Help IDs needed for different CEditor tabs
  - From: Hoda Amer
- Applied [HEAD] Re: [cdt-patch] Solution to Code Assist Preferences bugs
  - From: John Camelon

References:
- Re: [cdt-patch] Indexer patch - Bug 42685, Bug 43474
  - From: Bogdan Gheorghe

Prev by Date: Re: [cdt-patch] Fixes for 42648 and 43122.
Next by Date: Applied [HEAD] Re: [cdt-patch] Solution to Code Assist Preferences bugs
Previous by thread: Re: [cdt-patch] Indexer patch - Bug 42685, Bug 43474
Next by thread: Applied [HEAD] Re: [cdt-patch] Solution to Code Assist Preferences bugs
Index(es):
- Date
- Thread

Breadcrumbs