Merge pull request #1575 from Mailaender/treeviewer-image-crash

Fixed a native crash on Linux when opening the file browser tree for the first time
eclipse-chemclipse · Dec 1, 2023 · d29d04a · d29d04a
2 parents 5520f2d + 3aa9823
commit d29d04a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/...se.ux.extension.ui/src/org/eclipse/chemclipse/ux/extension/ui/swt/DataExplorerTreeUI.java b/...se.ux.extension.ui/src/org/eclipse/chemclipse/ux/extension/ui/swt/DataExplorerTreeUI.java
@@ -20,6 +20,7 @@
 
 import org.eclipse.chemclipse.processing.converter.ISupplier;
 import org.eclipse.chemclipse.processing.converter.ISupplierFileIdentifier;
+import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils;
 import org.eclipse.chemclipse.ux.extension.ui.Activator;
 import org.eclipse.chemclipse.ux.extension.ui.l10n.Messages;
 import org.eclipse.chemclipse.ux.extension.ui.listener.DataExplorerDragListener;
@@ -153,7 +154,8 @@ private TreeViewer createTreeViewer(Composite parent, Function<File, Map<ISuppli
 
 	private void setInput(TreeViewer treeViewer) {
 
-		treeViewer.setInput(dataExplorerTreeRoot.getRootContent());
+		// Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=573090
+		DisplayUtils.getDisplay().asyncExec(() -> treeViewer.setInput(dataExplorerTreeRoot.getRootContent()));
 	}
 
 	private int getNumberOfChildDirectories(File directory) {

diff --git a/...tension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/DataExplorerPart.java b/...tension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/DataExplorerPart.java
@@ -17,7 +17,6 @@
 import javax.inject.Inject;
 
 import org.eclipse.chemclipse.processing.converter.ISupplierFileIdentifier;
-import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.DataExplorerUI;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -37,12 +36,7 @@ public class DataExplorerPart {
 	@PostConstruct
 	public void init(Composite parent, MPart part, IEclipseContext context) {
 
-		// Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=573090
-		DisplayUtils.getDisplay().asyncExec(() -> {
-			dataExplorerUI = new DataExplorerUI(parent, preferenceStore, context, supplierFileIdentifier);
-			dataExplorerUI.getControl().redraw();
-			dataExplorerUI.getControl().requestLayout();
-		});
+		dataExplorerUI = new DataExplorerUI(parent, preferenceStore, context, supplierFileIdentifier);
 	}
 
 	public DataExplorerUI getDataExplorerUI() {
@@ -53,8 +47,6 @@ public DataExplorerUI getDataExplorerUI() {
 	@Focus
 	public void focus() {
 
-		if(dataExplorerUI != null) {
-			dataExplorerUI.setFocus();
-		}
+		dataExplorerUI.setFocus();
 	}
 }
diff --git a/...se.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/DataListUI.java b/...se.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/DataListUI.java
@@ -296,8 +296,8 @@ public void widgetDisposed(DisposeEvent e) {
 			@Override
 			public String getText(Object element) {
 
-				if(element instanceof File) {
-					return getName((File)element);
+				if(element instanceof File file) {
+					return getName(file);
 				}
 				return "-";
 			}
@@ -314,8 +314,8 @@ public Image getImage(Object element) {
 			@Override
 			public String getText(Object element) {
 
-				if(element instanceof File) {
-					return getPath((File)element);
+				if(element instanceof File file) {
+					return getPath(file);
 				}
 				return "-";
 			}