mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 11:35:21 +02:00
Code Issues Wiki Activity

bug 350587: Relax visibility of fields and methods of

Browse source 
PerProjectSICollector to allow extend it.
This commit is contained in:
Michael Lindo 2011-07-11 17:04:39 -04:00 • committed by Andrew Gvozdev
parent 28ebee95bd
commit 15458e072f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerProjectSICollector.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2010 IBM Corporation and others. * Copyright (c) 2004, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -68,18 +68,18 @@ import org.w3c.dom.Element;
public class PerProjectSICollector implements IScannerInfoCollector3, IScannerInfoCollectorCleaner { public class PerProjectSICollector implements IScannerInfoCollector3, IScannerInfoCollectorCleaner {
public static final String COLLECTOR_ID = MakeCorePlugin.getUniqueIdentifier() + ".PerProjectSICollector"; //$NON-NLS-1$ public static final String COLLECTOR_ID = MakeCorePlugin.getUniqueIdentifier() + ".PerProjectSICollector"; //$NON-NLS-1$
private IProject project; protected IProject project;
private InfoContext context; protected InfoContext context;
private boolean isBuiltinConfig= false; private boolean isBuiltinConfig= false;
private Map<ScannerInfoTypes, List<String>> discoveredSI; protected Map<ScannerInfoTypes, List<String>> discoveredSI;
// private List discoveredIncludes; // private List discoveredIncludes;
// private List discoveredSymbols; // private List discoveredSymbols;
// private List discoveredTSO; // target specific options // private List discoveredTSO; // target specific options
// cumulative values // cumulative values
private List<String> sumDiscoveredIncludes; protected List<String> sumDiscoveredIncludes;
private Map<String, SymbolEntry> sumDiscoveredSymbols; private Map<String, SymbolEntry> sumDiscoveredSymbols;
private boolean scPersisted = false; protected boolean scPersisted = false;
public PerProjectSICollector() { public PerProjectSICollector() {
discoveredSI = new HashMap<ScannerInfoTypes, List<String>>(); discoveredSI = new HashMap<ScannerInfoTypes, List<String>>();
@ -185,7 +185,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
* @param ordered - to preserve order or append at the end * @param ordered - to preserve order or append at the end
* @return boolean - true if added * @return boolean - true if added
*/ */
private boolean addItemsWithOrder(List<String> sumIncludes, List<String> includes, boolean ordered) { protected boolean addItemsWithOrder(List<String> sumIncludes, List<String> includes, boolean ordered) {
if (includes.isEmpty()) if (includes.isEmpty())
return false; return false;
@ -321,7 +321,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
/** /**
* Compare symbol definitions with already discovered. * Compare symbol definitions with already discovered.
*/ */
private boolean definedSymbolsNeedUpdate(IPerProjectDiscoveredPathInfo discPathInfo) { protected boolean definedSymbolsNeedUpdate(IPerProjectDiscoveredPathInfo discPathInfo) {
boolean addedSymbols = false; boolean addedSymbols = false;
List<String> discoveredSymbols = discoveredSI.get(ScannerInfoTypes.SYMBOL_DEFINITIONS); List<String> discoveredSymbols = discoveredSI.get(ScannerInfoTypes.SYMBOL_DEFINITIONS);
if (discoveredSymbols != null) { if (discoveredSymbols != null) {