Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSusan Franklin2009-03-11 16:05:16 +0000
committerSusan Franklin2009-03-11 16:05:16 +0000
commit461aed7ba390d355a8c269e8e0e2f2c82e1f1135 (patch)
treed3ba1bdac9fb2dc758616ff220f4745f4577283a
parent72bdca2f1d9a3a82ea55f46799df6071dc1864f4 (diff)
downloadrt.equinox.p2-461aed7ba390d355a8c269e8e0e2f2c82e1f1135.tar.gz
rt.equinox.p2-461aed7ba390d355a8c269e8e0e2f2c82e1f1135.tar.xz
rt.equinox.p2-461aed7ba390d355a8c269e8e0e2f2c82e1f1135.zip
Bug 267921 - [ui] Stronger affordance that site selection is required in available software dialogv20090311-1223
-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/dialogs/AvailableIUsPage.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties1
3 files changed, 6 insertions, 0 deletions
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 2ea580ee1..4fba74f6f 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
@@ -173,6 +173,7 @@ public class ProvUIMessages extends NLS {
public static String AvailableIUsPage_RepoFilterInstructions;
public static String AvailableIUsPage_RepoFilterLabel;
public static String AvailableIUsPage_ResolveAllCheckbox;
+ public static String AvailableIUsPage_SelectASite;
public static String AvailableIUsPage_ShowLatestVersions;
public static String AvailableIUsPage_Title;
public static String DefaultQueryProvider_ErrorRetrievingProfile;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
index 6111dc9ad..0d49fdcf0 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUsPage.java
@@ -417,6 +417,7 @@ public class AvailableIUsPage extends ProvisioningWizardPage implements ISelecta
if (repoCombo != null) {
fillRepoCombo(SITE_NONE);
setRepoComboDecoration(null);
+ setDescription(ProvUIMessages.AvailableIUsPage_SelectASite);
}
if (resolveAllCheckbox != null) {
@@ -719,8 +720,10 @@ public class AvailableIUsPage extends ProvisioningWizardPage implements ISelecta
int localIndex = getLocalSites().length == 0 ? repoCombo.getItemCount() : repoCombo.getItemCount() - 1;
if (comboRepos == null || selection < 0)
selection = INDEX_SITE_NONE;
+ String description = ProvUIMessages.AvailableIUsPage_Description;
if (selection == INDEX_SITE_NONE) {
availableIUGroup.setRepositoryFilter(AvailableIUGroup.AVAILABLE_NONE, null);
+ description = ProvUIMessages.AvailableIUsPage_SelectASite;
} else if (selection == INDEX_SITE_ALL) {
availableIUGroup.setRepositoryFilter(AvailableIUGroup.AVAILABLE_ALL, null);
} else if (selection >= localIndex) {
@@ -729,6 +732,7 @@ public class AvailableIUsPage extends ProvisioningWizardPage implements ISelecta
availableIUGroup.setRepositoryFilter(AvailableIUGroup.AVAILABLE_SPECIFIED, comboRepos[selection]);
}
validateNextButton();
+ setDescription(description);
}
void addViewerProvisioningListeners() {
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 bf1a3b7c8..b49ba0636 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
@@ -208,6 +208,7 @@ AvailableIUsPage_NoSites=type or select a site
AvailableIUsPage_RepoFilterInstructions=You can type a new site name and press 'Enter' to view software from that site.
AvailableIUsPage_RepoFilterLabel=&Work with:
AvailableIUsPage_ResolveAllCheckbox=&Contact all update sites during install to find required software
+AvailableIUsPage_SelectASite=Select a site or enter the location of a site.
AvailableIUsPage_ShowLatestVersions=Show only the &latest versions of available software
AvailableIUsPage_Title=Available Software
DefaultQueryProvider_ErrorRetrievingProfile=Error retrieving profile {0}

Back to the top