Skip to content

[GEF] Remove deprecated TreeEditPart #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Apr 4, 2026
Merged

[GEF] Remove deprecated TreeEditPart #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/DesignTreeEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@

import org.eclipse.wb.gef.core.RequestProcessor;
import org.eclipse.wb.gef.core.policies.IRequestEditPolicy;
import org.eclipse.wb.internal.gef.tree.tools.DoubleClickEditPartTracker;

import org.eclipse.gef.DragTracker;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editparts.AbstractTreeEditPart;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -28,8 +31,7 @@
*
* @see {@link RequestProcessor}
*/
@SuppressWarnings("removal")
public abstract class DesignTreeEditPart extends TreeEditPart {
public abstract class DesignTreeEditPart extends AbstractTreeEditPart {

////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -125,4 +127,15 @@ public void showTargetFeedback(Request request) {
public void eraseTargetFeedback(Request request) {
super.eraseTargetFeedback(processRequestProcessors(request));
}

////////////////////////////////////////////////////////////////////////////
//
// DragTracking
//
////////////////////////////////////////////////////////////////////////////
@Override
public DragTracker getDragTracker(Request request) {
return new DoubleClickEditPartTracker(this);
}

}
132 changes: 0 additions & 132 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java
View file
Open in desktop

This file was deleted.

66 changes: 7 additions & 59 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/RootEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
*******************************************************************************/
package org.eclipse.wb.internal.gef.tree;

import org.eclipse.wb.gef.core.IEditPartViewer;
import org.eclipse.wb.gef.tree.DesignTreeEditPart;

import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.TreeEditPart;
import org.eclipse.gef.editparts.RootTreeEditPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
Expand All @@ -27,66 +23,18 @@
* @author lobas_av
* @coverage gef.tree
*/
public class RootEditPart extends DesignTreeEditPart implements org.eclipse.gef.RootEditPart {
private IEditPartViewer m_viewer;
private TreeEditPart m_contentEditPart;

////////////////////////////////////////////////////////////////////////////
//
// EditPart
//
////////////////////////////////////////////////////////////////////////////
/**
* Returns the root's {@link EditPartViewer}.
*/
@Override
public IEditPartViewer getViewer() {
return m_viewer;
}

@Override
public void setViewer(EditPartViewer viewer) {
m_viewer = (IEditPartViewer) viewer;
}

public class RootEditPart extends RootTreeEditPart {
@Override
protected void addChildVisual(org.eclipse.gef.EditPart childPart, int index) {
m_contentEditPart.setWidget(new TreeItem(getTreeControl(), SWT.NONE));
}

private Tree getTreeControl() {
return (Tree) m_viewer.getControl();
getContents().setWidget(new TreeItem(getWidget(), SWT.NONE));
}

////////////////////////////////////////////////////////////////////////////
//
// IRootEditPart
//
////////////////////////////////////////////////////////////////////////////

/**
* Returns the <i>content</i> {@link EditPart}.
*/
@Override
public EditPart getContents() {
return m_contentEditPart;
public Tree getWidget() {
return (Tree) getViewer().getControl();
}

/**
* Sets the <i>content</i> {@link EditPart}. A IRootEditPart only has a single child, called its
* <i>contents</i>.
*/
@Override
public void setContents(org.eclipse.gef.EditPart contentEditPart) {
if (m_contentEditPart != null) {
// remove content
removeChild(m_contentEditPart);
}
//
m_contentEditPart = (TreeEditPart) contentEditPart;
//
if (m_contentEditPart != null) {
addChild(m_contentEditPart, -1);
}
public TreeEditPart getContents() {
return (TreeEditPart) super.getContents();
}
}
29 changes: 19 additions & 10 deletions org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -92,7 +93,7 @@ public void refreshed() throws Exception {
// do in setRedraw(false) to avoid flashing after component moving
tree.setRedraw(false);
try {
refresh();
refresh(ObjectEditPart.this);
{
setSelectionIfAllEditParts(m_delayedSelectionObjects);
m_delayedSelectionObjects = null;
Expand All @@ -103,6 +104,13 @@ public void refreshed() throws Exception {
}
}

private void refresh(EditPart editPart) {
editPart.refresh();
for (EditPart child : editPart.getChildren()) {
refresh(child);
}
}

@Override
public void select(List<? extends ObjectInfo> objects) throws Exception {
m_delayedSelectionObjects = null;
Expand Down Expand Up @@ -173,26 +181,27 @@ private void update() {
}

private void update0() {
if (getWidget() instanceof Tree) {
return;
}
TreeItem treeItem = (TreeItem) getWidget();

ImageDescriptor imageDescriptor = ObjectInfo.getImageDescriptor(m_object);
String text = ObjectInfo.getText(m_object);
if (imageDescriptor != null) {
Image image = imageDescriptor.createImage();
getWidget().addDisposeListener(event -> image.dispose());
getWidget().setImage(image);
treeItem.addDisposeListener(event -> image.dispose());
treeItem.setImage(image);
}
//Obtain the preference specifying the root object name. If no name is specified then the default is used
String rootObjectName =
InstanceScope.INSTANCE.getNode(IEditorPreferenceConstants.WB_BASIC_UI_PREFERENCE_NODE).get(
IEditorPreferenceConstants.WB_ROOT_OBJ_NAME,
null);
if (getWidget().getParentItem() == null) {
if (rootObjectName == null) {
getWidget().setText(text);
} else {
getWidget().setText(rootObjectName);
}
if (treeItem.getParentItem() == null && rootObjectName != null) {
treeItem.setText(rootObjectName);
} else {
getWidget().setText(text);
treeItem.setText(text);
}
}

Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeRobot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,7 @@ public TreeEditPart[] getEditParts(Object[] models) {
*/
public void setExpanded(TreeEditPart editPart, boolean expanded) {
TreeEditPart parentEditPart = (TreeEditPart) editPart.getParent();
if (parentEditPart != null) {
TreeItem widget = (TreeItem) parentEditPart.getWidget();
if (parentEditPart != null && parentEditPart.getWidget() instanceof TreeItem widget) {
if (expanded) {
setExpanded(parentEditPart, expanded);
if (widget != null) {
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void performRequest(Request request) {

@Override
protected void refreshVisuals() {
getWidget().setText(m_name);
((TreeItem) getWidget()).setText(m_name);
}

@Override
Expand Down
Loading