diff options
| author | Chris Recoskie | 2006-06-26 13:21:00 +0000 |
|---|---|---|
| committer | Chris Recoskie | 2006-06-26 13:21:00 +0000 |
| commit | fc4c6c5718116ffcde1d0d2559ebe283d3354ee7 (patch) | |
| tree | 322793c0e185ea81c0dd626eb5afc73eb5fab1b5 | |
| parent | a87683fe12adb910075b094fbd3dac951daa772f (diff) | |
| download | org.eclipse.cdt-fc4c6c5718116ffcde1d0d2559ebe283d3354ee7.tar.gz org.eclipse.cdt-fc4c6c5718116ffcde1d0d2559ebe283d3354ee7.tar.xz org.eclipse.cdt-fc4c6c5718116ffcde1d0d2559ebe283d3354ee7.zip | |
fix for 148439 NPE in build/clean selected files functionalityCDT_3_1_0
2 files changed, 3 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java index 16f4cdaeb31..7f8c8189026 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java @@ -165,7 +165,7 @@ public class BuildFilesAction extends ActionDelegate implements IManagedBuildInfo buildInfo = ManagedBuildManager .getBuildInfo(file.getProject()); - if ((buildInfo != null) + if ((buildInfo != null) && buildInfo.isValid() && buildInfo .buildsFileType(file.getFileExtension())) { files.add(file); @@ -295,7 +295,7 @@ public class BuildFilesAction extends ActionDelegate implements IManagedBuildInfo buildInfo = ManagedBuildManager .getBuildInfo(file.getProject()); - if (buildInfo == null) { + if (buildInfo == null || !buildInfo.isValid()) { return false; } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java index 1204c068657..ca8e0f6d071 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java @@ -303,7 +303,7 @@ public class CleanFilesAction extends ActionDelegate implements // if we have no build info or we can't build the file, then // disable the action - if ((buildInfo == null) + if ((buildInfo == null) || !buildInfo.isValid() || !buildInfo.buildsFileType(file .getFileExtension())) { return false; |