Bug 250316 - [ui] Moving the update site list to a preferences page

5 files changed, 14 insertions, 16 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
index 994284828..40a12b804 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
@@ -16,7 +16,6 @@ bundleName=Equinox Provisioning Platform Update Support
 IU.general=General Information
 IU.license=License Agreement
 IU.copyright=Copyright
-Repository.name=General Information
 Update.command=Check for Updates
 Update.command.mnemonic=U
 Install.command=Install New Software...
@@ -24,9 +23,9 @@ Install.command.mnemonic=S
 TempInstallView.command=Installation Information
 TempInstallView.mnemonic=I
 provisioningPrefPage = Install/Update
+sitesPrefPage = Available Software Sites
 installedSoftwarePage = Installed Software
-externalFilesPrefPage = Updating from the File System
-preferenceKeywords.general=automatic update schedule download software install import bundle
+preferenceKeywords.general=automatic update schedule download site software install import bundle
 preferences=Update and Install Preferences
 classicCategoryName=Classic Update
 classicCategoryDesc=Enables classic update functionality
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
index 896f1553d..d3d8da60e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
@@ -36,19 +36,7 @@
                   type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit">
              </adapt>
           </enabledWhen>
-      </page>
- 
-      <page
-            name="%Repository.name"
-            class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositoryPropertyPage"
-            id="org.eclipse.equinox.internal.p2.ui.sdk.RepositoryPropertyPage">
-            <enabledWhen>
-            <adapt
-                  type="org.eclipse.equinox.internal.provisional.p2.ui.model.IRepositoryElement">
-             </adapt>
-          </enabledWhen>
-      </page>
-      
+      </page>    
       </extension>
        <extension
          point="org.eclipse.ui.preferencePages">
@@ -58,6 +46,14 @@
             id="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage">
             <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/>
       </page>
+      
+       <page
+            name="%sitesPrefPage"
+            category="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"
+            class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositoryManipulationPage"
+            id="org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage">
+            <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/>
+      </page>
  
    </extension>
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
index 87407dd62..865a36530 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
@@ -187,6 +187,7 @@ public class ProvSDKUIActivator extends AbstractUIPlugin {
 				}
 			}
 		});
+		policy.setRepositoryManipulator(new ColocatedRepositoryManipulator(policy, PreferenceConstants.PREF_PAGE_SITES));
 		policy.setPlanValidator(new PlanValidator() {
 			public boolean continueWorkingWithPlan(ProvisioningPlan plan, Shell shell) {
 				if (plan == null)
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
index 63672de91..c7a70df81 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
@@ -64,6 +64,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler {
 
 			}
 		}, profileId, false);
+		action.setRepositoryManager(manager);
 		action.run();
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/PreferenceConstants.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/PreferenceConstants.java
index daf9f2cd2..39f4e88e3 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/PreferenceConstants.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/PreferenceConstants.java
@@ -15,6 +15,7 @@ package org.eclipse.equinox.internal.p2.ui.sdk.prefs;
  */
 public class PreferenceConstants {
 	public static final String PREF_PAGE_PROVISIONING = "org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"; //$NON-NLS-1$
+	public static final String PREF_PAGE_SITES = "org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage"; //$NON-NLS-1$
 	public static final String PREF_SHOW_LATEST_VERSION = "showLatestVersion"; //$NON-NLS-1$
 	public static final String PREF_OPEN_WIZARD_ON_ERROR_PLAN = "allowNonOKPlan"; //$NON-NLS-1$
 }