1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00

Another NPE in build console fixed + cleanup wizard

This commit is contained in:
Andrew Gvozdev 2010-03-15 16:28:05 +00:00
parent 6d9cc48125
commit 0c0bb08f51

View file

@ -27,9 +27,9 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuListener;
@ -163,8 +163,9 @@ public class BuildConsolePage extends Page
protected void setProject(IProject project) { protected void setProject(IProject project) {
if (fProject != project && project.isAccessible()) { if (fProject != project && project.isAccessible()) {
fProject = project;
ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project); ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);
if (projDesc!=null) {
fProject = project;
fSaveConsoleAction.setChecked(false); fSaveConsoleAction.setChecked(false);
ICConfigurationDescription configDesc = projDesc.getActiveConfiguration(); ICConfigurationDescription configDesc = projDesc.getActiveConfiguration();
// Read save console log preferences // Read save console log preferences
@ -177,6 +178,7 @@ public class BuildConsolePage extends Page
} }
} }
} }
}
protected IProject getProject() { protected IProject getProject() {
return fProject; return fProject;