Merge branch 'master' into zwsp

Author: marcushoepfner

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2020 IBM Corporation and others.
+ * Copyright (c) 2008, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -87,6 +87,8 @@
 import org.eclipse.swt.custom.CTabFolder2Listener;
 import org.eclipse.swt.custom.CTabFolderEvent;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTarget;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.MouseAdapter;
@@ -719,6 +721,11 @@ public Object createWidget(MUIElement element, Object parent) {
 		if (PartStackUtil.isEditorStack(element)) {
 			createOnboardingControls(tabFolder);
 			initializeOnboardingInformationInEditorStack(tabFolder);
+			int drop = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+			// Bug: eclipse-platform/eclipse.platform.swt/issues/649
+			Composite dropZone = new Composite(tabFolder, SWT.NONE);// additional Composite/child to support dropping
+			new Label(dropZone, SWT.NONE);
+			new DropTarget(dropZone, drop);
 		}
 		tabFolder.setMRUVisible(getMRUValue());
 

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java

@@ -624,6 +624,7 @@ public void addMouseListener(MouseListener listener) {
 					fBuffer.dispose();
 					fBuffer= null;
 				}
+				layout(false);
 			});
 		});
 

bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/WizardDialog.java

@@ -370,7 +370,7 @@ public WizardDialog setModal(boolean modal) {
 	 */
 	public boolean isModal() {
 		return (getShellStyle() & SWT.PRIMARY_MODAL) == SWT.PRIMARY_MODAL
-				|| (getShellStyle() & SWT.PRIMARY_MODAL) == SWT.APPLICATION_MODAL;
+				|| (getShellStyle() & SWT.APPLICATION_MODAL) == SWT.APPLICATION_MODAL;
 	}
 
 	/**

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2020 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
@@ -403,6 +404,9 @@ public void update(ViewerCell cell) {
 	private Combo searchIn;
 	private Label listLabel;
 
+	private int sortColumnIndex = -1;
+	private boolean sortDirectionAscending = true;
+
 	/**
 	 * Creates a new instance of the class.
 	 *
@@ -840,19 +844,45 @@ public void getName(AccessibleEvent e) {
 //		new ScrollListener(list.getTable().getVerticalBar());
 //		new SelectionChangedListener(list);
 
+		Table table = list.getTable();
 		TableViewerColumn col = new TableViewerColumn(list, SWT.RIGHT);
+		TableColumn column = col.getColumn();
+		column.setText(Messages.QuickSearchDialog_line);
+		column.setWidth(40);
+		column.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Comparator<LineItem> lineNumberComparator = Comparator.comparingInt(LineItem::getLineNumber);
+				handleColumnSort(table, 0, lineNumberComparator);
+			}
+		});
 		col.setLabelProvider(LINE_NUMBER_LABEL_PROVIDER);
-		col.getColumn().setText(Messages.QuickSearchDialog_line);
-		col.getColumn().setWidth(40);
+
 		col = new TableViewerColumn(list, SWT.LEFT);
-		col.getColumn().setText(Messages.QuickSearchDialog_text);
+		column = col.getColumn();
+		column.setText(Messages.QuickSearchDialog_text);
+		column.setWidth(400);
+		column.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Comparator<LineItem> textComparator = Comparator.comparing( LineItem::getText);
+				handleColumnSort(table, 1, textComparator);
+			}
+		});
 		col.setLabelProvider(LINE_TEXT_LABEL_PROVIDER);
-		col.getColumn().setWidth(400);
+
 		col = new TableViewerColumn(list, SWT.LEFT);
-		col.getColumn().setText(Messages.QuickSearchDialog_path);
+		column = col.getColumn();
+		column.setText(Messages.QuickSearchDialog_path);
+		column.setWidth(150);
+		column.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Comparator<LineItem> lineItemComparator = Comparator.comparing(item -> item.getFile().getFullPath().toString());
+				handleColumnSort(table, 2, lineItemComparator);
+			}
+		});
 		col.setLabelProvider(LINE_FILE_LABEL_PROVIDER);
-		col.getColumn().setWidth(150);
-
 		new TableResizeHelper(list).enableResizing();
 
 		//list.setLabelProvider(getItemsListLabelProvider());
@@ -951,6 +981,21 @@ public void keyPressed(KeyEvent e) {
 		return dialogArea;
 	}
 
+	private void handleColumnSort(Table table, int columnIndex, Comparator sorter) {
+		if (sortColumnIndex == columnIndex) {
+			sortDirectionAscending = !sortDirectionAscending;
+		} else {
+			sortColumnIndex = columnIndex;
+			sortDirectionAscending = true;
+		}
+		table.setSortColumn(table.getColumn(columnIndex));
+		table.setSortDirection(sortDirectionAscending ? SWT.UP : SWT.DOWN);
+
+		contentProvider.setComparator(sortDirectionAscending ? sorter : sorter.reversed());
+		contentProvider.sortList();
+		refreshWidgets();
+	}
+
 	private Composite createNestedComposite(Composite parent, int numRows, boolean equalRows) {
 		Composite nested = new Composite(parent, SWT.NONE);
 		{
@@ -1468,7 +1513,7 @@ private void applyPathMatcher() {
 	private class ContentProvider implements IStructuredContentProvider, ILazyContentProvider {
 
 		private List items;
-
+		private Comparator<LineItem> comparator;
 		/**
 		 * Creates new instance of <code>ContentProvider</code>.
 		 */
@@ -1551,6 +1596,25 @@ public void updateElement(int index) {
 
 		}
 
+		/**
+		 * Sorts the current search results based on current comparator
+		 */
+		public void sortList() {
+			if (comparator == null) {
+				return;
+			}
+			items.sort(comparator);
+		}
+
+		/**
+		 * Sets a custom comparator for comparing LineItem objects.
+		 *
+		 * @param comparator a <code>Comparator<code> object that defines the custom comparison logic.
+		 */
+		public void setComparator(Comparator<LineItem> comparator) {
+			this.comparator = comparator;
+		}
+
 	}
 
 	/**

bundles/org.eclipse.ui.themes/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.themes;singleton:=true
-Bundle-Version: 1.2.2800.qualifier
+Bundle-Version: 1.2.2900.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.e4.ui.css.swt.theme

bundles/org.eclipse.ui.themes/css/high-contrast.css

@@ -19,7 +19,6 @@ theme.classic = Classic
 theme.light = Light
 
 theme.dark = Dark
-theme.high-contrast = High Contrast
 
 #New theme element definitions
 DARK_BACKGROUND=Dark Background Color

bundles/org.eclipse.ui.themes/plugin.properties

@@ -51,11 +51,6 @@
             label="%theme.light"
             os="win32">
       </theme>
-   <theme
-		basestylesheeturi="css/high-contrast.css"
-        id="org.eclipse.e4.ui.css.theme.high-contrast"
-        label="%theme.high-contrast">
-   </theme>
 
    <themeAssociation
 		themeId="org.eclipse.e4.ui.css.theme.e4_classic"

bundles/org.eclipse.ui.themes/plugin.xml

@@ -658,7 +658,7 @@ private static List removeDups(List list) {
 	 * collection of objects.
 	 */
 	private List getCommonClasses(List objects, List commonAdapters) {
-		if (objects == null || objects.isEmpty()) {
+		if (objects == null || objects.isEmpty() || !Platform.isRunning()) {
 			return null;
 		}