summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMarcos Munoz2012-11-28 21:27:19 (EST)
committer Fred Bricon2012-12-24 05:02:08 (EST)
commit36b021ad09c610df267cffc15855ab9624f811db (patch)
treec59634d09e810868e47c0a4e227c945dbfe47655
parent5fb28c04a3898fa077d8aa75db864e4536d17e46 (diff)
downloadm2e-core-36b021ad09c610df267cffc15855ab9624f811db.zip
m2e-core-36b021ad09c610df267cffc15855ab9624f811db.tar.gz
m2e-core-36b021ad09c610df267cffc15855ab9624f811db.tar.bz2
395147:The data from the pages of New Maven Project wizard is not persisted
Changes to be committed: modified: MavenProjectWizardArchetypePage.java - I wrote 100% of the code - I have the right to contribute the code to Eclipse - I have updated the header
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
index 708d544..9224824 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
@@ -252,8 +252,11 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
loadArchetypes(null, null, null);
}
//remember what was switched to here
- if(dialogSettings != null && catalogFactory != null) {
- dialogSettings.put(KEY_CATALOG, catalogFactory.getId());
+ if(dialogSettings != null) {
+ if(catalogFactory != null)
+ dialogSettings.put(KEY_CATALOG, catalogFactory.getId());
+ else
+ dialogSettings.put(KEY_CATALOG, ALL_CATALOGS);
}
}
});
@@ -629,7 +632,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
ArchetypeManager archetypeManager = MavenPluginActivator.getDefault().getArchetypeManager();
String catalogId = dialogSettings.get(KEY_CATALOG);
catalogFactory = null;
- if(catalogId != null) {
+ if(catalogId != null && !catalogId.equals(ALL_CATALOGS)) {
catalogFactory = archetypeManager.getArchetypeCatalogFactory(catalogId);
}
catalogsComboViewer.setSelection(new StructuredSelection(catalogFactory == null ? ALL_CATALOGS : catalogFactory));