Skip to content

Commit 587677d

Browse files
committed
Don't use GEF TreeViewerTransfer for non-GEF tree viewers
Re-use the DataBinding transfer instead.
1 parent 56b01bd commit 587677d

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

org.eclipse.wb.core.databinding/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.core.databinding;singleton:=true
5-
Bundle-Version: 1.10.0.qualifier
5+
Bundle-Version: 1.10.100.qualifier
66
Bundle-Activator: org.eclipse.wb.internal.core.databinding.Activator
77
Bundle-Vendor: %providerName
88
Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",

org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/BindingElementsComposite.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc. and others.
2+
* Copyright (c) 2011, 2026 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -23,7 +23,7 @@
2323
import org.eclipse.wb.internal.core.utils.ui.GridDataFactory;
2424
import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
2525
import org.eclipse.wb.internal.core.utils.ui.TableFactory;
26-
import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer;
26+
import org.eclipse.wb.internal.core.utils.ui.TreeTransfer;
2727

2828
import org.eclipse.jface.dialogs.IDialogSettings;
2929
import org.eclipse.jface.dialogs.MessageDialog;

org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/ChooseClassAndPropertiesUiContentProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc.
2+
* Copyright (c) 2011, 2026 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -16,6 +16,7 @@
1616
import org.eclipse.wb.internal.core.databinding.ui.UiUtils;
1717
import org.eclipse.wb.internal.core.utils.ui.GridDataFactory;
1818
import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
19+
import org.eclipse.wb.internal.core.utils.ui.TreeTransfer;
1920

2021
import org.eclipse.jface.viewers.ArrayContentProvider;
2122
import org.eclipse.jface.viewers.CheckboxTableViewer;

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/model/property/order/ReorderDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2026 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -20,8 +20,8 @@
2020
import org.eclipse.wb.internal.core.utils.ui.GridDataFactory;
2121
import org.eclipse.wb.internal.core.utils.ui.GridLayoutFactory;
2222
import org.eclipse.wb.internal.core.utils.ui.TableFactory;
23+
import org.eclipse.wb.internal.core.utils.ui.TreeTransfer;
2324
import org.eclipse.wb.internal.core.utils.ui.dialogs.ResizableDialog;
24-
import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer;
2525

2626
import org.eclipse.jface.viewers.ArrayContentProvider;
2727
import org.eclipse.jface.viewers.CheckboxTableViewer;

org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/editor/contentproviders/TreeTransfer.java renamed to org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/ui/TreeTransfer.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011 Google, Inc.
2+
* Copyright (c) 2011, 2026 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +10,7 @@
1010
* Contributors:
1111
* Google, Inc. - initial API and implementation
1212
*******************************************************************************/
13-
package org.eclipse.wb.internal.core.databinding.ui.editor.contentproviders;
13+
package org.eclipse.wb.internal.core.utils.ui;
1414

1515
import org.eclipse.swt.dnd.ByteArrayTransfer;
1616
import org.eclipse.swt.dnd.TransferData;
@@ -23,11 +23,14 @@
2323
* @author lobas_av
2424
* @coverage bindings.ui
2525
*/
26-
final class TreeTransfer extends ByteArrayTransfer {
26+
public final class TreeTransfer extends ByteArrayTransfer {
2727
public static final TreeTransfer INSTANCE = new TreeTransfer();
28-
private static final String TYPE_NAME = "Tree content provider bindings tranfser";
28+
private static final String TYPE_NAME = "Tree content provider transfer";
2929
private static final int TYPE_ID = registerType(TYPE_NAME);
3030

31+
private TreeTransfer() {
32+
}
33+
3134
////////////////////////////////////////////////////////////////////////////
3235
//
3336
// Transfer

0 commit comments

Comments
 (0)