mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

cleanup: warnings fixed - generics etc.

Browse source
This commit is contained in:
Andrew Gvozdev 2010-02-26 19:05:11 +00:00
parent 351cb70ef4
commit 52d70f117f
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
View file

@ -17,9 +17,10 @@ import java.io.OutputStream;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
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.Set;
import java.util.Map.Entry;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CommandLauncher; import org.eclipse.cdt.core.CommandLauncher;
@ -96,7 +97,7 @@ public class MakeBuilder extends ACBuilder {
return getProject().getReferencedProjects(); return getProject().getReferencedProjects();
} }
@Override @Override
protected void clean(IProgressMonitor monitor) throws CoreException { protected void clean(IProgressMonitor monitor) throws CoreException {
final IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(getProject(), BUILDER_ID); final IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(getProject(), BUILDER_ID);
@ -122,17 +123,15 @@ public class MakeBuilder extends ACBuilder {
IStatus returnStatus = Status.OK_STATUS; IStatus returnStatus = Status.OK_STATUS;
return returnStatus; return returnStatus;
} }
}; };
backgroundJob.setRule(rule); backgroundJob.setRule(rule);
backgroundJob.schedule(); backgroundJob.schedule();
} }
} }
protected boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) { protected boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) {
boolean isClean = false; boolean isClean = false;
IProject currProject = getProject(); IProject currProject = getProject();
@ -167,21 +166,22 @@ public class MakeBuilder extends ACBuilder {
launcher.showCommand(true); launcher.showCommand(true);
// Set the environment // Set the environment
HashMap envMap = new HashMap(); HashMap<String, String> envMap = new HashMap<String, String>();
if (info.appendEnvironment()) { if (info.appendEnvironment()) {
envMap.putAll(launcher.getEnvironment()); @SuppressWarnings({"unchecked", "rawtypes"})
Map<String, String> env = (Map)launcher.getEnvironment();
envMap.putAll(env);
} }
// Add variables from build info // Add variables from build info
envMap.putAll(info.getExpandedEnvironment()); envMap.putAll(info.getExpandedEnvironment());
Iterator iter = envMap.entrySet().iterator(); List<String> strings= new ArrayList<String>(envMap.size());
List strings= new ArrayList(envMap.size()); Set<Entry<String, String>> entrySet = envMap.entrySet();
while (iter.hasNext()) { for (Entry<String, String> entry : entrySet) {
Map.Entry entry = (Map.Entry) iter.next(); StringBuffer buffer= new StringBuffer(entry.getKey());
StringBuffer buffer= new StringBuffer((String) entry.getKey()); buffer.append('=').append(entry.getValue());
buffer.append('=').append((String) entry.getValue());
strings.add(buffer.toString()); strings.add(buffer.toString());
} }
String[] env = (String[]) strings.toArray(new String[strings.size()]); String[] env = strings.toArray(new String[strings.size()]);
String[] buildArguments = targets; String[] buildArguments = targets;
if (info.isDefaultBuildCmd()) { if (info.isDefaultBuildCmd()) {
if (!info.isStopOnError()) { if (!info.isStopOnError()) {
@ -238,8 +238,8 @@ public class MakeBuilder extends ACBuilder {
if (errMsg != null) { if (errMsg != null) {
StringBuffer buf = new StringBuffer(buildCommand.toString() + " "); //$NON-NLS-1$ StringBuffer buf = new StringBuffer(buildCommand.toString() + " "); //$NON-NLS-1$
for (int i = 0; i < buildArguments.length; i++) { for (String buildArgument : buildArguments) {
buf.append(buildArguments[i]); buf.append(buildArgument);
buf.append(' '); buf.append(' ');
} }
@ -260,13 +260,13 @@ public class MakeBuilder extends ACBuilder {
cos.close(); cos.close();
} }
} catch (Exception e) { } catch (Exception e) {
CCorePlugin.log(e); MakeCorePlugin.log(e);
} finally { } finally {
monitor.done(); monitor.done();
} }
return (isClean); return (isClean);
} }
/** /**
* Refresh project. Can be overridden to not call actual refresh or to do something else. * Refresh project. Can be overridden to not call actual refresh or to do something else.
* Method is called after build is complete. * Method is called after build is complete.
@ -287,6 +287,7 @@ public class MakeBuilder extends ACBuilder {
/** /**
* Check whether the build has been canceled. * Check whether the build has been canceled.
* @param monitor
*/ */
public void checkCancel(IProgressMonitor monitor) { public void checkCancel(IProgressMonitor monitor) {
if (monitor != null && monitor.isCanceled()) if (monitor != null && monitor.isCanceled())