[GEF] Remove deprecated TreeEditPart

With this our "Design" and "Root" tree edit-part now extends the
`AbstractTreeEditPart` directly. Note that refresh doesn't recursively
refresh its children, unlike our edit-parts.

Author: ptziegler

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/DesignTreeEditPart.java

@@ -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;
@@ -28,8 +31,7 @@
  *
  * @see {@link RequestProcessor}
  */
-@SuppressWarnings("removal")
-public abstract class DesignTreeEditPart extends TreeEditPart {
+public abstract class DesignTreeEditPart extends AbstractTreeEditPart {
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -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);
+	}
+
 }

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java

@@ -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;
@@ -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();
 	}
 }

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/RootEditPart.java

@@ -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;
@@ -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;
@@ -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;
@@ -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);
 		}
 	}
 

org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java

@@ -255,7 +255,7 @@ public void performRequest(Request request) {
 
 		@Override
 		protected void refreshVisuals() {
-			getWidget().setText(m_name);
+			((TreeItem) getWidget()).setText(m_name);
 		}
 
 		@Override