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

Bug 300011 - NPE in XLCompilerPropertiesPage

Browse source
This commit is contained in:
Vivian Kong 2010-01-19 15:47:08 +00:00
parent f068e6da17
commit 0991ca6fd9
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties
View file

@ -1,5 +1,5 @@
############################################################################### ###############################################################################
# Copyright (c) 2007, 2009 IBM Corporation and others. # Copyright (c) 2007, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # which accompanies this distribution, and is available at
@ -9,8 +9,8 @@
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
############################################################################### ###############################################################################
XLCompiler_v8=8.0 XLCompiler_v8=v8.0
XLCompiler_v9=9.0 XLCompiler_v9=v9.0
XLCompiler_v10=v10.1 XLCompiler_v10=v10.1
XLCompilerPreferencePage_0=XL C/C++ Compiler Preferences XLCompilerPreferencePage_0=XL C/C++ Compiler Preferences
XLCompilerPreferencePage_1=Compiler Root Path: XLCompilerPreferencePage_1=Compiler Root Path:

14
xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2009 IBM Corporation and others. * Copyright (c) 2007, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -157,10 +157,14 @@ public class XLCompilerPropertyPage extends FieldEditorPreferencePage implements
project.setPersistentProperty(new QualifiedName("", //$NON-NLS-1$ project.setPersistentProperty(new QualifiedName("", //$NON-NLS-1$
PreferenceConstants.P_XL_COMPILER_ROOT), fPathEditor PreferenceConstants.P_XL_COMPILER_ROOT), fPathEditor
.getStringValue()); .getStringValue());
String version = PreferenceConstants.getVersion(fVersionEditor.getSelection()); String version = null;
project.setPersistentProperty(new QualifiedName("", //$NON-NLS-1$ if (fVersionEditor.getSelection() != null) {
PreferenceConstants.P_XLC_COMPILER_VERSION), version); version = PreferenceConstants.getVersion(fVersionEditor.getSelection());
project.setPersistentProperty(new QualifiedName("", //$NON-NLS-1$
PreferenceConstants.P_XLC_COMPILER_VERSION), version);
}
} catch (CoreException e) { } catch (CoreException e) {
return false; return false;
} }