mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-16 12:45:41 +02:00
Code Issues Wiki Activity

cleanup: a few more warnings fixed, mostly null pointer ones

Browse source
This commit is contained in:
Andrew Gvozdev 2010-01-06 04:35:19 +00:00
parent f1173ce9a8
commit fe25c0fa66
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
View file

@ -562,7 +562,7 @@ public class BuildDescription implements IBuildDescription {
return; return;
} else { } else {
for (IOutputType secondaryOutput : fCfg.getToolChain().getSecondaryOutputs()) { for (IOutputType secondaryOutput : fCfg.getToolChain().getSecondaryOutputs()) {
if(secondaryOutput == inputActionArg.getIoType()){ if(inputActionArg!=null && secondaryOutput==inputActionArg.getIoType()){
BuildIOType arg = findTypeForExtension(fOutputStep,true,rc.getLocation().getFileExtension()); BuildIOType arg = findTypeForExtension(fOutputStep,true,rc.getLocation().getFileExtension());
if(arg == null || arg.isPrimary()){ if(arg == null || arg.isPrimary()){
arg = fOutputStep.createIOType(true, false, null); arg = fOutputStep.createIOType(true, false, null);
@ -641,9 +641,10 @@ public class BuildDescription implements IBuildDescription {
if(inputActionArg == null){ if(inputActionArg == null){
inputActionArg = findTypeForExtension(inputAction,false,rc.getLocation().getFileExtension()); inputActionArg = findTypeForExtension(inputAction,false,rc.getLocation().getFileExtension());
if(inputActionArg == null) if(inputActionArg == null && inputAction!=null) {
inputActionArg = inputAction.createIOType(false, false, null); inputActionArg = inputAction.createIOType(false, false, null);
inputActionArg.addResource(rc); inputActionArg.addResource(rc);
}
} }
calculateInputs(action); calculateInputs(action);
@ -672,9 +673,10 @@ public class BuildDescription implements IBuildDescription {
if(inputActionArg == null){ if(inputActionArg == null){
inputActionArg = findTypeForExtension(inputAction,false,rc.getLocation().getFileExtension()); inputActionArg = findTypeForExtension(inputAction,false,rc.getLocation().getFileExtension());
if(inputActionArg == null) if(inputActionArg == null && inputAction!=null) {
inputActionArg = inputAction.createIOType(false, false, null); inputActionArg = inputAction.createIOType(false, false, null);
inputActionArg.addResource(rc); inputActionArg.addResource(rc);
}
} }
} }
} else { } else {
@ -2055,7 +2057,8 @@ public class BuildDescription implements IBuildDescription {
IInputType inType = tool.getInputType(e); IInputType inType = tool.getInputType(e);
IOutputType outType = t.getOutputType(e); IOutputType outType = t.getOutputType(e);
if((inType == null && outType == null) if((inType == null && outType == null)
|| (inType.getBuildVariable().equals(outType.getBuildVariable()))){ || (inType != null && outType != null
&& inType.getBuildVariable().equals(outType.getBuildVariable()))){
set.add(t); set.add(t);
ToolOrderEstimation est = getToolOrder(t); ToolOrderEstimation est = getToolOrder(t);
@ -2097,7 +2100,8 @@ public class BuildDescription implements IBuildDescription {
IOutputType inType = tool.getOutputType(e); IOutputType inType = tool.getOutputType(e);
IInputType outType = t.getInputType(e); IInputType outType = t.getInputType(e);
if((inType == null && outType == null) if((inType == null && outType == null)
|| (inType.getBuildVariable().equals(outType.getBuildVariable()))){ || (inType != null && outType != null
&& inType.getBuildVariable().equals(outType.getBuildVariable()))){
set.add(t); set.add(t);
ToolOrderEstimation est = getToolOrder(t); ToolOrderEstimation est = getToolOrder(t);