Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-08-13 13:54:50 -0400
committerLars Vogel2019-08-14 10:59:41 -0400
commit1b00a7fae3fb9924b8b1fc2da0dc95d1034866dc (patch)
tree859f0932ed9addfe9fb24f8be961866c0837921a
parentcf4181e8df433626800d33ea43d06fcc57761024 (diff)
downloadrt.equinox.p2-1b00a7fae3fb9924b8b1fc2da0dc95d1034866dc.tar.gz
rt.equinox.p2-1b00a7fae3fb9924b8b1fc2da0dc95d1034866dc.tar.xz
rt.equinox.p2-1b00a7fae3fb9924b8b1fc2da0dc95d1034866dc.zip
Bug 550028 - Use e4 FilteredTree in InstalledIUGroupY20190815-0900
e4 FilteredTree is faster to to the usage of hashes. We plan to release e4 FilteredTree in the next release as API. Change-Id: Ib1b9c1a712ac29c9dd428020b13919858147939e Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java9
2 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index 056559c14..3f2391db7 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -34,7 +34,8 @@ Export-Package: org.eclipse.equinox.internal.p2.ui;
Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.expressions,
- org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.e4.ui.dialogs;bundle-version="1.1.600"
Import-Package: com.ibm.icu.text,
javax.xml.parsers,
org.eclipse.equinox.internal.p2.artifact.repository,
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
index 0e05ea409..0b87d3edb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstalledIUGroup.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.dialogs;
+import org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree;
+import org.eclipse.e4.ui.dialogs.filteredtree.PatternFilter;
import org.eclipse.equinox.internal.p2.ui.ProvUI;
import org.eclipse.equinox.internal.p2.ui.ProvUIProvisioningListener;
import org.eclipse.equinox.internal.p2.ui.model.ProfileElement;
@@ -23,8 +25,6 @@ import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
/**
* An InstalledIUGroup is a reusable UI component that displays the
@@ -57,8 +57,9 @@ public class InstalledIUGroup extends StructuredIUGroup {
@Override
protected StructuredViewer createViewer(Composite parent) {
// Table of installed IU's
- FilteredTree filteredTree = new FilteredTree(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, new PatternFilter(), true);
- filteredTree.getFilterControl().setFocus(); //Steal focus, consistent with org.eclipse.ui.internal.about.AboutPluginsPage
+ FilteredTree filteredTree = new FilteredTree(parent,
+ SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, new PatternFilter());
+ filteredTree.getFilterControl().setFocus(); // Steal focus, consistent with org.eclipse.ui.internal.about.AboutPluginsPage
TreeViewer installedIUViewer = filteredTree.getViewer();
// Filters and sorters before establishing content, so we don't refresh unnecessarily.

Back to the top