mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 10:25:32 +02:00
Code Issues Wiki Activity

cleanup: loops to enhanced, @Overrides, spaces. No functionality changes.

Browse source
This commit is contained in:
Andrew Gvozdev 2009-09-14 13:07:33 +00:00
parent eb0d031a7b
commit 815a9d3dbb
1 changed files with 313 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
View file

@ -79,7 +79,6 @@ import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator2;
import org.eclipse.cdt.newmake.core.IMakeBuilderInfo; import org.eclipse.cdt.newmake.core.IMakeBuilderInfo;
import org.eclipse.cdt.newmake.internal.core.StreamMonitor; import org.eclipse.cdt.newmake.internal.core.StreamMonitor;
import org.eclipse.cdt.utils.CommandLineUtil; import org.eclipse.cdt.utils.CommandLineUtil;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarker;
@ -153,11 +152,14 @@ public class CommonBuilder extends ACBuilder {
} }
private static class NullConsole implements IConsole { // return a null console private static class NullConsole implements IConsole { // return a null console
private ConsoleOutputStream nullStream = new ConsoleOutputStream() { private final ConsoleOutputStream nullStream = new ConsoleOutputStream() {
public void write(byte[] b) throws IOException { @Override
} public void write(byte[] b) throws IOException {
}
@Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
} }
@Override
public void write(int c) throws IOException { public void write(int c) throws IOException {
} }
}; };
@ -194,10 +196,10 @@ public class CommonBuilder extends ACBuilder {
private boolean checkClean(CommonBuilder bld){ private boolean checkClean(CommonBuilder bld){
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for(int i = 0; i < projects.length; i++){ for (IProject wproject : projects) {
if(bld.hasBeenBuilt(projects[i])){ if(bld.hasBeenBuilt(wproject)){
if(VERBOSE) if(VERBOSE)
outputTrace(null, "checking clean: the project " + projects[i].getName() +" was built, no clean needed"); //$NON-NLS-1$ //$NON-NLS-2$ outputTrace(null, "checking clean: the project " + wproject.getName() +" was built, no clean needed"); //$NON-NLS-1$ //$NON-NLS-2$
return false; return false;
} }
@ -211,12 +213,12 @@ public class CommonBuilder extends ACBuilder {
} }
} }
private static class CfgBuildInfo { private static class CfgBuildInfo {
private IProject fProject; private final IProject fProject;
private IManagedBuildInfo fBuildInfo; private final IManagedBuildInfo fBuildInfo;
private IConfiguration fCfg; private final IConfiguration fCfg;
private IBuilder fBuilder; private final IBuilder fBuilder;
private IConsole fConsole; private IConsole fConsole;
private boolean fIsForeground; private final boolean fIsForeground;
CfgBuildInfo(IBuilder builder, boolean isForegound){ CfgBuildInfo(IBuilder builder, boolean isForegound){
this.fBuilder = builder; this.fBuilder = builder;
@ -258,13 +260,13 @@ public class CommonBuilder extends ACBuilder {
public class ResourceDeltaVisitor implements IResourceDeltaVisitor { public class ResourceDeltaVisitor implements IResourceDeltaVisitor {
private String buildGoalName; private String buildGoalName;
private IProject project; private final IProject project;
private IConfiguration cfg; private final IConfiguration cfg;
private IConfiguration allConfigs[]; private final IConfiguration allConfigs[];
private IPath buildPaths[]; private final IPath buildPaths[];
private boolean incrBuildNeeded = false; private boolean incrBuildNeeded = false;
private boolean fullBuildNeeded = false; private boolean fullBuildNeeded = false;
private List reservedNames; private final List reservedNames;
/** /**
* *
@ -318,8 +320,8 @@ public class CommonBuilder extends ACBuilder {
private boolean isGeneratedResource(IResource resource) { private boolean isGeneratedResource(IResource resource) {
// Is this a generated directory ... // Is this a generated directory ...
IPath path = resource.getFullPath(); IPath path = resource.getFullPath();
for (int i = 0; i < buildPaths.length; i++) { for (IPath buildPath : buildPaths) {
if(buildPaths[i] != null && buildPaths[i].isPrefixOf(path)){ if(buildPath != null && buildPath.isPrefixOf(path)){
return true; return true;
} }
} }
@ -418,8 +420,8 @@ public class CommonBuilder extends ACBuilder {
this.builders = builders; this.builders = builders;
allConfigs = allCfgs; allConfigs = allCfgs;
Set buildCfgSet = new HashSet(); Set buildCfgSet = new HashSet();
for(int i = 0; i < builders.length; i++){ for (IBuilder builder : builders) {
buildCfgSet.add(builders[i].getParent().getParent()); buildCfgSet.add(builder.getParent().getParent());
} }
List othersList = ListComparator.getAdded(allCfgs, buildCfgSet.toArray()); List othersList = ListComparator.getAdded(allCfgs, buildCfgSet.toArray());
if(othersList != null) if(othersList != null)
@ -429,8 +431,8 @@ public class CommonBuilder extends ACBuilder {
List list = new ArrayList(builders.length); List list = new ArrayList(builders.length);
// buildFullPaths = new IPath[builders.length]; // buildFullPaths = new IPath[builders.length];
for(int i = 0; i < builders.length; i++){ for (IBuilder builder : builders) {
IPath path = ManagedBuildManager.getBuildFullPath(builders[i].getParent().getParent(), builders[i]); IPath path = ManagedBuildManager.getBuildFullPath(builder.getParent().getParent(), builder);
if(path != null) if(path != null)
list.add(path); list.add(path);
// buildFullPaths[i] = ManagedBuildManager.getBuildFullPath(builders[i].getParent().getParent(), builders[i]); // buildFullPaths[i] = ManagedBuildManager.getBuildFullPath(builders[i].getParent().getParent(), builders[i]);
@ -450,8 +452,8 @@ public class CommonBuilder extends ACBuilder {
if(!isResourceValuable(rc)) if(!isResourceValuable(rc))
return false; return false;
for(int i = 0; i < buildFullPaths.length; i++){ for (IPath buildFullPath : buildFullPaths) {
if(buildFullPaths[i].isPrefixOf(rc.getFullPath())) if(buildFullPath.isPrefixOf(rc.getFullPath()))
return false; return false;
} }
return true; return true;
@ -472,15 +474,15 @@ public class CommonBuilder extends ACBuilder {
} }
private void setResourceChangeStateForOtherConfigs(){ private void setResourceChangeStateForOtherConfigs(){
for(int i = 0; i < otherConfigs.length; i++){ for (Configuration otherConfig : otherConfigs) {
otherConfigs[i].addResourceChangeState(resourceChangeState); otherConfig.addResourceChangeState(resourceChangeState);
} }
} }
private boolean isResourceValuable(IResource rc){ private boolean isResourceValuable(IResource rc){
IPath path = rc.getProjectRelativePath(); IPath path = rc.getProjectRelativePath();
for(int i = 0; i < ignoreList.length; i++){ for (IPath ignoredPath : ignoreList) {
if(ignoreList[i].equals(path)) if(ignoredPath.equals(path))
return false; return false;
} }
return true; return true;
@ -511,6 +513,7 @@ public class CommonBuilder extends ACBuilder {
/** /**
* @see IncrementalProjectBuilder#build * @see IncrementalProjectBuilder#build
*/ */
@Override
protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
fBuildSet.start(this); fBuildSet.start(this);
@ -608,11 +611,10 @@ public class CommonBuilder extends ACBuilder {
if(cfgs.length != 0){ if(cfgs.length != 0){
monitor.beginTask(ManagedMakeMessages.getResourceString("CommonBuilder.22"), cfgs.length); //$NON-NLS-1$ monitor.beginTask(ManagedMakeMessages.getResourceString("CommonBuilder.22"), cfgs.length); //$NON-NLS-1$
for(int i = 0; i < cfgs.length; i++){ for (IConfiguration cfg : cfgs) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1); IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
nextConfigChanged.setValue(false); nextConfigChanged.setValue(false);
try { try {
IConfiguration cfg = cfgs[i];
IBuilder builder = cfg.getEditableBuilder(); IBuilder builder = cfg.getEditableBuilder();
// CfgBuildInfo bInfo = new CfgBuildInfo(builder, false); // CfgBuildInfo bInfo = new CfgBuildInfo(builder, false);
@ -641,8 +643,7 @@ public class CommonBuilder extends ACBuilder {
private IConfiguration[] filterConfigsToBuild(IConfiguration[] cfgs){ private IConfiguration[] filterConfigsToBuild(IConfiguration[] cfgs){
List cfgList = new ArrayList(cfgs.length); List cfgList = new ArrayList(cfgs.length);
for(int i = 0; i < cfgs.length; i++){ for (IConfiguration cfg : cfgs) {
IConfiguration cfg = cfgs[i];
IProject project = cfg.getOwner().getProject(); IProject project = cfg.getOwner().getProject();
Set set = fBuildSet.getCfgIdSet(project, true); Set set = fBuildSet.getCfgIdSet(project, true);
if(set.add(cfg.getId())){ if(set.add(cfg.getId())){
@ -661,6 +662,7 @@ public class CommonBuilder extends ACBuilder {
@Override
protected void startupOnInitialize() { protected void startupOnInitialize() {
super.startupOnInitialize(); super.startupOnInitialize();
@ -668,11 +670,11 @@ public class CommonBuilder extends ACBuilder {
private IConfiguration[] getReferencedConfigs(IBuilder[] builders){ private IConfiguration[] getReferencedConfigs(IBuilder[] builders){
Set<IConfiguration> set = new HashSet<IConfiguration>(); Set<IConfiguration> set = new HashSet<IConfiguration>();
for(int i = 0; i < builders.length; i++){ for (IBuilder builder : builders) {
IConfiguration cfg = builders[i].getParent().getParent(); IConfiguration cfg = builder.getParent().getParent();
IConfiguration refs[] = ManagedBuildManager.getReferencedConfigurations(cfg); IConfiguration refs[] = ManagedBuildManager.getReferencedConfigurations(cfg);
for(int k = 0; k < refs.length; k++){ for (IConfiguration ref : refs) {
set.add(refs[k]); set.add(ref);
} }
} }
return set.toArray(new Configuration[set.size()]); return set.toArray(new Configuration[set.size()]);
@ -683,8 +685,8 @@ public class CommonBuilder extends ACBuilder {
return new HashSet<IProject>(0); return new HashSet<IProject>(0);
Set<IProject> set = new HashSet<IProject>(); Set<IProject> set = new HashSet<IProject>();
for(int i = 0; i < cfgs.length; i++){ for (IConfiguration cfg : cfgs) {
set.add(cfgs[i].getOwner().getProject()); set.add(cfg.getOwner().getProject());
} }
return set; return set;
@ -692,8 +694,7 @@ public class CommonBuilder extends ACBuilder {
protected MultiStatus checkBuilders(IBuilder builders[], IConfiguration activeCfg){ protected MultiStatus checkBuilders(IBuilder builders[], IConfiguration activeCfg){
MultiStatus status = null; MultiStatus status = null;
for(int i = 0; i < builders.length; i++){ for (IBuilder builder : builders) {
IBuilder builder = builders[i];
boolean supportsCustomization = builder.supportsCustomizedBuild(); boolean supportsCustomization = builder.supportsCustomizedBuild();
boolean isManagedBuildOn = builder.isManagedBuildOn(); boolean isManagedBuildOn = builder.isManagedBuildOn();
if(isManagedBuildOn && !supportsCustomization){ if(isManagedBuildOn && !supportsCustomization){
@ -751,10 +752,10 @@ public class CommonBuilder extends ACBuilder {
} }
protected class BuildStatus { protected class BuildStatus {
private boolean fManagedBuildOn; private final boolean fManagedBuildOn;
private boolean fRebuild; private boolean fRebuild;
private boolean fBuild = true; private boolean fBuild = true;
private List fConsoleMessages = new ArrayList(); private final List fConsoleMessages = new ArrayList();
private IManagedBuilderMakefileGenerator fMakeGen; private IManagedBuilderMakefileGenerator fMakeGen;
public BuildStatus(IBuilder builder){ public BuildStatus(IBuilder builder){
@ -1125,8 +1126,8 @@ public class CommonBuilder extends ACBuilder {
ICConfigurationDescription cfgDes = ManagedBuildManager.getDescriptionForConfiguration(builder.getParent().getParent()); ICConfigurationDescription cfgDes = ManagedBuildManager.getDescriptionForConfiguration(builder.getParent().getParent());
IEnvironmentVariableManager mngr = CCorePlugin.getDefault().getBuildEnvironmentManager(); IEnvironmentVariableManager mngr = CCorePlugin.getDefault().getBuildEnvironmentManager();
IEnvironmentVariable[] vars = mngr.getVariables(cfgDes, true); IEnvironmentVariable[] vars = mngr.getVariables(cfgDes, true);
for(int i = 0; i < vars.length; i++){ for (IEnvironmentVariable var : vars) {
envMap.put(vars[i].getName(), vars[i].getValue()); envMap.put(var.getName(), var.getValue());
} }
} }
// Add variables from build info // Add variables from build info
@ -1247,8 +1248,7 @@ public class CommonBuilder extends ACBuilder {
IBuildIOType depTypes[] = buildResource.getDependentIOTypes(); IBuildIOType depTypes[] = buildResource.getDependentIOTypes();
// iterate through each type and add the step the type belongs to to the collector // iterate through each type and add the step the type belongs to to the collector
for(int j = 0; j < depTypes.length; j++){ for (IBuildIOType type : depTypes) {
IBuildIOType type = depTypes[j];
if(type != null && type.getStep() != null) if(type != null && type.getStep() != null)
dependentSteps.add(type.getStep()); dependentSteps.add(type.getStep());
} }
@ -1269,15 +1269,10 @@ public class CommonBuilder extends ACBuilder {
// Refresh the output resource without allowing the user to cancel. // Refresh the output resource without allowing the user to cancel.
// This is probably unkind, but short of this there is no way to ensure // This is probably unkind, but short of this there is no way to ensure
// the UI is up-to-date with the build results // the UI is up-to-date with the build results
IBuildIOType[] outputIOTypes = step.getOutputIOTypes();
for(int j = 0; j < outputIOTypes.length; j++ ) for (IBuildIOType type : step.getOutputIOTypes()) {
{ for (IBuildResource res : type.getResources()) {
IBuildResource[] resources = outputIOTypes[j].getResources(); IFile file = currentProject.getFile(res.getLocation());
for(int i = 0; i < resources.length; i++)
{
IFile file = currentProject.getFile(resources[i].getLocation());
file.refreshLocal(IResource.DEPTH_INFINITE, null); file.refreshLocal(IResource.DEPTH_INFINITE, null);
} }
} }
@ -1538,6 +1533,7 @@ public class CommonBuilder extends ACBuilder {
} }
@Override
protected void clean(IProgressMonitor monitor) throws CoreException { protected void clean(IProgressMonitor monitor) throws CoreException {
IProject curProject = getProject(); IProject curProject = getProject();
@ -1545,13 +1541,13 @@ public class CommonBuilder extends ACBuilder {
return; return;
IBuilder[] builders = ManagedBuilderCorePlugin.createBuilders(curProject, null); IBuilder[] builders = ManagedBuilderCorePlugin.createBuilders(curProject, null);
for(int i = 0; i < builders.length; i++){ for (IBuilder builder : builders) {
IBuilder builder = builders[i];
CfgBuildInfo bInfo = new CfgBuildInfo(builder, true); CfgBuildInfo bInfo = new CfgBuildInfo(builder, true);
clean(bInfo, monitor); clean(bInfo, monitor);
} }
} }
@Override
public void addMarker(IResource file, int lineNumber, String errorDesc, public void addMarker(IResource file, int lineNumber, String errorDesc,
int severity, String errorVar) { int severity, String errorVar) {
super.addMarker(file, lineNumber, errorDesc, severity, errorVar); super.addMarker(file, lineNumber, errorDesc, severity, errorVar);
@ -1559,6 +1555,7 @@ public class CommonBuilder extends ACBuilder {
fBuildErrOccured = true; fBuildErrOccured = true;
} }
@Override
public void addMarker(ProblemMarkerInfo problemMarkerInfo) { public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
super.addMarker(problemMarkerInfo); super.addMarker(problemMarkerInfo);
if(problemMarkerInfo.severity == IStatus.ERROR) if(problemMarkerInfo.severity == IStatus.ERROR)
@ -1618,6 +1615,7 @@ public class CommonBuilder extends ACBuilder {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/ */
@Override
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
try { try {
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
@ -1689,14 +1687,14 @@ public class CommonBuilder extends ACBuilder {
buf = new StringBuffer(); buf = new StringBuffer();
int result = sBuilder.build(consoleOutStream, consoleOutStream, monitor); int result = sBuilder.build(consoleOutStream, consoleOutStream, monitor);
//Throw a core exception indicating that the clean command failed //Throw a core exception indicating that the clean command failed
if(result == StepBuilder.STATUS_ERROR_LAUNCH) if(result == IBuildModelBuilder.STATUS_ERROR_LAUNCH)
{ {
try try
{ {
consoleOutStream.close(); consoleOutStream.close();
} }
catch(IOException e){} catch(IOException e){}
Status status = new Status(Status.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), "Failed to exec delete command");//$NON-NLS-1 Status status = new Status(IStatus.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), "Failed to exec delete command");//$NON-NLS-1
throw new CoreException(status); throw new CoreException(status);
} }
// Report a successful clean // Report a successful clean
@ -1706,7 +1704,7 @@ public class CommonBuilder extends ACBuilder {
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
consoleOutStream.close(); consoleOutStream.close();
curProject.refreshLocal(IContainer.DEPTH_INFINITE, null); curProject.refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (IOException io) {} // Ignore console failures... } catch (IOException io) {} // Ignore console failures...
} }
@ -1799,22 +1797,18 @@ public class CommonBuilder extends ACBuilder {
List clParserList = new ArrayList(); List clParserList = new ArrayList();
if(container.isPerRcTypeDiscovery()){ if(container.isPerRcTypeDiscovery()){
IResourceInfo[] rcInfos = cfg.getResourceInfos(); for (IResourceInfo rcInfo : cfg.getResourceInfos()) {
for(int q = 0; q < rcInfos.length; q++){
IResourceInfo rcInfo = rcInfos[q];
ITool tools[]; ITool tools[];
if(rcInfo instanceof IFileInfo){ if(rcInfo instanceof IFileInfo){
tools = ((IFileInfo)rcInfo).getToolsToInvoke(); tools = ((IFileInfo)rcInfo).getToolsToInvoke();
} else { } else {
tools = ((IFolderInfo)rcInfo).getFilteredTools(); tools = ((IFolderInfo)rcInfo).getFilteredTools();
} }
for(int i = 0; i < tools.length; i++){ for (ITool tool : tools) {
ITool tool = tools[i];
IInputType[] types = tool.getInputTypes(); IInputType[] types = tool.getInputTypes();
if(types.length != 0){ if(types.length != 0){
for(int k = 0; k < types.length; k++){ for (IInputType type : types) {
IInputType type = types[k];
CfgInfoContext c = new CfgInfoContext(rcInfo, tool, type); CfgInfoContext c = new CfgInfoContext(rcInfo, tool, type);
contributeToConsoleParserList(project, map, c, workingDirectory, markerGenerator, collector, clParserList); contributeToConsoleParserList(project, map, c, workingDirectory, markerGenerator, collector, clParserList);
} }
@ -1932,7 +1926,7 @@ public class CommonBuilder extends ACBuilder {
URI workingDirectoryURI = ManagedBuildManager.getBuildLocationURI(cfg, builder); URI workingDirectoryURI = ManagedBuildManager.getBuildLocationURI(cfg, builder);
String[] targets = getTargets(kind, builder); String[] targets = getTargets(kind, builder);
if (targets.length != 0 && targets[targets.length - 1].equals(builder.getCleanBuildTarget())) //$NON-NLS-1$ if (targets.length != 0 && targets[targets.length - 1].equals(builder.getCleanBuildTarget()))
isClean = true; isClean = true;
String errMsg = null; String errMsg = null;
@ -2007,8 +2001,8 @@ public class CommonBuilder extends ACBuilder {
if (errMsg != null) { if (errMsg != null) {
buf = new StringBuffer(buildCommand.toString() + " "); //$NON-NLS-1$ buf = new StringBuffer(buildCommand.toString() + " "); //$NON-NLS-1$
for (int i = 0; i < buildArguments.length; i++) { for (String arg : buildArguments) {
buf.append(buildArguments[i]); buf.append(arg);
buf.append(' '); buf.append(' ');
} }