mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug #210836 : NPEs in Project-Properties of Makefle Project (not managed)

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-11-27 16:08:32 +00:00
parent 663b1538e0
commit a68086ca96
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/plugin.xml
View file

@ -347,7 +347,7 @@
/--> /-->
</tool> </tool>
<builder <builder
isAbstract="true" isAbstract="false"
id="org.eclipse.cdt.build.core.settings.default.builder" id="org.eclipse.cdt.build.core.settings.default.builder"
command="make" command="make"
arguments="" arguments=""

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
View file

@ -2708,4 +2708,8 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
public boolean isExtensionBuildObject() { public boolean isExtensionBuildObject() {
return isExtensionElement(); return isExtensionElement();
} }
public String toString() {
return getUniqueRealName();
}
} }

3
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
View file

@ -169,7 +169,8 @@ public class ConfigurationModification extends FolderInfoModification implements
} }
public boolean isBuilderCompatible() { public boolean isBuilderCompatible() {
return getCurrentBuilderCompatibilityInfo().isCompatible(); BuilderCompatibilityInfoElement be = getCurrentBuilderCompatibilityInfo();
return be == null ? false : be.isCompatible();
} }
public void setBuilder(IBuilder builder) { public void setBuilder(IBuilder builder) {

3
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
View file

@ -37,7 +37,6 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManag
import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification; import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification; import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IFileModificationValidator;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
@ -272,7 +271,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
} }
} }
for (int i=0; i<bs.length; i++) { for (int i=0; i<bs.length; i++) {
if (bs[i].isSystemObject()) if (bs[i].isSystemObject() && ! b.equals(bs[i]))
continue; continue;
list.add(bs[i]); list.add(bs[i]);
} }