From 587677d1f97d2f54b5861e419fb710fd68f5cdd3 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Sat, 4 Apr 2026 00:13:36 +0200 Subject: [PATCH] Don't use GEF TreeViewerTransfer for non-GEF tree viewers Re-use the DataBinding transfer instead. --- org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF | 2 +- .../core/databinding/ui/BindingElementsComposite.java | 4 ++-- .../ChooseClassAndPropertiesUiContentProvider.java | 3 ++- .../core/model/property/order/ReorderDialog.java | 4 ++-- .../wb/internal/core/utils/ui}/TreeTransfer.java | 11 +++++++---- 5 files changed, 14 insertions(+), 10 deletions(-) rename {org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders => org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/ui}/TreeTransfer.java (86%) diff --git a/org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF b/org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF index 05b4de42d..577f3a494 100644 --- a/org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.core.databinding;singleton:=true -Bundle-Version: 1.10.0.qualifier +Bundle-Version: 1.10.100.qualifier Bundle-Activator: org.eclipse.wb.internal.core.databinding.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", diff --git a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/BindingElementsComposite.java b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/BindingElementsComposite.java index aa04755b6..50ab8c5a4 100644 --- a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/BindingElementsComposite.java +++ b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/BindingElementsComposite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -23,7 +23,7 @@ import org.eclipse.wb.internal.core.utils.ui.GridDataFactory; import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory; import org.eclipse.wb.internal.core.utils.ui.TableFactory; -import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer; +import org.eclipse.wb.internal.core.utils.ui.TreeTransfer; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/ChooseClassAndPropertiesUiContentProvider.java b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/ChooseClassAndPropertiesUiContentProvider.java index 614ed4bf8..b793325bf 100644 --- a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/ChooseClassAndPropertiesUiContentProvider.java +++ b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/ChooseClassAndPropertiesUiContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -16,6 +16,7 @@ import org.eclipse.wb.internal.core.databinding.ui.UiUtils; import org.eclipse.wb.internal.core.utils.ui.GridDataFactory; import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory; +import org.eclipse.wb.internal.core.utils.ui.TreeTransfer; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckboxTableViewer; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/order/ReorderDialog.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/order/ReorderDialog.java index e7eec12c6..448ce7030 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/order/ReorderDialog.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/order/ReorderDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -20,8 +20,8 @@ import org.eclipse.wb.internal.core.utils.ui.GridDataFactory; import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory; import org.eclipse.wb.internal.core.utils.ui.TableFactory; +import org.eclipse.wb.internal.core.utils.ui.TreeTransfer; import org.eclipse.wb.internal.core.utils.ui.dialogs.ResizableDialog; -import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckboxTableViewer; diff --git a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/TreeTransfer.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/ui/TreeTransfer.java similarity index 86% rename from org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/TreeTransfer.java rename to org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/ui/TreeTransfer.java index c5940c034..2cb4aa05c 100644 --- a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/TreeTransfer.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/ui/TreeTransfer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * Google, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.wb.internal.core.databinding.ui.editor.contentproviders; +package org.eclipse.wb.internal.core.utils.ui; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; @@ -23,11 +23,14 @@ * @author lobas_av * @coverage bindings.ui */ -final class TreeTransfer extends ByteArrayTransfer { +public final class TreeTransfer extends ByteArrayTransfer { public static final TreeTransfer INSTANCE = new TreeTransfer(); - private static final String TYPE_NAME = "Tree content provider bindings tranfser"; + private static final String TYPE_NAME = "Tree content provider transfer"; private static final int TYPE_ID = registerType(TYPE_NAME); + private TreeTransfer() { + } + //////////////////////////////////////////////////////////////////////////// // // Transfer