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