diff options
| author | Matthew Piggott | 2011-04-06 22:16:00 +0000 |
|---|---|---|
| committer | Matthew Piggott | 2011-04-06 22:16:14 +0000 |
| commit | 34f8c611dc55b1bc853e8b432a9f30b71c4b2db2 (patch) | |
| tree | 0f669c4a9de9b06176b8d7268532cffaf8bfe2c4 /org.eclipse.m2e.discovery | |
| parent | eba8832b210dd3a390fa522642f5b41d4c66db8d (diff) | |
| download | m2e-core-34f8c611dc55b1bc853e8b432a9f30b71c4b2db2.tar.gz m2e-core-34f8c611dc55b1bc853e8b432a9f30b71c4b2db2.tar.xz m2e-core-34f8c611dc55b1bc853e8b432a9f30b71c4b2db2.zip | |
Bug 339968 - Support to change selected discovery proposal using Combo box
Diffstat (limited to 'org.eclipse.m2e.discovery')
3 files changed, 10 insertions, 3 deletions
diff --git a/org.eclipse.m2e.discovery/OSGI-INF/component.xml b/org.eclipse.m2e.discovery/OSGI-INF/component.xml index d06f2391..5874a5a3 100644 --- a/org.eclipse.m2e.discovery/OSGI-INF/component.xml +++ b/org.eclipse.m2e.discovery/OSGI-INF/component.xml @@ -3,6 +3,6 @@ <implementation class="org.eclipse.m2e.internal.discovery.MavenDiscoveryService"/> <service> <provide interface="org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscovery"/> - <provide interface="org.eclipse.m2e.core.ui.internal.wizards.IImportWizardPageFactory"/> + <provide interface="org.eclipse.m2e.core.ui.internal.wizards.IMavenDiscoveryUI"/> </service> </scr:component> diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java index 6b0f6fe9..6bea7107 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java @@ -64,4 +64,11 @@ public class InstallCatalogItemMavenDiscoveryProposal implements IMavenDiscovery public String getDescription() { return item.getOverview().getSummary(); } + + /* (non-Javadoc) + * @see org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal#getLicense() + */ + public String getLicense() { + return item.getLicense(); + } } diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java index 70259539..dd68ca11 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java @@ -57,7 +57,7 @@ import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetad import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata; import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; -import org.eclipse.m2e.core.ui.internal.wizards.IImportWizardPageFactory; +import org.eclipse.m2e.core.ui.internal.wizards.IMavenDiscoveryUI; import org.eclipse.m2e.internal.discovery.operation.MavenDiscoveryInstallOperation; import org.eclipse.m2e.internal.discovery.wizards.MavenDiscoveryUi; import org.eclipse.osgi.util.NLS; @@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"restriction", "rawtypes"}) -public class MavenDiscoveryService implements IImportWizardPageFactory, IMavenDiscovery, ServiceFactory { +public class MavenDiscoveryService implements IMavenDiscoveryUI, IMavenDiscovery, ServiceFactory { private static final Logger log = LoggerFactory.getLogger(MavenDiscoveryService.class); public static class CatalogItemCacheEntry { |