Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Applied: Turn on the new parser

This patch changes the default for the CModel to use the new parser.  The preference is still there so you can go back to the old one if necessary.  Please file any problems you see in bugzilla.

 

Also, I change the preference to be stored in the CCorePlugin preferences instead of the silly kludge I had before.

 

Doug Schaefer
Senior Staff Software Engineer

Rational Software - IBM Software Group
Ottawa (Kanata), Ontario, Canada

 

Index: src/org/eclipse/cdt/core/CCorePlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java,v
retrieving revision 1.15
diff -u -r1.15 CCorePlugin.java
--- src/org/eclipse/cdt/core/CCorePlugin.java	31 Mar 2003 03:44:10 -0000	1.15
+++ src/org/eclipse/cdt/core/CCorePlugin.java	2 Apr 2003 21:19:47 -0000
@@ -46,6 +46,7 @@
 	public final static String PREF_BINARY_PARSER = "binaryparser";
 	public final static String DEFAULT_BINARY_PARSER_SIMPLE_ID = "ELF";
 	public final static String DEFAULT_BINARY_PARSER_UNIQ_ID = PLUGIN_ID + "." + DEFAULT_BINARY_PARSER_SIMPLE_ID;
+	public final static String PREF_USE_NEW_PARSER = "useNewParser";
 
 	private static CCorePlugin fgCPlugin;
 	private static ResourceBundle fgResourceBundle;
@@ -127,6 +128,9 @@
 		getIndexModel();
 		fDescriptorManager = new CDescriptorManager();
 		fDescriptorManager.startup();
+		
+		// Set the default for using the new parser
+		getPluginPreferences().setDefault(PREF_USE_NEW_PARSER, true);
 	}
 
 	public IConsole getConsole(String id) {
@@ -404,15 +408,13 @@
 	}
 
 	// Preference to turn on/off the new parser
-
-	private boolean useNewParser = false;
-
 	public void setUseNewParser(boolean useNewParser) {
-		this.useNewParser = useNewParser;
+		getPluginPreferences().setValue(PREF_USE_NEW_PARSER, useNewParser);
+		savePluginPreferences();
 	}
 
 	public boolean useNewParser() {
-		return useNewParser;
+		return getPluginPreferences().getBoolean(PREF_USE_NEW_PARSER);
 	}
 
 	/**

Index: src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java,v
retrieving revision 1.7
diff -u -r1.7 CPluginPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java	4 Mar 2003 18:25:43 -0000	1.7
+++ src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java	2 Apr 2003 21:20:11 -0000
@@ -23,7 +23,6 @@
 	
 	private static final String PREF_LINK_TO_EDITOR= "linkToEditor"; //$NON-NLS-1$
 	public static final String PREF_SHOW_CU_CHILDREN= "CUChildren"; //$NON-NLS-1$
-	private static final String PREF_USE_NEW_PARSER= "useNewParser"; //$NON-NLS-1$
 
 	private static final String LINK_TO_EDITOR_LABEL= "CBasePreferencePage.linkToEditor.label";
 	private static final String SHOW_CU_CHILDREN_LABEL= "CBasePreferencePage.CUChildren.label";
@@ -54,7 +53,7 @@
 		BooleanFieldEditor showCUChildrenEditor= new BooleanFieldEditor(PREF_SHOW_CU_CHILDREN, CUIPlugin.getResourceString(SHOW_CU_CHILDREN_LABEL), parent);
 		addField(showCUChildrenEditor);
 
-		BooleanFieldEditor useNewParserEditor= new BooleanFieldEditor(PREF_USE_NEW_PARSER, CUIPlugin.getResourceString(USE_NEW_PARSER_LABEL), parent);
+		BooleanFieldEditor useNewParserEditor= new BooleanFieldEditor(CCorePlugin.PREF_USE_NEW_PARSER, CUIPlugin.getResourceString(USE_NEW_PARSER_LABEL), parent);
 		addField(useNewParserEditor);
 	}
 	
@@ -68,13 +67,14 @@
 	}
 	
 	public static boolean useNewParser() {
-		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PREF_USE_NEW_PARSER);
+		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(CCorePlugin.PREF_USE_NEW_PARSER);
 	}
 	
 	/**
 	 * @see IWorkbenchPreferencePage#init
 	 */
 	public void init(IWorkbench workbench) {
+		CUIPlugin.getDefault().getPreferenceStore().setValue(CCorePlugin.PREF_USE_NEW_PARSER, CCorePlugin.getDefault().useNewParser());
 	}
 	
 	/**
@@ -83,7 +83,7 @@
 	public static void initDefaults(IPreferenceStore prefs) {
 		prefs.setDefault(PREF_LINK_TO_EDITOR, true);
 		prefs.setDefault(PREF_SHOW_CU_CHILDREN, true);
-		prefs.setDefault(PREF_USE_NEW_PARSER, false);
+		prefs.setDefault(CCorePlugin.PREF_USE_NEW_PARSER, CCorePlugin.getDefault().useNewParser());
 	}
 	
 	/* (non-Javadoc)
Index: src/org/eclipse/cdt/ui/CUIPlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java,v
retrieving revision 1.9
diff -u -r1.9 CUIPlugin.java
--- src/org/eclipse/cdt/ui/CUIPlugin.java	2 Apr 2003 05:04:12 -0000	1.9
+++ src/org/eclipse/cdt/ui/CUIPlugin.java	2 Apr 2003 21:20:11 -0000
@@ -239,10 +239,6 @@
 				CPluginImages.initialize();
 			}
 		});
-		
-		// TODO - temporary kludge (maybe) to make sure the core preferences
-		// are kept in sync with the stored preferences
-		CCorePlugin.getDefault().setUseNewParser(CPluginPreferencePage.useNewParser());
 	}
 
 	/**

Back to the top