[245708] indexer preferences not passed to remote indexer

8 files changed, 165 insertions, 74 deletions

diff --git a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/CDTMiner.java b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/CDTMiner.java
index 3c8b90db0..3672a0c8c 100755
--- a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/CDTMiner.java
+++ b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/CDTMiner.java
@@ -1189,29 +1189,18 @@ public class CDTMiner extends Miner {
 	protected void handleIndexDelta(String scopeName, List<String> addedFiles,
 			List<String> changedFiles, List<String> removedFiles, IRemoteIndexerInfoProvider provider, DataElement status) {
 		try {
-
 //			statusWorking(status);
 			
-			
-			
-			StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName);
-			indexer.setScannerInfoProvider(provider);
-			indexer.setLanguageMapper(new RemoteLanguageMapper(provider));
-			
+			StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName, provider);
 			ScopeManager scopeManager = ScopeManager.getInstance();
 			
-			
 			// update the scope if required
-			Iterator<String> iterator = addedFiles.iterator();
-			
-			while(iterator.hasNext()) {
-				scopeManager.addFileToScope(scopeName, iterator.next());
+			for(String file : addedFiles) {
+				scopeManager.addFileToScope(scopeName, file);
 			}
 			
-			iterator = removedFiles.iterator();
-			
-			while(iterator.hasNext()) {
-				scopeManager.removeFileFromScope(scopeName, iterator.next());
+			for(String file : removedFiles) {
+				scopeManager.removeFileFromScope(scopeName, file);
 			}
 			
 			try {
@@ -1569,12 +1558,8 @@ public class CDTMiner extends Miner {
 
 	protected void handleIndexStart(String scopeName, IRemoteIndexerInfoProvider provider, DataElement status) {
 		try {
-			StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName);
-			indexer.setScannerInfoProvider(provider);
-			indexer.setLanguageMapper(new RemoteLanguageMapper(provider));
-			
+			StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName, provider);
 			Set<String> sources = ScopeManager.getInstance().getFilesForScope(scopeName);
-			
 			List<String> sourcesList = new LinkedList<String>(sources);
 
 			try {
@@ -1593,10 +1578,7 @@ public class CDTMiner extends Miner {
 	}
 	
 	protected void handleReindex(String scopeName, IRemoteIndexerInfoProvider provider, DataElement status) {
-		StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName);
-		indexer.setScannerInfoProvider(provider);
-		indexer.setLanguageMapper(new RemoteLanguageMapper(provider));
-		
+		StandaloneFastIndexer indexer = RemoteIndexManager.getInstance().getIndexerForScope(scopeName, provider);
 		Set<String> sources = ScopeManager.getInstance().getFilesForScope(scopeName);
 		
 		List<String> sourcesList = new LinkedList<String>(sources);
@@ -1675,29 +1657,4 @@ public class CDTMiner extends Miner {
 		return status;
 	}
 
-	 
-	public IASTTranslationUnit getASTTranslationUnit(String filePath, IRemoteIndexerInfoProvider indexerInfoProvider, IIndex index) {
-		ILanguageMapper languageMapper = new RemoteLanguageMapper(indexerInfoProvider);
-		
-		ILanguage language = languageMapper.getLanguage(filePath);
-		if(language == null)
-			return null;
-		
-		IASTTranslationUnit tu = null;
-		try {
-			int options = 0;
-			if(indexerInfoProvider.isHeaderUnit(filePath))
-				options = ILanguage.OPTION_IS_SOURCE_UNIT;
-			
-			tu = language.getASTTranslationUnit(new CodeReader(filePath), indexerInfoProvider.getScannerInformation(filePath),
-					StandaloneSavedCodeReaderFactory.getInstance(), index, options, new NullLogService());
-		} catch (CoreException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		return tu;
-	}
-	
 }
diff --git a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteIndexManager.java b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteIndexManager.java
index 29deb5fdf..64472134f 100755
--- a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteIndexManager.java
+++ b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteIndexManager.java
@@ -25,10 +25,13 @@ import org.eclipse.cdt.internal.core.index.CIndex;
 import org.eclipse.cdt.internal.core.index.IIndexFragment;
 import org.eclipse.cdt.internal.core.indexer.StandaloneFastIndexer;
 import org.eclipse.cdt.internal.core.indexer.StandaloneIndexer;
+import org.eclipse.cdt.internal.core.pdom.PDOMWriter;
 import org.eclipse.cdt.internal.core.pdom.dom.IPDOMLinkageFactory;
 import org.eclipse.cdt.internal.core.pdom.dom.c.PDOMCLinkageFactory;
 import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPLinkageFactory;
+import org.eclipse.cdt.internal.core.pdom.indexer.PDOMIndexerTask;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ptp.internal.rdt.core.IRemoteIndexerInfoProvider;
 import org.eclipse.ptp.internal.rdt.core.model.Scope;
 
 /**
@@ -83,6 +86,46 @@ public class RemoteIndexManager {
 		}
 	}
 	
+	
+	/**
+	 * Gets the indexer and also sets up indexer preferences.
+	 * 
+	 * @see PDOMIndexerTask constructor
+	 */
+	public StandaloneFastIndexer getIndexerForScope(String scope, IRemoteIndexerInfoProvider provider) {
+		StandaloneFastIndexer indexer = getIndexerForScope(scope);
+		
+		// configure the indexer using the provider
+		indexer.setScannerInfoProvider(provider);
+		indexer.setLanguageMapper(new RemoteLanguageMapper(provider));
+		indexer.setFilesToParseUpFront(provider.getFilesToParseUpFront().toArray(new String[]{}));
+		
+		Map<String,Boolean> prefs = provider.getIndexerPreferences();
+		
+		if(prefs.get(IRemoteIndexerInfoProvider.KEY_SKIP_ALL_REFERENCES)) {
+			indexer.setSkipReferences(PDOMWriter.SKIP_ALL_REFERENCES);
+		}
+		else {
+			int skipReferences = 0;
+			if(prefs.get(IRemoteIndexerInfoProvider.KEY_SKIP_TYPE_REFERENCES))
+				skipReferences |= PDOMWriter.SKIP_TYPE_REFERENCES;
+			if(prefs.get(IRemoteIndexerInfoProvider.KEY_SKIP_MACRO_REFERENCES))
+				skipReferences |= PDOMWriter.SKIP_MACRO_REFERENCES;
+			//if(prefs.get(IRemoteIndexerInfoProvider.KEY_SKIP_IMPLICIT_REFERENCES))
+			//	skipReferences |= PDOMWriter.SKIP_IMPLICIT_REFERENCES;
+			
+			if(skipReferences == 0)
+				indexer.setSkipReferences(PDOMWriter.SKIP_NO_REFERENCES);
+			else
+				indexer.setSkipReferences(skipReferences);
+		}
+		
+		indexer.setIndexAllFiles(prefs.get(IRemoteIndexerInfoProvider.KEY_INDEX_ALL_FILES));
+		
+		return indexer;
+	}
+	
+	
 	public StandaloneFastIndexer getIndexerForScope(String scope) {
 		
 		if(scope.equals(Scope.WORKSPACE_ROOT_SCOPE_NAME)) {
diff --git a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteLanguageMapper.java b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteLanguageMapper.java
index fb8e6500b..fdb324660 100755
--- a/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteLanguageMapper.java
+++ b/rdt/org.eclipse.ptp.rdt.core/miners/org/eclipse/ptp/internal/rdt/core/miners/RemoteLanguageMapper.java
@@ -21,12 +21,10 @@ import org.eclipse.cdt.internal.core.indexer.ILanguageMapper;
 import org.eclipse.ptp.internal.rdt.core.IRemoteIndexerInfoProvider;
 
 /**
- * @author crecoskie
  *
  */
 public class RemoteLanguageMapper implements ILanguageMapper {
 	
-	
 	private static final Map<String,ILanguage> RDT_SUPPORTED_LANGUAGES;
 	static {
 		RDT_SUPPORTED_LANGUAGES = new HashMap<String,ILanguage>();
@@ -34,17 +32,22 @@ public class RemoteLanguageMapper implements ILanguageMapper {
 		RDT_SUPPORTED_LANGUAGES.put(GCCLanguage.ID, GCCLanguage.getDefault());
 	}
 	
+	private static final ILanguage DEFAULT_LANGUAGE = GPPLanguage.getDefault();
+	
+	
 	
 	private final IRemoteIndexerInfoProvider provider;
 	
 	public RemoteLanguageMapper(IRemoteIndexerInfoProvider provider) {
+		if(provider == null)
+			throw new NullPointerException();
 		this.provider = provider;
 	}
 	
-	
 	public ILanguage getLanguage(String file) {
 		String id = provider.getLanguageID(file);
-		return RDT_SUPPORTED_LANGUAGES.get(id);
+		ILanguage language = RDT_SUPPORTED_LANGUAGES.get(id);
+		return language == null ? DEFAULT_LANGUAGE : language;
 	}
 	
 }
diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/IRemoteIndexerInfoProvider.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/IRemoteIndexerInfoProvider.java
index e73f3e3e2..42efab9a8 100644
--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/IRemoteIndexerInfoProvider.java
+++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/IRemoteIndexerInfoProvider.java
@@ -10,14 +10,42 @@
  *******************************************************************************/
 package org.eclipse.ptp.internal.rdt.core;
 
+import java.util.List;
+import java.util.Map;
+
 import org.eclipse.cdt.internal.core.indexer.IStandaloneScannerInfoProvider;
+import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences;
 
 /**
  * Provides necessary information to the remote indexer.
  */
 public interface IRemoteIndexerInfoProvider extends IStandaloneScannerInfoProvider {
 
+	/**
+	 * Indexer preference keys used by the remote indexer.
+	 * 
+	 * These are mostly copies of the keys in the IndexerPreferences class, but since
+	 * that class is not available on the remote side the keys are duplicated here.
+	 * 
+	 * @see IndexerPreferences
+	 */
+	public static String 
+		//KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG = "indexUnusedHeadersWithDefaultLang", //$NON-NLS-1$
+		//KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG = "indexUnusedHeadersWithAlternateLang", //$NON-NLS-1$
+		KEY_INDEX_ALL_FILES = "indexAllFiles", //$NON-NLS-1$
+		//KEY_INCLUDE_HEURISTICS = "useHeuristicIncludeResolution", //$NON-NLS-1$
+		KEY_SKIP_ALL_REFERENCES = "skipReferences", //$NON-NLS-1$
+		//KEY_SKIP_IMPLICIT_REFERENCES = "skipImplicitReferences", //$NON-NLS-1$
+		KEY_SKIP_TYPE_REFERENCES = "skipTypeReferences", //$NON-NLS-1$
+		KEY_SKIP_MACRO_REFERENCES = "updatePolicy"; //$NON-NLS-1$
+	
+	
 	String getLanguageID(String path);
 	
 	boolean isHeaderUnit(String path);
+	
+	Map<String,Boolean> getIndexerPreferences();
+	
+	List<String> getFilesToParseUpFront();
 }
+
diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProvider.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProvider.java
index 1de9d8e3f..85e19b113 100644
--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProvider.java
+++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProvider.java
@@ -14,6 +14,7 @@ package org.eclipse.ptp.internal.rdt.core;
 
 import java.io.Serializable;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.cdt.core.parser.IScannerInfo;
@@ -29,14 +30,24 @@ public class RemoteIndexerInfoProvider implements IRemoteIndexerInfoProvider, Se
 	private final Map<Integer,RemoteScannerInfo> linkageMap; // used by the "parse up front" feature
 	private final Map<String,String> languageMap; // (path -> language ID)
 	private final Map<String,Boolean> isHeaderMap; // (path -> isHeaderUnit(boolean))
+	private final Map<String,Boolean> indexerPreferences; // (preference key -> boolean)
+	private final List<String> filesToParseUpFront;
 	
 
-	RemoteIndexerInfoProvider(Map<String,RemoteScannerInfo> pathMap, Map<Integer,RemoteScannerInfo> linkageMap, 
-			                  Map<String,String> languageMap, Map<String,Boolean> isHeaderMap) {
+	RemoteIndexerInfoProvider(Map<String,RemoteScannerInfo> pathMap, 
+						      Map<Integer,RemoteScannerInfo> linkageMap, 
+			                  Map<String,String> languageMap, 
+			                  Map<String,Boolean> isHeaderMap, 
+			                  Map<String,Boolean> indexerPreferences,
+			                  List<String> filesToParseUpFront) {
+		
+		
 		this.pathMap = pathMap == null ? Collections.<String,RemoteScannerInfo>emptyMap() : pathMap;
 		this.linkageMap = linkageMap == null ? Collections.<Integer,RemoteScannerInfo>emptyMap() : linkageMap;
 		this.languageMap = languageMap == null ? Collections.<String,String>emptyMap() : languageMap;
 		this.isHeaderMap = isHeaderMap == null ? Collections.<String,Boolean>emptyMap() : isHeaderMap;
+		this.indexerPreferences = indexerPreferences == null ? Collections.<String,Boolean>emptyMap() : indexerPreferences;
+		this.filesToParseUpFront = filesToParseUpFront == null ? Collections.<String>emptyList() : filesToParseUpFront;
 	}
 	
 	RemoteIndexerInfoProvider() {
@@ -44,6 +55,8 @@ public class RemoteIndexerInfoProvider implements IRemoteIndexerInfoProvider, Se
 		linkageMap = Collections.emptyMap();
 		languageMap = Collections.emptyMap();
 		isHeaderMap = Collections.emptyMap();
+		indexerPreferences = Collections.emptyMap();
+		filesToParseUpFront = Collections.emptyList();
 	}
 
 	public IScannerInfo getScannerInformation(String path) {
@@ -59,20 +72,30 @@ public class RemoteIndexerInfoProvider implements IRemoteIndexerInfoProvider, Se
 		return si == null ? new RemoteScannerInfo() : si;
 	}
 	
-	
 	public String getLanguageID(String path) {
 		return languageMap.get(path);
 	}
 	
+	public boolean isHeaderUnit(String path) {
+		return isHeaderMap.get(path);
+	}
+	
+	public Map<String,Boolean> getIndexerPreferences() {
+		return Collections.unmodifiableMap(indexerPreferences);
+	}
+	
+	public List<String> getFilesToParseUpFront() {
+		return Collections.unmodifiableList(filesToParseUpFront);
+	}
+	
 	public String toString() {
 		return "pathMap:" + pathMap +  //$NON-NLS-1$
 		       " linkageMap:" + linkageMap + //$NON-NLS-1$
 		       " languageMap:" + languageMap + //$NON-NLS-1$
-		       " isHeaderMap:" + isHeaderMap; //$NON-NLS-1$
+		       " isHeaderMap:" + isHeaderMap + //$NON-NLS-1$
+		       " preferences: " + indexerPreferences; //$NON-NLS-1$
 	}
 
-	public boolean isHeaderUnit(String path) {
-		return isHeaderMap.get(path);
-	}
+	
 }
 
diff --git a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
index d1ffee97d..0ae3fae7e 100644
--- a/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
+++ b/rdt/org.eclipse.ptp.rdt.core/src/org/eclipse/ptp/internal/rdt/core/RemoteIndexerInfoProviderFactory.java
@@ -15,10 +15,9 @@ package org.eclipse.ptp.internal.rdt.core;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.Properties;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.ILinkage;
@@ -26,14 +25,17 @@ import org.eclipse.cdt.core.model.CoreModelUtil;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ILanguage;
 import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.ptp.rdt.core.RDTLog;
 
 /**
@@ -44,6 +46,9 @@ import org.eclipse.ptp.rdt.core.RDTLog;
  */
 public class RemoteIndexerInfoProviderFactory {
 	
+	// These are the linkages supported by RDT
+	private static final int[] LINKAGE_IDS = new int[] { ILinkage.C_LINKAGE_ID, ILinkage.CPP_LINKAGE_ID };
+	
 	
 	/**
 	 * Returns a RemoteIndexerInfoProvider that contains all the IScannerInfos and language mapping info
@@ -66,6 +71,8 @@ public class RemoteIndexerInfoProviderFactory {
 			return new RemoteIndexerInfoProvider();
 		
 		final List<ICElement> elements = new ArrayList<ICElement>();
+		
+		// TODO replace with ICElementVisitor
 		IResourceVisitor resourceVisitor = new IResourceVisitor() {
 			public boolean visit(IResource resource) throws CoreException {
 				if (!(resource instanceof IFile))
@@ -76,6 +83,7 @@ public class RemoteIndexerInfoProviderFactory {
 				return true;
 			}
 		};
+
 		
 		try {
 			project.accept(resourceVisitor);
@@ -160,8 +168,8 @@ public class RemoteIndexerInfoProviderFactory {
 		IProject project = elements.get(0).getCProject().getProject(); 
 		IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
 		
+
 		RemoteScannerInfoCache cache = new RemoteScannerInfoCache();
-		Set<Integer> linkageIDs = new HashSet<Integer>();
 		
 		for(ICElement element : elements) {
 			if(element instanceof ITranslationUnit) {
@@ -183,21 +191,54 @@ public class RemoteIndexerInfoProviderFactory {
 				
 				// is it a header file?
 				isHeaderMap.put(path, tu.isHeaderUnit());
-				
-				try {
-					linkageIDs.add(((ITranslationUnit)element).getLanguage().getLinkageID());
-				} catch(CoreException e) { } // do nothing, worst thing is we don't provide a scanner info for that linkage
 			}
 		}
 		
-		for(int id : linkageIDs) {
+		for(int id : LINKAGE_IDS) {
 			IScannerInfo defaultScannerInfo = getDefaultScannerInfo(project, id);
 			RemoteScannerInfo remoteScannerInfo = cache.get(defaultScannerInfo);
 			linkageMap.put(id, remoteScannerInfo);
 		}
 		
-		return new RemoteIndexerInfoProvider(scannerInfoMap, linkageMap, languageMap, isHeaderMap);
+		// compute the indexer preferences
+		Properties props = IndexerPreferences.getProperties(project);
+		Map<String,Boolean> preferences = computeIndexerPreferences(props);
+		
+		String filePref = (String) props.get(IndexerPreferences.KEY_FILES_TO_PARSE_UP_FRONT);
+		List<String> filesToParseUpFront = Arrays.asList(filePref.split(",")); //$NON-NLS-1$
+		
+		// need to compute the languages of the files to parse up front
+		// TODO there are two things wrong with this:
+		// 1) The file may need to be parsed as more than one language, see PDOMIndexerTask.getLanguages()
+		// 2) If there is a file in the project with the same name as a file to parse up front it may get the wrong scanner info
+		for(String filename : filesToParseUpFront) {
+			IContentType ct= CCorePlugin.getContentType(project, filename);
+			if (ct != null) {
+				ILanguage language = LanguageManager.getInstance().getLanguage(ct);
+				languageMap.put(filename, language.getId());
+			}
+		}
+		
+		return new RemoteIndexerInfoProvider(scannerInfoMap, linkageMap, languageMap, isHeaderMap, preferences, filesToParseUpFront);
 	}
+
+	
+	
+	
+	private static Map<String,Boolean> computeIndexerPreferences(Properties props) {
+		Map<String,Boolean> prefs = new HashMap<String,Boolean>(props.size());
+		//prefs.put(IRemoteIndexerInfoProvider.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG)));
+		//prefs.put(IRemoteIndexerInfoProvider.KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG)));
+		prefs.put(IRemoteIndexerInfoProvider.KEY_INDEX_ALL_FILES, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_INDEX_ALL_FILES)));
+		//prefs.put(IRemoteIndexerInfoProvider.KEY_INCLUDE_HEURISTICS, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_INCLUDE_HEURISTICS)));
+		prefs.put(IRemoteIndexerInfoProvider.KEY_SKIP_ALL_REFERENCES, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_SKIP_ALL_REFERENCES)));
+		//prefs.put(IRemoteIndexerInfoProvider.KEY_SKIP_IMPLICIT_REFERENCES, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_SKIP_IMPLICIT_REFERENCES)));
+		prefs.put(IRemoteIndexerInfoProvider.KEY_SKIP_TYPE_REFERENCES, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_SKIP_TYPE_REFERENCES)));
+		prefs.put(IRemoteIndexerInfoProvider.KEY_SKIP_MACRO_REFERENCES, Boolean.valueOf(props.getProperty(IndexerPreferences.KEY_SKIP_MACRO_REFERENCES)));
+		return prefs;
+	}
+	
+	
 	
 	
 	/*
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/subsystems/RemoteCIndexSubsystem.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/subsystems/RemoteCIndexSubsystem.java
index e8db438b1..87482c7f8 100755
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/subsystems/RemoteCIndexSubsystem.java
+++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/subsystems/RemoteCIndexSubsystem.java
@@ -241,7 +241,6 @@ public class RemoteCIndexSubsystem extends SubSystem implements ICIndexSubsystem
             	String serializedProvider = null;
             	try {
 					serializedProvider = Serializer.serialize(provider);
-					System.out.println("length " + serializedProvider.length());//$NON-NLS-1$
 				} catch (IOException e) {
 					RDTLog.logError(e);
 				}
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/ConfigureRemoteServices.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/ConfigureRemoteServices.java
index 58b9fcd77..a2983cab0 100644
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/ConfigureRemoteServices.java
+++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/ConfigureRemoteServices.java
@@ -81,9 +81,6 @@ public class ConfigureRemoteServices {
 		
 		ICProject cProject = CModelManager.getDefault().getCModel().getCProject(project);
 		CCorePlugin.getIndexManager().setIndexerId(cProject, RemoteFastIndexer.ID);
-		Properties properties = new Properties();
-		properties.put(IndexerPreferences.KEY_FILES_TO_PARSE_UP_FRONT, ""); //$NON-NLS-1$
-		IndexerPreferences.setProperties(project, IndexerPreferences.SCOPE_PROJECT_PRIVATE, properties);
 		monitor.worked(10);
 		monitor.done();		
 	}