mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 319512: Compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-07-27 04:35:05 +00:00
parent d64260e2ed
commit d26f20e557
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ProjectBuildState.java
View file

@ -18,11 +18,12 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set;
import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
@ -31,7 +32,7 @@ import org.eclipse.core.runtime.IPath;
public class ProjectBuildState implements IProjectBuildState { public class ProjectBuildState implements IProjectBuildState {
private Properties fCfgIdToFileNameProps; private Properties fCfgIdToFileNameProps;
private Map fCfgIdToStateMap = new HashMap(); private Map<String, ConfigurationBuildState> fCfgIdToStateMap = new HashMap<String, ConfigurationBuildState>();
private IProject fProject; private IProject fProject;
private boolean fIsMapInfoDirty; private boolean fIsMapInfoDirty;
@ -41,14 +42,14 @@ public class ProjectBuildState implements IProjectBuildState {
void setProject(IProject project){ void setProject(IProject project){
fProject = project; fProject = project;
for(Iterator iter = fCfgIdToStateMap.values().iterator(); iter.hasNext();){ Collection<ConfigurationBuildState> cbStates = fCfgIdToStateMap.values();
ConfigurationBuildState cbs = (ConfigurationBuildState)iter.next(); for (ConfigurationBuildState cbs : cbStates) {
cbs.setProject(project); cbs.setProject(project);
} }
} }
public IConfigurationBuildState getConfigurationBuildState(String id, boolean create) { public IConfigurationBuildState getConfigurationBuildState(String id, boolean create) {
ConfigurationBuildState state = (ConfigurationBuildState)fCfgIdToStateMap.get(id); ConfigurationBuildState state = fCfgIdToStateMap.get(id);
if(state == null){ if(state == null){
state = loadState(id, create); state = loadState(id, create);
if(state.exists() || create) if(state.exists() || create)
@ -78,14 +79,15 @@ public class ProjectBuildState implements IProjectBuildState {
public IConfigurationBuildState[] getConfigurationBuildStates() { public IConfigurationBuildState[] getConfigurationBuildStates() {
Properties props = getIdToNameProperties(); Properties props = getIdToNameProperties();
List list = new ArrayList(props.size()); List<IConfigurationBuildState> list = new ArrayList<IConfigurationBuildState>(props.size());
for(Iterator iter = props.keySet().iterator(); iter.hasNext();){ Set<Object> keySet = props.keySet();
String id = (String)iter.next(); for (Object key : keySet) {
String id = (String)key;
IConfigurationBuildState state = getConfigurationBuildState(id, false); IConfigurationBuildState state = getConfigurationBuildState(id, false);
if(state != null) if(state != null)
list.add(state); list.add(state);
} }
return (ConfigurationBuildState[])list.toArray(new ConfigurationBuildState[list.size()]); return list.toArray(new ConfigurationBuildState[list.size()]);
} }
public void removeConfigurationBuildState(String id) { public void removeConfigurationBuildState(String id) {
@ -189,8 +191,8 @@ public class ProjectBuildState implements IProjectBuildState {
void serialize(){ void serialize(){
for(Iterator iter = fCfgIdToStateMap.values().iterator(); iter.hasNext();){ Collection<ConfigurationBuildState> cbStates = fCfgIdToStateMap.values();
ConfigurationBuildState s = (ConfigurationBuildState)iter.next(); for (ConfigurationBuildState s : cbStates) {
String id = s.getConfigurationId(); String id = s.getConfigurationId();
if(!s.exists()){ if(!s.exists()){
File file = getFileForCfg(id, false); File file = getFileForCfg(id, false);