Uses the preference to determine whether to use the new or old parser.

1 files changed, 6 insertions, 8 deletions

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
index 7bde8e2520e..077de63d956 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnitInfo.java
@@ -8,6 +8,7 @@ package org.eclipse.cdt.internal.core.model;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ISourceRange;
 import org.eclipse.cdt.internal.core.newparser.Parser;
@@ -54,22 +55,19 @@ class TranslationUnitInfo extends CFileInfo {
 	protected void parse(InputStream in) {
 		try {
 			removeChildren();
-			if (false) {
-				// cdt 1.0 parser
-				ModelBuilder modelBuilder= new ModelBuilder((TranslationUnit)getElement());
-				CStructurizer.getCStructurizer().parse(modelBuilder, in);
-			} else {
+			if (CCorePlugin.getDefault().useNewParser()) {
 				// new parser
 				NewModelBuilder modelBuilder = new NewModelBuilder((TranslationUnit)getElement());
 				Parser parser = new Parser(in, modelBuilder, true);
 				parser.parse();
+			} else {
+				// cdt 1.0 parser
+				ModelBuilder modelBuilder= new ModelBuilder((TranslationUnit)getElement());
+				CStructurizer.getCStructurizer().parse(modelBuilder, in);
 			}
 		} catch (Exception e) {
 			System.out.println(e);
 		}
-//		} catch (IOException e) {
-			//e.printStackTrace();
-//		}
 	}
 
 	/* Overide the SourceManipulation for the range.  */