Bug 250188 - [ui] [admin] artifact and profiles view not honoring prefs dynamically

5 files changed, 15 insertions, 11 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java
index 9e1ae8a0f..7bdcdba6f 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java
@@ -38,7 +38,7 @@ public class ArtifactRepositoriesView extends RepositoriesView {
 	}
 
 	protected Object getInput() {
-		return new ArtifactRepositories();
+		return new ArtifactRepositories(ProvAdminUIActivator.getDefault().getPolicy());
 	}
 
 	protected String getAddCommandLabel() {
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
index 1db355cb3..f22aa63ac 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
@@ -183,7 +183,7 @@ public class ProfilesView extends ProvView {
 	}
 
 	protected Object getInput() {
-		return new Profiles();
+		return new Profiles(ProvAdminUIActivator.getDefault().getPolicy());
 	}
 
 	ProfileChooser getProfileChooser() {
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
index 8997efba8..c928d9a60 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
@@ -129,7 +129,7 @@ public class ProvAdminUIActivator extends AbstractUIPlugin {
 			queryContext.setMetadataRepositoryFlags(IRepositoryManager.REPOSITORIES_ALL);
 		}
 		queryContext.setShowLatestVersionsOnly(getPreferenceStore().getBoolean(PreferenceConstants.PREF_COLLAPSE_IU_VERSIONS));
-
+		queryContext.setUseCategories(getPreferenceStore().getBoolean(PreferenceConstants.PREF_USE_CATEGORIES));
 	}
 
 	void initializePolicy() {
@@ -150,7 +150,7 @@ public class ProvAdminUIActivator extends AbstractUIPlugin {
 				// TODO would be nice if the profile chooser dialog let you
 				// create a new profile
 				ProvElementContentProvider provider = new ProvElementContentProvider();
-				if (provider.getElements(new Profiles()).length == 0) {
+				if (provider.getElements(new Profiles(getPolicy())).length == 0) {
 					AddProfileDialog dialog = new AddProfileDialog(shell, new String[0]);
 					if (dialog.open() == Window.OK) {
 						return dialog.getAddedProfileId();
@@ -161,7 +161,7 @@ public class ProvAdminUIActivator extends AbstractUIPlugin {
 				ListDialog dialog = new ListDialog(shell);
 				dialog.setTitle(ProvAdminUIMessages.MetadataRepositoriesView_ChooseProfileDialogTitle);
 				dialog.setLabelProvider(new ProvElementLabelProvider());
-				dialog.setInput(new Profiles());
+				dialog.setInput(new Profiles(getPolicy()));
 				dialog.setContentProvider(provider);
 				dialog.open();
 				Object[] result = dialog.getResult();
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java
index 156d2b79e..d8310405c 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java
@@ -125,7 +125,7 @@ abstract class ProvView extends ViewPart {
 		undoRedoGroup = new UndoRedoActionGroup(getSite(), ProvUI.getProvisioningUndoContext(), true);
 		refreshAction = new RefreshAction(viewer, viewer.getControl()) {
 			protected void refresh() {
-				refreshAll();
+				refreshAll(true);
 			}
 		};
 		refreshAction.setToolTipText(ProvAdminUIMessages.ProvView_RefreshCommandTooltip);
@@ -157,7 +157,7 @@ abstract class ProvView extends ViewPart {
 			public void propertyChange(PropertyChangeEvent event) {
 				if (getVisualProperties().contains(event.getProperty())) {
 					ProvAdminUIActivator.getDefault().initializePolicy();
-					ProvView.this.refreshAll();
+					ProvView.this.refreshAll(false);
 				}
 			}
 
@@ -223,9 +223,10 @@ abstract class ProvView extends ViewPart {
 		return list;
 	}
 
-	final void refreshAll() {
+	final void refreshAll(boolean refreshModel) {
 		// Refresh the underlying elements
-		refreshUnderlyingModel();
+		if (refreshModel)
+			refreshUnderlyingModel();
 		// We then reset the input to ensure that anything the content providers 
 		// are caching gets reset also.  The net effect is that everything 
 		// will get queried again.
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
index 23766c54a..f01d7114a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
@@ -82,7 +82,11 @@ abstract class RepositoriesView extends ProvView {
 
 	protected void addListeners() {
 		super.addListeners();
-		listener = new StructuredViewerProvisioningListener(viewer, getListenerEventTypes());
+		listener = new StructuredViewerProvisioningListener(viewer, getListenerEventTypes()) {
+			protected void refreshAll() {
+				RepositoriesView.this.refreshAll(false);
+			}
+		};
 		ProvUI.addProvisioningListener(listener);
 	}
 
@@ -183,7 +187,6 @@ abstract class RepositoriesView extends ProvView {
 	protected List getVisualProperties() {
 		List list = super.getVisualProperties();
 		list.add(PreferenceConstants.PREF_HIDE_SYSTEM_REPOS);
-		list.add(PreferenceConstants.PREF_COLLAPSE_IU_VERSIONS);
 		return list;
 	}
 }