Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2015-03-24 20:00:45 +0000
committerFred Bricon2015-03-24 20:00:45 +0000
commit0ded6adfe181734d22b4a08b75e74123ffe83b8d (patch)
treedfdf280f267e8ca51077dbc6a9feef83a07e2dc8
parentfefa52d048f915f11c4e94fa41acafc58b5785c9 (diff)
downloadm2e-core-0ded6adfe181734d22b4a08b75e74123ffe83b8d.tar.gz
m2e-core-0ded6adfe181734d22b4a08b75e74123ffe83b8d.tar.xz
m2e-core-0ded6adfe181734d22b4a08b75e74123ffe83b8d.zip
459351 : properly load added catalogsmilestones/1.6/1.6.0.20150324-2020
Change-Id: I92422353d55d91ec27960dfac310450f4020fa97 Signed-off-by: Fred Bricon <fbricon@gmail.com>
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java7
1 files changed, 4 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 72c652ec..43dcd0b2 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
@@ -299,9 +299,10 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
}
//Select 1st new catalog
+ ArchetypeCatalogFactory selectedCatalog = catalogFactory;
for(ArchetypeCatalogFactory newCatalog : newCatalogs) {
if(!oldCatalogs.contains(newCatalog)) {
- catalogFactory = newCatalog;
+ selectedCatalog = newCatalog;
break;
}
}
@@ -309,8 +310,8 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
ArrayList allCatalogs = new ArrayList(newCatalogs);
allCatalogs.add(0, ALL_CATALOGS);
catalogsComboViewer.setInput(allCatalogs);
- catalogsComboViewer
- .setSelection(new StructuredSelection(catalogFactory == null ? ALL_CATALOGS : catalogFactory));
+ catalogsComboViewer.setSelection(new StructuredSelection(selectedCatalog == null ? ALL_CATALOGS
+ : selectedCatalog));
}
});

Back to the top