message updates

4 files changed, 16 insertions, 18 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryItem.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryItem.java
index c32c87511..5bd225b56 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryItem.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryItem.java
@@ -52,8 +52,6 @@ public class DiscoveryItem<T extends CatalogItem> extends AbstractDiscoveryItem<
 
 	private final IShellProvider shellProvider;
 
-	private ToolItem updateButton;
-
 	private final CatalogViewer viewer;
 
 	public DiscoveryItem(Composite parent, int style, DiscoveryResources resources, IShellProvider shellProvider, final T connector, CatalogViewer viewer) {
@@ -111,12 +109,6 @@ public class DiscoveryItem<T extends CatalogItem> extends AbstractDiscoveryItem<
 			ToolBar toolBar = new ToolBar(this, SWT.FLAT);
 			GridDataFactory.fillDefaults().align(SWT.END, SWT.CENTER).applyTo(toolBar);
 
-			if (connector.isInstalled()) {
-				updateButton = new ToolItem(toolBar, SWT.PUSH);
-				updateButton.setImage(resources.getUpdateImage());
-				updateButton.setToolTipText("Check for Updates");
-			}
-
 			if (hasTooltip(connector)) {
 				infoButton = new ToolItem(toolBar, SWT.PUSH);
 				infoButton.setImage(resources.getInfoImage());
@@ -163,8 +155,10 @@ public class DiscoveryItem<T extends CatalogItem> extends AbstractDiscoveryItem<
 			overview.setUrl(connector.getCertification().getUrl());
 			Image image = resources.getIconImage(connector.getSource(), connector.getCertification().getIcon(), 48, true);
 			hookTooltip(providerLabel, providerLabel, this, providerLabel, connector.getSource(), overview, image);
-		} else {
+		} else if (connector.getLicense() != null) {
 			providerLabel.setText(NLS.bind(Messages.ConnectorDiscoveryWizardMainPage_provider_and_license, connector.getProvider(), connector.getLicense()));
+		} else {
+			providerLabel.setText(connector.getProvider());
 		}
 	}
 
@@ -204,7 +198,7 @@ public class DiscoveryItem<T extends CatalogItem> extends AbstractDiscoveryItem<
 	protected boolean maybeModifySelection(boolean selected) {
 		if (selected) {
 			if (connector.isInstalled()) {
-				MessageDialog.openWarning(shellProvider.getShell(), "Install Connector", NLS.bind("{0} is already installed.", connector.getName()));
+				MessageDialog.openWarning(shellProvider.getShell(), Messages.DiscoveryItem_Connector_already_installed_Error_Title, NLS.bind(Messages.DiscoveryItem_Connector_already_installed_Error_Message, connector.getName()));
 				return false;
 			}
 			if (connector.getAvailable() != null && !connector.getAvailable()) {
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryWizard.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryWizard.java
index d2066b4f7..708f78690 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/DiscoveryWizard.java
@@ -39,7 +39,7 @@ public class DiscoveryWizard extends Wizard {
 		Assert.isNotNull(configuration);
 		this.catalog = catalog;
 		this.configuration = configuration;
-		setWindowTitle(Messages.ConnectorDiscoveryWizard_connectorDiscovery);
+		setWindowTitle(Messages.DiscoveryWizard_Install_Window_Title);
 		setNeedsProgressMonitor(true);
 		setDefaultPageImageDescriptor(DiscoveryImages.BANNER_DISOVERY);
 	}
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/Messages.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/Messages.java
index 84e7b02c6..09dc68346 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/Messages.java
@@ -20,14 +20,10 @@ public class Messages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.ui.discovery.wizards.messages"; //$NON-NLS-1$
 
-	public static String CatalogViewer_All_Categories;
-
 	public static String ConnectorDescriptorToolTip_detailsLink;
 
 	public static String ConnectorDescriptorToolTip_detailsLink_tooltip;
 
-	public static String ConnectorDiscoveryWizard_connectorDiscovery;
-
 	public static String ConnectorDiscoveryWizard_installProblems;
 
 	public static String InstallConnectorsJob_commaSeparator;
@@ -68,10 +64,16 @@ public class Messages extends NLS {
 
 	public static String ConnectorDiscoveryWizardMainPage_warningTitleConnectorUnavailable;
 
+	public static String DiscoveryItem_Connector_already_installed_Error_Message;
+
+	public static String DiscoveryItem_Connector_already_installed_Error_Title;
+
 	public static String DiscoveryViewer_Certification_Label0;
 
 	public static String DiscoveryViewer_Show_Installed;
 
+	public static String DiscoveryWizard_Install_Window_Title;
+
 	public static String PrepareInstallProfileJob_notFoundDescriptorDetail;
 
 	static {
@@ -81,4 +83,5 @@ public class Messages extends NLS {
 
 	private Messages() {
 	}
+
 }
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/messages.properties b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/messages.properties
index 36dee75ff..ccd8770fc 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/wizards/messages.properties
@@ -8,10 +8,8 @@
 # Contributors:
 #      Tasktop Technologies - initial API and implementation
 ###############################################################################
-CatalogViewer_All_Categories=All Categories
 ConnectorDescriptorToolTip_detailsLink=<a>Learn More</a>
 ConnectorDescriptorToolTip_detailsLink_tooltip=Open {0} in an external browser
-ConnectorDiscoveryWizard_connectorDiscovery=Install Connectors
 ConnectorDiscoveryWizard_installProblems=Problems occurred while performing installation: {0}
 ConnectorDiscoveryWizardMainPage_clearButton_accessibleListener=Clear filter field
 ConnectorDiscoveryWizardMainPage_clearButton_toolTip=Clear
@@ -21,15 +19,18 @@ ConnectorDiscoveryWizardMainPage_message_with_cause={0}: {1}
 ConnectorDiscoveryWizardMainPage_noConnectorsFound=No Connectors Found
 ConnectorDiscoveryWizardMainPage_noConnectorsFound_description=Connector discovery completed without finding any connectors.  Please check your Internet connection and try again.
 ConnectorDiscoveryWizardMainPage_pageDescription=\
-	Select connectors to install. Press Finish to proceed with installation.\n\
+	Select extensions to install. Press Finish to proceed with installation.\n\
 	Press the information button to see a detailed overview and a link to more information.
 ConnectorDiscoveryWizardMainPage_provider_and_license=by {0}, {1}
 ConnectorDiscoveryWizardMainPage_tooltip_showOverview=Show Overview
 ConnectorDiscoveryWizardMainPage_unexpectedException=Unexpected exception
 ConnectorDiscoveryWizardMainPage_warningMessageConnectorUnavailable=Sorry, {0} is unavailable.  Please try again later.
 ConnectorDiscoveryWizardMainPage_warningTitleConnectorUnavailable=Connector Unavailable
+DiscoveryItem_Connector_already_installed_Error_Message={0} is already installed.
+DiscoveryItem_Connector_already_installed_Error_Title=Install Connector
 DiscoveryViewer_Certification_Label0=by {0}, {1}, <a>Certified</a>
 DiscoveryViewer_Show_Installed=Show Installed
+DiscoveryWizard_Install_Window_Title=Install
 InstallConnectorsJob_commaSeparator=, 
 InstallConnectorsJob_connectorsNotAvailable=The following connectors are not available: {0}
 InstallConnectorsJob_questionProceed=Proceed With Installation?