From 28ad7f4d478cf009dd3fb3838082f7288cf38b74 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Wed, 28 Jan 2026 20:46:11 +0100 Subject: [PATCH] [GEF] Remove obsolete EditPartVisitor The `EditPartVisitor` is only used within the `MenuObjectEditPart` to refresh all other `MenuObjectEditPart`s. Rather than using a visitor, we can simply iterate over the edit-part registry. --- .../org/eclipse/wb/gef/core/EditPart.java | 19 ---------- .../wb/internal/gef/core/EditPartVisitor.java | 36 ------------------- .../gef/part/menu/MenuObjectEditPart.java | 14 +++----- 3 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditPartVisitor.java diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java index 77f21cffe..8da5ecc7d 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.gef.core; -import org.eclipse.wb.internal.gef.core.EditPartVisitor; - import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; @@ -68,23 +66,6 @@ protected List getModelChildren() { return Collections.EMPTY_LIST; } - //////////////////////////////////////////////////////////////////////////// - // - // Visiting - // - //////////////////////////////////////////////////////////////////////////// - /** - * Visits this {@link EditPart} and its children using given {@link EditPartVisitor}. - */ - public final void accept(EditPartVisitor visitor) { - if (visitor.visit(this)) { - for (EditPart childPart : (List) getChildren()) { - childPart.accept(visitor); - } - visitor.endVisit(this); - } - } - //////////////////////////////////////////////////////////////////////////// // // EditPart diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditPartVisitor.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditPartVisitor.java deleted file mode 100644 index ecc253bfc..000000000 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditPartVisitor.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * 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 - * https://www.eclipse.org/legal/epl-2.0. - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Google, Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.wb.internal.gef.core; - -import org.eclipse.gef.EditPart; - -/** - * Visitor for visiting {@link EditPart} hierarchy. - * - * @author lobas_av - * @coverage gef.core - */ -public class EditPartVisitor { - /** - * This method is invoked to check if given {@link EditPart} and its children should be visited. - */ - public boolean visit(EditPart editPart) { - return true; - } - - /** - * This method is invoked when all children of given {@link EditPart} were visited. - */ - public void endVisit(EditPart editPart) { - } -} \ No newline at end of file diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java index 052abbecc..8e85e55e2 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuObjectEditPart.java @@ -20,7 +20,6 @@ import org.eclipse.wb.internal.core.model.menu.IMenuObjectInfo; import org.eclipse.wb.internal.core.model.menu.IMenuObjectListener; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; -import org.eclipse.wb.internal.gef.core.EditPartVisitor; import org.eclipse.wb.internal.gef.core.IActiveToolListener; import org.eclipse.gef.EditPart; @@ -206,16 +205,11 @@ public EditPart getTargetEditPart(org.eclipse.gef.Request request) { public void run() { try { MenuObjectInfoUtils.m_selectingObject = m_object; - ((org.eclipse.wb.gef.core.EditPart)getViewer().getRootEditPart()).accept(new EditPartVisitor() { - @Override - public boolean visit(EditPart editPart) { - if (editPart instanceof MenuObjectEditPart) { - editPart.refresh(); - return false; - } - return true; + for (EditPart editPart : getViewer().getEditPartRegistry().values()) { + if (editPart instanceof MenuObjectEditPart) { + editPart.refresh(); } - }); + } } finally { MenuObjectInfoUtils.m_selectingObject = null; }