1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00

java generics, loops to enhanced etc. - no functionality changes

This commit is contained in:
Andrew Gvozdev 2009-08-12 14:45:51 +00:00
parent 5e27a33394
commit 16deae8dfc

View file

@ -13,7 +13,6 @@ package org.eclipse.cdt.managedbuilder.templateengine;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -63,7 +62,7 @@ public class ProjectCreatedActions {
*/ */
public ProjectCreatedActions() {} public ProjectCreatedActions() {}
Map/*<IConfiguration, IConfiguration>*/ original2newConfigs; Map<IConfiguration, IConfiguration> original2newConfigs;
/** /**
* Utility method that * Utility method that
@ -115,26 +114,25 @@ public class ProjectCreatedActions {
ManagedProject newManagedProject = new ManagedProject(project, configs[0].getProjectType()); ManagedProject newManagedProject = new ManagedProject(project, configs[0].getProjectType());
info.setManagedProject(newManagedProject); info.setManagedProject(newManagedProject);
original2newConfigs = new HashMap/*<IConfiguration,IConfiguration>*/(); original2newConfigs = new HashMap<IConfiguration,IConfiguration>();
ICConfigurationDescription active = null; ICConfigurationDescription active = null;
for(int i=0; i < configs.length; i++) { for (IConfiguration cfg : configs) {
IConfiguration config = configs[i]; if (cfg != null) {
if (config != null) { String id = ManagedBuildManager.calculateChildId(cfg.getId(), null);
String id = ManagedBuildManager.calculateChildId(config.getId(), null); Configuration configuration = new Configuration(newManagedProject, (Configuration)cfg, id, false, true);
Configuration configuration = new Configuration(newManagedProject, (Configuration)config, id, false, true);
CConfigurationData data = configuration.getConfigurationData(); CConfigurationData data = configuration.getConfigurationData();
ICConfigurationDescription cfgDes = des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data); ICConfigurationDescription cfgDes = des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
configuration.setConfigurationDescription(cfgDes); configuration.setConfigurationDescription(cfgDes);
configuration.exportArtifactInfo(); configuration.exportArtifactInfo();
configuration.setArtifactExtension(artifactExtension); configuration.setArtifactExtension(artifactExtension);
original2newConfigs.put(config, (IConfiguration)configuration); original2newConfigs.put(cfg, configuration);
IBuilder builder = configuration.getEditableBuilder(); IBuilder builder = configuration.getEditableBuilder();
if (builder != null) { if (builder != null) {
builder.setManagedBuildOn(builder.isManagedBuildOn()); builder.setManagedBuildOn(builder.isManagedBuildOn());
} }
configuration.setName(config.getName()); configuration.setName(cfg.getName());
configuration.setArtifactName(newManagedProject.getDefaultArtifactName()); configuration.setArtifactName(newManagedProject.getDefaultArtifactName());
IBuildProperty buildProperty = configuration.getBuildProperties().getProperty(PROPERTY); IBuildProperty buildProperty = configuration.getBuildProperties().getProperty(PROPERTY);
@ -172,13 +170,13 @@ public class ProjectCreatedActions {
} }
public IConfiguration getNewConfiguration(IConfiguration original) { public IConfiguration getNewConfiguration(IConfiguration original) {
return (IConfiguration) original2newConfigs.get(original); return original2newConfigs.get(original);
} }
public Set/*<IConfiguration>*/ getNewConfigurations(Collection/*<IConfiguration>*/ originalConfigs) { public Set<IConfiguration> getNewConfigurations(Collection<IConfiguration> originalConfigs) {
Set/*<IConfiguration>*/ result = new HashSet/*<IConfiguration>*/(); Set<IConfiguration> result = new HashSet<IConfiguration>();
for(Iterator i = originalConfigs.iterator(); i.hasNext(); ) { for (IConfiguration cfg : originalConfigs) {
result.add(getNewConfiguration((IConfiguration)i.next())); result.add(getNewConfiguration(cfg));
} }
return result; return result;
} }