Index: ChangeLog =================================================================== RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v retrieving revision 1.508.2.18 diff -u -r1.508.2.18 ChangeLog --- ChangeLog 4 Aug 2004 14:24:07 -0000 1.508.2.18 +++ ChangeLog 5 Aug 2004 21:05:58 -0000 @@ -1,3 +1,8 @@ +2004-08-05 Tanya Wolff + + Fix for 70850: Duplicate entries in C/C++ preferences + src/org.eclipse.cdt.internal.ui.preferences/CeditorHoverConfigurationBlock.java + 2004-08-03 Tanya Wolff Fix for 71033: English "Find Refs" in Workbench Key preferences. Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java,v retrieving revision 1.4 diff -u -r1.4 CEditorHoverConfigurationBlock.java --- src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java 17 Jun 2004 20:26:13 -0000 1.4 +++ src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java 5 Aug 2004 21:05:59 -0000 @@ -374,19 +374,17 @@ CEditorTextHoverDescriptor[] hoverDescriptors= CUIPlugin.getDefault().getCEditorTextHoverDescriptors(); // Move Best Match hover to front - CEditorTextHoverDescriptor currentHover= hoverDescriptors[0]; + boolean done= false; for (int i= 0; !done && i < hoverDescriptors.length; i++) { if (PreferenceConstants.ID_BESTMATCH_HOVER.equals(hoverDescriptors[i].getId())) { // Swap with first one + CEditorTextHoverDescriptor tmpHover= hoverDescriptors[0]; hoverDescriptors[0]= hoverDescriptors[i]; - hoverDescriptors[i]= currentHover; + hoverDescriptors[i]= tmpHover; return hoverDescriptors; } - if (i > 0) { - currentHover= hoverDescriptors[i]; - hoverDescriptors[i]= hoverDescriptors[i-1]; - } + } // return unchanged array if best match hover can't be found @@ -451,8 +449,10 @@ } void performDefaults() { + fStatus= new StatusInfo(); restoreFromPreferences(); initializeFields(); + updateStatus(); } private void restoreFromPreferences() {