From 6f4c249382dd8cd48cac8e581133cbcb438818fd Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Fri, 1 Oct 2010 12:39:24 +0000
Subject: [PATCH] Use unique preference keys for occurrences and override
 annotations, related to bugs 324905 and 320561

---
 core/org.eclipse.cdt.ui/plugin.xml | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 2441e94a23f..f2036cc189f 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -2612,67 +2612,67 @@
             annotationType="org.eclipse.cdt.ui.occurrences"
             label="%OccurrenceAnnotation.label"
             icon="$nl$/icons/obj16/searchm_obj.gif"
-            textPreferenceKey="occurrenceIndication"
+            textPreferenceKey="org.eclipse.cdt.ui.occurrenceIndication"
             textPreferenceValue="false"
-            highlightPreferenceKey="occurrenceHighlighting"
+            highlightPreferenceKey="org.eclipse.cdt.ui.occurrenceHighlighting"
             highlightPreferenceValue="true"
             contributesToHeader="false"
-            overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler"
+            overviewRulerPreferenceKey="org.eclipse.cdt.ui.occurrenceIndicationInOverviewRuler"
             overviewRulerPreferenceValue="true"
-            verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler"
+            verticalRulerPreferenceKey="org.eclipse.cdt.ui.occurrenceIndicationInVerticalRuler"
             verticalRulerPreferenceValue="false"
-            colorPreferenceKey="occurrenceIndicationColor"
+            colorPreferenceKey="org.eclipse.cdt.ui.occurrenceIndicationColor"
             colorPreferenceValue="212,212,212"
             presentationLayer="4"
-            showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction"
+            showInNextPrevDropdownToolbarActionKey="org.eclipse.cdt.ui.showOccurrenceInNextPrevDropdownToolbarAction"
             showInNextPrevDropdownToolbarAction="true"
-            isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget"
+            isGoToNextNavigationTargetKey="org.eclipse.cdt.ui.isOccurrenceGoToNextNavigationTarget"
 	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget"
+            isGoToPreviousNavigationTargetKey="org.eclipse.cdt.ui.isOccurrenceGoToPreviousNavigationTarget"
 	        isGoToPreviousNavigationTarget="false"
-            textStylePreferenceKey="occurrenceTextStyle"
+            textStylePreferenceKey="org.eclipse.cdt.ui.occurrenceTextStyle"
             textStylePreferenceValue="NONE">
 	  </specification>
 	  <specification
             annotationType="org.eclipse.cdt.ui.occurrences.write"
             label="%WriteOccurrenceAnnotation.label"
-            textPreferenceKey="occurrenceIndication"
+            textPreferenceKey="org.eclipse.cdt.ui.occurrenceIndication"
             textPreferenceValue="false"
-            highlightPreferenceKey="writeOccurrenceHighlighting"
+            highlightPreferenceKey="org.eclipse.cdt.ui.writeOccurrenceHighlighting"
             highlightPreferenceValue="true"
-            overviewRulerPreferenceKey="writeOccurrenceIndicationInOverviewRuler"
+            overviewRulerPreferenceKey="org.eclipse.cdt.ui.writeOccurrenceIndicationInOverviewRuler"
             overviewRulerPreferenceValue="true"
-            verticalRulerPreferenceKey="writeOccurrenceIndicationInVerticalRuler"
+            verticalRulerPreferenceKey="org.eclipse.cdt.ui.writeOccurrenceIndicationInVerticalRuler"
             verticalRulerPreferenceValue="false"
-            colorPreferenceKey="writeOccurrenceIndicationColor"
+            colorPreferenceKey="org.eclipse.cdt.ui.writeOccurrenceIndicationColor"
             colorPreferenceValue="240, 216, 168"
             presentationLayer="4"
-            textStylePreferenceKey="writeOccurrenceTextStyle"
+            textStylePreferenceKey="org.eclipse.cdt.ui.writeOccurrenceTextStyle"
             textStylePreferenceValue="NONE">
 	  </specification>
 	  <specification
             annotationType="org.eclipse.cdt.ui.overrideIndicator"
             label="%overrideAnnotation.label"
 			annotationImageProvider ="org.eclipse.cdt.internal.ui.editor.OverrideIndicatorImageProvider"
-            textPreferenceKey="overrideIndicator"
+            textPreferenceKey="org.eclipse.cdt.ui.overrideIndicator"
             textPreferenceValue="false"
-            highlightPreferenceKey="overrideIndicatorHighlighting"
+            highlightPreferenceKey="org.eclipse.cdt.ui.overrideIndicatorHighlighting"
             highlightPreferenceValue="false"
             contributesToHeader="false"
-            overviewRulerPreferenceKey="overrideIndicatorInOverviewRuler"
+            overviewRulerPreferenceKey="org.eclipse.cdt.ui.overrideIndicatorInOverviewRuler"
             overviewRulerPreferenceValue="false"
-            verticalRulerPreferenceKey="overrideIndicatorInVerticalRuler"
+            verticalRulerPreferenceKey="org.eclipse.cdt.ui.overrideIndicatorInVerticalRuler"
             verticalRulerPreferenceValue="true"
-            colorPreferenceKey="overrideIndicatorColor"
+            colorPreferenceKey="org.eclipse.cdt.ui.overrideIndicatorColor"
             colorPreferenceValue="180,207,205"
             presentationLayer="3"
-            showInNextPrevDropdownToolbarActionKey="showoverrideIndicatorInNextPrevDropdownToolbarAction"
+            showInNextPrevDropdownToolbarActionKey="org.eclipse.cdt.ui.showoverrideIndicatorInNextPrevDropdownToolbarAction"
             showInNextPrevDropdownToolbarAction="false"
-            isGoToNextNavigationTargetKey="isOverrideIndicatorGoToNextNavigationTarget"
+            isGoToNextNavigationTargetKey="org.eclipse.cdt.ui.isOverrideIndicatorGoToNextNavigationTarget"
 	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="isOverrideIndicatorGoToPreviousNavigationTarget"
+            isGoToPreviousNavigationTargetKey="org.eclipse.cdt.ui.isOverrideIndicatorGoToPreviousNavigationTarget"
 	        isGoToPreviousNavigationTarget="false"
-            textStylePreferenceKey="overrideIndicatorTextStyle"
+            textStylePreferenceKey="org.eclipse.cdt.ui.overrideIndicatorTextStyle"
             textStylePreferenceValue="SQUIGGLES">
 	  </specification>
    </extension>