Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/xlc
diff options
context:
space:
mode:
authorAndrew Gvozdev2009-10-16 15:10:50 +0000
committerAndrew Gvozdev2009-10-16 15:10:50 +0000
commitfe2cc5e4fd29cc7e830166698dc3ddc4cd60771d (patch)
tree48d7dcb67d71fa573261b9cc5818c839cbf0ad02 /xlc
parent9cfe50b6dbef86f59f6a25d3349292d9cf93d238 (diff)
downloadorg.eclipse.cdt-fe2cc5e4fd29cc7e830166698dc3ddc4cd60771d.tar.gz
org.eclipse.cdt-fe2cc5e4fd29cc7e830166698dc3ddc4cd60771d.tar.xz
org.eclipse.cdt-fe2cc5e4fd29cc7e830166698dc3ddc4cd60771d.zip
bug 292304: XLC New Project Wizard does not like change of heart when users switch from other wizards
Patch from Marc-Andre Laperle
Diffstat (limited to 'xlc')
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java
index da6c672cd5a..cfc4f7d06a0 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java
@@ -63,8 +63,6 @@ public class XLCSettingsWizardPage extends MBSCustomPage {
}
}
- private boolean fVisited = false;
-
private Composite fComposite = null;
private Text fDirTextBox;
@@ -76,6 +74,7 @@ public class XLCSettingsWizardPage extends MBSCustomPage {
*/
public XLCSettingsWizardPage(String pageID) {
super(pageID);
+ setDefaultPreferences(pageID);
}
/**
@@ -83,14 +82,20 @@ public class XLCSettingsWizardPage extends MBSCustomPage {
*/
public XLCSettingsWizardPage() {
super(PAGE_ID);
+ setDefaultPreferences(PAGE_ID);
+ }
+
+ private void setDefaultPreferences(String pageID) {
+ String compilerPath = XLCUIPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.P_XL_COMPILER_ROOT);
+ MBSCustomPageManager.addPageProperty(pageID, PreferenceConstants.P_XL_COMPILER_ROOT, compilerPath);
+ MBSCustomPageManager.addPageProperty(pageID, PreferenceConstants.P_XLC_COMPILER_VERSION, PreferenceConstants.P_XL_COMPILER_VERSION_8);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPage#isCustomPageComplete()
*/
protected boolean isCustomPageComplete() {
- // Don't allow the user to finish without visiting the page.
- return fVisited;
+ return true;
}
/* (non-Javadoc)
@@ -282,10 +287,6 @@ public class XLCSettingsWizardPage extends MBSCustomPage {
*/
public void setVisible(boolean visible) {
fComposite.setVisible(visible);
- if (visible) {
- fVisited = true;
- }
-
}
}

Back to the top