Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2014-09-30 11:08:30 -0400
committerIgor Fedorenko2014-09-30 11:08:39 -0400
commitab495e942fdb3b5d0652c8a3454118511b3c46cc (patch)
treefbd0aaf2209545cf5a00f2e809ddf789ad34eb56
parent169e1a1348043936787be58099077ff60afbdd59 (diff)
downloadm2e-core-ab495e942fdb3b5d0652c8a3454118511b3c46cc.tar.gz
m2e-core-ab495e942fdb3b5d0652c8a3454118511b3c46cc.tar.xz
m2e-core-ab495e942fdb3b5d0652c8a3454118511b3c46cc.zip
445104 removed confusing and misleading references to 'm2e marketplace'
Change-Id: I37b7d3a39ea88f1ed0a4b03fc8c58a70c329b6bb Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java2
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties8
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java
index 28421d3d..7f00b9b3 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/Messages.java
@@ -43,7 +43,7 @@ public class Messages extends NLS {
public static String MavenCatalogViewer_Error_loading_lifecycle;
- public static String MavenCatalogViewer_noApplicableMarketplaceItems;
+ public static String MavenCatalogViewer_noApplicableCatalogItems;
public static String MavenCatalogViewer_unexpectedException;
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties
index a9583250..30711048 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/messages.properties
@@ -10,20 +10,20 @@ ConnectorDiscoveryExtensionReader_unexpected_value_kind=Unexpected value for kin
DiscoveryPreferencePage_catalogUrl=Catalog URL
DiscoveryPreferencePage_link_text=<a>See also</a>
DiscoveryPreferencePage_openCatalog=Open Catalog
-DiscoveryPreferencePage_title=m2e marketplace discovery
+DiscoveryPreferencePage_title=m2e discovery catalog
DiscoveryWizardProposal_Label=Discover new m2e connectors
-DiscoveryWizardProposal_description=Opens the m2e Marketplace dialog and lets you find the appropriate m2e connectors
+DiscoveryWizardProposal_description=Opens the m2e catalog dialog and lets you find the appropriate m2e connectors
MavenCatalogPage_Descripton=Select updates and extensions to install. Press Finish to proceed with installation.\nPress the information button to see a detailed overview and a link to more information.
MavenCatalogPage_Title=Install m2e connectors
MavenCatalogViewer_Error_loading_lifecycle=An error occurred loading lifecycle data for catalog item\: {0}
MavenCatalogViewer_allInstalled=All available entries are installed.
-MavenCatalogViewer_noApplicableMarketplaceItems=No marketplace items are applicable.
+MavenCatalogViewer_noApplicableCatalogItems=No catalog items are applicable.
MavenCatalogViewer_unexpectedException=Unexpected exception
MavenDiscoveryInstallOperation_Configuring=Configuring installation selection
MavenDiscoveryInstallOperation_ErrorMessage=Error(s) occurred gathering items for installation
MavenDiscoveryInstallOperation_missingIU=Error installing {0} unable to locate installable unit {1}
MavenDiscoveryInstallOperation_missingRepository=Error installing {0} contacting repository {1}
-MavenDiscoveryWizard_Title=m2e Marketplace
+MavenDiscoveryWizard_Title=m2e catalog
MavenDiscovery_Wizard_Applicable_Tag=Applicable
MavenDiscovery_Wizard_ExtrasTag=Extras
MavenDiscovery_Wizard_LifecyclesTag=Lifecycles
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java
index 054ef62b..2445591d 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java
@@ -138,7 +138,7 @@ public class MavenCatalogViewer extends CatalogViewer {
}
if(noneApplicable) {
handleStatus(new Status(IStatus.ERROR, DiscoveryActivator.PLUGIN_ID,
- Messages.MavenCatalogViewer_noApplicableMarketplaceItems));
+ Messages.MavenCatalogViewer_noApplicableCatalogItems));
}
}
});

Back to the top