Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Weiser2017-08-07 14:40:01 -0400
committerAlexander Kurtakov2017-10-10 07:21:38 -0400
commit5a566f0124d6ef079a237ff0a2bbee42e43f0da2 (patch)
treea36b1bc809b584643c18d1872cc782b01f24a437
parent8c6c4cf6541a6fa741fda4027f861260856f1504 (diff)
downloadrt.equinox.p2-5a566f0124d6ef079a237ff0a2bbee42e43f0da2.tar.gz
rt.equinox.p2-5a566f0124d6ef079a237ff0a2bbee42e43f0da2.tar.xz
rt.equinox.p2-5a566f0124d6ef079a237ff0a2bbee42e43f0da2.zip
Bug 520638 - Error Contacting Site dialog should use verbs (Edit)I20171011-0305I20171010-2000
Change-Id: Id7113cd7ea0e5c354f6c502f2fac9d7f914f1540 Signed-off-by: David Weiser <david.weiser@vogella.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties1
3 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java
index 0805825ef..9a997674e 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java
@@ -22,9 +22,11 @@ import org.eclipse.equinox.p2.repository.IRepositoryManager;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
@@ -135,7 +137,8 @@ public class ColocatedRepositoryTracker extends RepositoryTracker {
if (workbench.isClosing())
return;
Shell shell = ProvUI.getDefaultParentShell();
- if (MessageDialog.openQuestion(shell, ProvUIMessages.ColocatedRepositoryTracker_SiteNotFoundTitle, NLS.bind(ProvUIMessages.ColocatedRepositoryTracker_PromptForSiteLocationEdit, URIUtil.toUnencodedString(location)))) {
+ int result = MessageDialog.open(MessageDialog.QUESTION, shell, ProvUIMessages.ColocatedRepositoryTracker_SiteNotFoundTitle, NLS.bind(ProvUIMessages.ColocatedRepositoryTracker_PromptForSiteLocationEdit, URIUtil.toUnencodedString(location)), SWT.NONE, ProvUIMessages.ColocatedRepositoryTracker_SiteNotFound_EditButtonLabel, IDialogConstants.NO_LABEL);
+ if (result == 0) {
RepositoryNameAndLocationDialog dialog = new RepositoryNameAndLocationDialog(shell, ui) {
@Override
protected String getInitialLocationText() {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
index 3b82281c9..84a553a9d 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
@@ -44,6 +44,7 @@ public class ProvUIMessages extends NLS {
public static String ColocatedRepositoryManipulator_AddSiteOperationLabel;
public static String ColocatedRepositoryTracker_PromptForSiteLocationEdit;
public static String ColocatedRepositoryTracker_SiteNotFoundTitle;
+ public static String ColocatedRepositoryTracker_SiteNotFound_EditButtonLabel;
public static String RevertProfilePage_ConfirmDeleteMultipleConfigs;
public static String RevertProfilePage_ConfirmDeleteSingleConfig;
public static String RevertProfilePage_Delete;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index 081545ee2..b6fde26ab 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
@@ -197,6 +197,7 @@ AvailableIUGroup_NoSitesConfiguredExplanation=There are no software sites availa
ColocatedRepositoryManipulator_NoContentExplanation=You may select a site in the combo box at the top. You may also type or paste a site name into the combo box and press Enter. You may also drag a site URL into the combo box or software list.
ColocatedRepositoryTracker_PromptForSiteLocationEdit=No software site found at {0}. Do you wish to edit the location?
ColocatedRepositoryTracker_SiteNotFoundTitle=Error Contacting Site
+ColocatedRepositoryTracker_SiteNotFound_EditButtonLabel=&Edit
AvailableIUGroup_NoSitesExplanation=There is no site selected.
AvailableIUsPage_AddButton=&Add...
AvailableIUsPage_AllSites=--All Available Sites--

Back to the top