Used limit based viewers eclipse-jdt#631

TODO proper commit message See eclipse-platform/eclipse.platform.ui#818
raghucssit · Jun 27, 2023 · dcba8cb · dcba8cb
1 parent 12d3052
commit dcba8cb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaOutlinePage.java
@@ -54,6 +54,7 @@
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.IExpandableNode;
 import org.eclipse.jface.viewers.IPostSelectionProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -88,6 +89,7 @@
 import org.eclipse.ui.part.IShowInTargetList;
 import org.eclipse.ui.part.Page;
 import org.eclipse.ui.part.ShowInContext;
+import org.eclipse.ui.views.WorkbenchViewerSetup;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
@@ -423,6 +425,9 @@ protected void internalExpandToLevel(Widget node, int level) {
 				 */
 				@Override
 				public boolean isExpandable(Object element) {
+					if (element instanceof IExpandableNode) {
+						return false;
+					}
 					if (hasFilters()) {
 						return getFilteredChildren(element).length > 0;
 					}
@@ -938,6 +943,7 @@ public void createControl(Composite parent) {
 		);
 
 		fOutlineViewer= new JavaOutlineViewer(tree);
+		WorkbenchViewerSetup.setupViewer(fOutlineViewer);
 		initDragAndDrop();
 		fOutlineViewer.setContentProvider(new ChildrenProvider());
 		fOutlineViewer.setLabelProvider(new DecoratingJavaLabelProvider(lprovider));

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerPart.java
@@ -56,6 +56,7 @@
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.IElementComparer;
+import org.eclipse.jface.viewers.IExpandableNode;
 import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -90,6 +91,7 @@
 import org.eclipse.ui.part.IShowInTarget;
 import org.eclipse.ui.part.ShowInContext;
 import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.views.WorkbenchViewerSetup;
 import org.eclipse.ui.views.framelist.Frame;
 import org.eclipse.ui.views.framelist.FrameAction;
 import org.eclipse.ui.views.framelist.FrameList;
@@ -284,6 +286,9 @@ protected boolean evaluateExpandableWithFilters(Object parent) {
 			if (parent instanceof IPackageFragmentRoot && ((IPackageFragmentRoot) parent).isArchive()) {
 				return false;
 			}
+			if(parent instanceof IExpandableNode) {
+				return false;
+			}
 			return true;
 		}
 
@@ -492,6 +497,7 @@ public void createPartControl(Composite parent) {
 
 		fViewer= createViewer(fDisplayArea);
 		fViewer.setUseHashlookup(true);
+		WorkbenchViewerSetup.setupViewer(fViewer);
 
 		fEmptyWorkspaceHelper.setNonEmptyControl(fViewer.getControl());