Clean up some code after review with David D. on bug fix 10742
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfSelectionPage.java Tue Mar 02 09:27:11 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfSelectionPage.java Tue Mar 02 09:48:37 2010 -0600
@@ -208,7 +208,7 @@
}
if (builderComposite != null) {
- IStatus status = builderComposite.validatePage();
+ IStatus status = builderComposite.validate();
if (status != null){
// Get the level from the status.
int level = getMessageLevelFromIStatus(status);
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties Tue Mar 02 09:27:11 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties Tue Mar 02 09:48:37 2010 -0600
@@ -2,7 +2,7 @@
NewProjectPage.NameBeginWithDigitError=Project names can not begin with a digit
NewProjectPage.InvalidProjectName={0} is not a valid project name
NewProjectPage.builderLabel=Builder:
-NewProjectPage.builderToolTip=Select the builder to use for this project. SBSv2 = Raptor | SBSv1 = abld
+NewProjectPage.builderToolTip=Select the builder to use for this project. SBSv1 (abld) or SBSv2 (Raptor).
NewProjectPage.ProjectNameWithPeriodError=Project names can not contain periods
NewProjectPage.sbsv1=SBSv1
NewProjectPage.sbsv2=SBSv2
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java Tue Mar 02 09:27:11 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java Tue Mar 02 09:48:37 2010 -0600
@@ -83,7 +83,7 @@
* listen for changes on the builder combo via {@link #getBuilderCombo()}
* @return null for no error, otherwise a string for the error message
*/
- public IStatus validatePage() {
+ public IStatus validate() {
useSBSv2Builder = true;
IStatus status = null;
if (builderCombo != null && builderCombo.getSelectionIndex() == 1) {
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/project/ui/sharedui/NewProjectPage.java Tue Mar 02 09:27:11 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/project/ui/sharedui/NewProjectPage.java Tue Mar 02 09:48:37 2010 -0600
@@ -147,7 +147,7 @@
}
if (builderComposite != null) {
- IStatus status = builderComposite.validatePage();
+ IStatus status = builderComposite.validate();
if (status != null){
// Get the level from the status.
int level = getMessageLevelFromIStatus(status);
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java Tue Mar 02 09:27:11 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java Tue Mar 02 09:48:37 2010 -0600
@@ -251,7 +251,7 @@
if (builderComposite != null) {
- IStatus status = builderComposite.validatePage();
+ IStatus status = builderComposite.validate();
if (status != null){
// Get the level from the status.
int level = getMessageLevelFromIStatus(status);