Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorOleg Krasilnikov2008-02-26 14:38:39 +0000
committerOleg Krasilnikov2008-02-26 14:38:39 +0000
commit69f1f5638264fe1847a129ec0ac70460cd44889f (patch)
tree949d2a534601d080bce0e2dde312e0cb4decae68 /build
parent364c506b2693f38146cfc7c2564b70f6c12f1fee (diff)
downloadorg.eclipse.cdt-69f1f5638264fe1847a129ec0ac70460cd44889f.tar.gz
org.eclipse.cdt-69f1f5638264fe1847a129ec0ac70460cd44889f.tar.xz
org.eclipse.cdt-69f1f5638264fe1847a129ec0ac70460cd44889f.zip
Bug # 219950 : TemplateEngine: Changes made to wizard fields are lost if Advanced Settings is first pressed
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java22
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java5
2 files changed, 18 insertions, 9 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index 66cb34f0fd1..7e323f4f552 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -535,11 +535,11 @@ public class MBSWizardHandler extends CWizardHandler {
cfgFirst = cfgDes;
}
mngr.setProjectDescription(project, des);
- doPostProcess(project);
- doCustom();
+ doTemplatesPostProcess(project);
+ doCustom(project);
}
- protected void doPostProcess(IProject prj) {
+ protected void doTemplatesPostProcess(IProject prj) {
if(entryInfo == null)
return;
@@ -648,7 +648,7 @@ public class MBSWizardHandler extends CWizardHandler {
return null;
}
- protected void doCustom() {
+ protected void doCustom(IProject newProject) {
IRunnableWithProgress[] operations = MBSCustomPageManager.getOperations();
if(operations != null)
for(int k = 0; k < operations.length; k++)
@@ -661,11 +661,21 @@ public class MBSWizardHandler extends CWizardHandler {
}
}
- public void postProcess(IProject newProject) {
+ public void postProcess(IProject newProject, boolean created) {
deleteExtraConfigs(newProject);
- doCustom();
+ // calls are required only if the project was
+ // created before for <Advanced Settings> feature.
+ if (created) {
+ doTemplatesPostProcess(newProject);
+ doCustom(newProject);
+ }
}
+ /**
+ * Deletes configurations
+ *
+ * @param newProject - affected project
+ */
private void deleteExtraConfigs(IProject newProject) {
if (isChanged()) return; // no need to delete
if (listener != null && listener.isCurrent()) return; // nothing to delete
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
index fad96e83347..b246ad481fd 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
@@ -80,9 +80,8 @@ public class STDWizardHandler extends MBSWizardHandler {
}
mngr.setProjectDescription(project, des);
- doPostProcess(project);
- // process custom pages
- doCustom();
+ doTemplatesPostProcess(project);
+ doCustom(project);
}
public boolean canCreateWithoutToolchain() { return true; }

Back to the top