From 34f8c611dc55b1bc853e8b432a9f30b71c4b2db2 Mon Sep 17 00:00:00 2001
From: Matthew Piggott
Date: Wed, 6 Apr 2011 18:16:00 -0400
Subject: Bug 339968 - Support to change selected discovery proposal using
 Combo box

---
 org.eclipse.m2e.discovery/OSGI-INF/component.xml                   | 2 +-
 .../discovery/InstallCatalogItemMavenDiscoveryProposal.java        | 7 +++++++
 .../org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java  | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.m2e.discovery')

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 {
-- 
cgit v1.2.3