From 992c56d03d3224e1ba2b507e01bcf9e14dffd3a1 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Mon, 26 Jan 2026 21:15:18 +0100 Subject: [PATCH] [GEF] Use EditPartViewer where possible The IEditPartViewer and the EditPartViewer interfaces have been aligned close enough so that in several places, we can work directly on the GEF interface. --- .../core/editor/DesignContextMenuProvider.java | 6 +++--- .../core/editor/JavaDesignToolbarHelper.java | 8 ++++---- .../core/editor/actions/DesignPageActions.java | 3 +-- .../wb/gef/core/tools/CreationTool.java | 4 ++-- .../wb/gef/core/tools/DragEditPartTracker.java | 4 ++-- .../eclipse/wb/gef/core/tools/PasteTool.java | 4 ++-- .../gef/core/tools/SelectEditPartTracker.java | 5 ++--- .../wb/gef/core/tools/TargetingTool.java | 7 +++---- .../wb/gef/core/tools/ToolUtilities.java | 7 +++---- .../graphical/tools/MarqueeSelectionTool.java | 4 ++-- .../wb/gef/graphical/tools/SelectionTool.java | 5 ++--- .../internal/gef/core/ContextMenuProvider.java | 9 ++++----- .../MultiSelectionContextMenuProvider.java | 6 +++--- .../gef/graphical/EditEventManager.java | 6 +++--- .../wb/internal/gef/tree/TreeEventManager.java | 6 +++--- .../gef/tree/dnd/TreeDropListener.java | 8 ++++---- .../header/AbstractHeaderLayoutEditPolicy.java | 12 ++++++------ .../AbstractHeaderSelectionEditPolicy.java | 12 ++++++------ .../wb/core/gef/policy/PolicyUtils.java | 5 ++--- .../layout/generic/AbstractPopupFigure.java | 8 ++++---- .../core/editor/DesignToolbarHelper.java | 10 +++++----- .../structure/DesignComponentsComposite.java | 6 +++--- .../components/ComponentsTreePage.java | 18 +++++++++--------- .../gef/header/HeadersContextMenuProvider.java | 6 +++--- .../KeyboardMovingLayoutEditPolicy.java | 8 ++++---- .../utils/gef/EditPartsContentProvider.java | 4 +--- .../utils/gef/EditPartsSelectionProvider.java | 4 +--- .../grid/TableWrapSelectionEditPolicy.java | 6 +++--- .../header/actions/DimensionHeaderAction.java | 6 +++--- .../layout/StackLayoutSelectionEditPolicy.java | 6 +++--- .../gef/FormSelectionEditPolicy.java | 6 +++--- .../header/actions/DimensionHeaderAction.java | 6 +++--- .../MigLayout/gef/MigSelectionEditPolicy.java | 6 +++--- .../header/actions/DimensionHeaderAction.java | 6 +++--- .../layout/CardLayoutSelectionEditPolicy.java | 6 +++--- .../layout/gbl/GridBagSelectionEditPolicy.java | 6 +++--- .../header/actions/DimensionHeaderAction.java | 6 +++--- .../form/FormSelectionEditPolicyClassic.java | 4 ++-- .../layout/grid/GridSelectionEditPolicy.java | 6 +++--- .../header/actions/DimensionHeaderAction.java | 6 +++--- 40 files changed, 125 insertions(+), 136 deletions(-) diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/DesignContextMenuProvider.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/DesignContextMenuProvider.java index e1d5c1801..a8de9612b 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/DesignContextMenuProvider.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/DesignContextMenuProvider.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 @@ -16,7 +16,6 @@ import org.eclipse.wb.core.editor.IContextMenuConstants; import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.editor.actions.DesignPageActions; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.execution.RunnableEx; @@ -25,6 +24,7 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; @@ -72,7 +72,7 @@ public static void addGroups(IMenuManager manager) { // Constructor // //////////////////////////////////////////////////////////////////////////// - public DesignContextMenuProvider(IEditPartViewer viewer, DesignPageActions pageActions) { + public DesignContextMenuProvider(EditPartViewer viewer, DesignPageActions pageActions) { super(viewer); m_pageActions = pageActions; } diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/JavaDesignToolbarHelper.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/JavaDesignToolbarHelper.java index 1c704f08a..24a125088 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/JavaDesignToolbarHelper.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/JavaDesignToolbarHelper.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 @@ -14,10 +14,10 @@ import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.editor.actions.DesignPageActions; import org.eclipse.wb.internal.core.nls.ExternalizeStringsContributionItem; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.swt.widgets.ToolBar; @@ -48,9 +48,9 @@ public JavaDesignToolbarHelper(ToolBar toolBar) { // //////////////////////////////////////////////////////////////////////////// /** - * Initializes with {@link DesignPageActions} and {@link IEditPartViewer}. + * Initializes with {@link DesignPageActions} and {@link EditPartViewer}. */ - public void initialize(DesignPageActions pageActions, IEditPartViewer viewer) { + public void initialize(DesignPageActions pageActions, EditPartViewer viewer) { super.initialize(viewer); m_pageActions = pageActions; } diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/actions/DesignPageActions.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/actions/DesignPageActions.java index 635d664c9..23736d4c4 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/actions/DesignPageActions.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/actions/DesignPageActions.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.core.editor.actions; import org.eclipse.wb.core.model.JavaInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.editor.DesignPage; import org.eclipse.wb.internal.core.editor.actions.assistant.LayoutAssistantAction; import org.eclipse.wb.internal.core.editor.actions.errors.ErrorsAction; @@ -60,7 +59,7 @@ public final class DesignPageActions { * Initializes new {@link DesignPageActions}. * * @param viewer - * the {@link IEditPartViewer} of {@link DesignPage}. + * the {@link EditPartViewer} of {@link DesignPage}. * @param actionBars * the editor site {@link IActionBars}. */ diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java index ddc2b60ff..981f3da97 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/CreationTool.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.core.requests.ICreationFactory; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; /** @@ -85,7 +85,7 @@ protected void selectAddedObjects() { CreateRequest request = (CreateRequest) getTargetRequest(); Object model = request.getSelectObject(); if (model != null) { - IEditPartViewer viewer = getCurrentViewer(); + EditPartViewer viewer = getCurrentViewer(); if (viewer != null) { EditPart editPart = viewer.getEditPartRegistry().get(model); if (editPart != null) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java index ee4b2e8b2..dd8e7dda1 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.DragPermissionRequest; import org.eclipse.wb.gef.graphical.GraphicalEditPart; @@ -22,6 +21,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPartViewer.Conditional; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -255,7 +255,7 @@ private List getOperationSetModels() { */ private void restoreSelectionFromModels(List models) { if (models != null) { - IEditPartViewer viewer = getCurrentViewer(); + EditPartViewer viewer = getCurrentViewer(); // prepare new EditPart's List newEditParts = new ArrayList<>(); for (Object model : models) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/PasteTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/PasteTool.java index 8f3f9028e..2f1c502c9 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/PasteTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/PasteTool.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.PasteRequest; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.jface.viewers.StructuredSelection; @@ -68,7 +68,7 @@ protected Request createTargetRequest() { @Override protected void selectAddedObjects() { - final IEditPartViewer viewer = getCurrentViewer(); + final EditPartViewer viewer = getCurrentViewer(); // prepare pasted EditPart's List editParts = new ArrayList<>(); { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/SelectEditPartTracker.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/SelectEditPartTracker.java index d305942bd..6fa4fcfce 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/SelectEditPartTracker.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/SelectEditPartTracker.java @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; - import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.swt.SWT; @@ -133,7 +132,7 @@ protected boolean handleDoubleClick(int button) { private void performSelection() { if (!m_isSelected) { m_isSelected = true; - IEditPartViewer viewer = getCurrentViewer(); + EditPartViewer viewer = getCurrentViewer(); // if ((m_stateMask & SWT.CONTROL) != 0) { if (viewer.getSelectedEditParts().contains(m_sourceEditPart)) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/TargetingTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/TargetingTool.java index afbc2ee38..ec9c84e69 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/TargetingTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/TargetingTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -12,10 +12,9 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; - import org.eclipse.draw2d.IFigure; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPartViewer.Conditional; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; @@ -27,7 +26,7 @@ * The base implementation for tools which perform targeting of editparts. Targeting tools may * operate using either mouse drags or just mouse moves. Targeting tools work with a target * request. This request is used along with the mouse location to obtain an active target from the - * current {@link IEditPartViewer}. This target is then asked for the {@link Command} + * current {@link EditPartViewer}. This target is then asked for the {@link Command} * that performs the given request. The target is also asked to show target feedback. * * @author lobas_av diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ToolUtilities.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ToolUtilities.java index 418f1f6e0..271b9dde6 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ToolUtilities.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ToolUtilities.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 @@ -12,9 +12,8 @@ *******************************************************************************/ package org.eclipse.wb.gef.core.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; - import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import java.util.ArrayList; import java.util.Collections; @@ -31,7 +30,7 @@ public class ToolUtilities { * Returns a list containing the top level selected {@link EditPart}'s based on the viewer's * selection. If selection parents of edit parts is differed returns empty list. */ - public static List getSelectionWithoutDependants(IEditPartViewer viewer) { + public static List getSelectionWithoutDependants(EditPartViewer viewer) { List operationSet = new ArrayList<>(); // add selected EditPart's only if their parent is not added yet { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/MarqueeSelectionTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/MarqueeSelectionTool.java index 3df8c52bb..191c80cbb 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/MarqueeSelectionTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/MarqueeSelectionTool.java @@ -14,7 +14,6 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.gef.graphical.GraphicalEditPart; @@ -24,6 +23,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.LayerConstants; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -164,7 +164,7 @@ protected boolean handleDragInProgress() { * the selection and select the new group */ private void performMarqueeSelect() { - IEditPartViewer viewer = getCurrentViewer(); + EditPartViewer viewer = getCurrentViewer(); List newSelections = calculateNewSelection(); // if (m_selectionMode == APPEND_MODE) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/SelectionTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/SelectionTool.java index 14fd17ba4..ca0a352ad 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/SelectionTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/SelectionTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.gef.graphical.tools; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.core.tools.TargetingTool; import org.eclipse.wb.gef.core.tools.Tool; @@ -56,7 +55,7 @@ public class SelectionTool extends TargetingTool { * Sets the drag tracker {@link Tool} for this {@link SelectionTool}. If the current drag tracker * is not null, this method deactivates it. If the new drag tracker is not * null, this method will activate it and set the {@link EditDomain} and - * {@link IEditPartViewer}. + * {@link EditPartViewer}. */ public void setDragTracker(DragTracker dragTracker) { if (m_dragTracker != dragTracker) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/ContextMenuProvider.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/ContextMenuProvider.java index 3a01632a0..802eb6bc2 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/ContextMenuProvider.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/ContextMenuProvider.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 @@ -12,8 +12,7 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.core; -import org.eclipse.wb.gef.core.IEditPartViewer; - +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; @@ -26,14 +25,14 @@ * @coverage gef.core */ public abstract class ContextMenuProvider extends MenuManager { - protected final IEditPartViewer m_viewer; + protected final EditPartViewer m_viewer; //////////////////////////////////////////////////////////////////////////// // // Constructor // //////////////////////////////////////////////////////////////////////////// - public ContextMenuProvider(IEditPartViewer viewer) { + public ContextMenuProvider(EditPartViewer viewer) { m_viewer = viewer; setRemoveAllWhenShown(true); addMenuListener(new IMenuListener() { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/MultiSelectionContextMenuProvider.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/MultiSelectionContextMenuProvider.java index 43e05ab93..2e226449a 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/MultiSelectionContextMenuProvider.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/MultiSelectionContextMenuProvider.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 @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.core; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.utils.ui.MenuIntersector; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; @@ -34,7 +34,7 @@ public abstract class MultiSelectionContextMenuProvider extends ContextMenuProvi // Constructor // //////////////////////////////////////////////////////////////////////////// - public MultiSelectionContextMenuProvider(IEditPartViewer viewer) { + public MultiSelectionContextMenuProvider(EditPartViewer viewer) { super(viewer); } diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/EditEventManager.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/EditEventManager.java index dbbddccc4..88bba234d 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/EditEventManager.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/EditEventManager.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.graphical; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.draw2d.EventManager; import org.eclipse.wb.internal.draw2d.FigureCanvas; import org.eclipse.gef.EditDomain; +import org.eclipse.gef.EditPartViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.MouseEvent; @@ -30,7 +30,7 @@ */ public class EditEventManager extends EventManager { private final EditDomain m_domain; - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; private boolean m_eventCapture; private Cursor m_overrideCursor; private MouseEvent m_currentMouseEvent; @@ -40,7 +40,7 @@ public class EditEventManager extends EventManager { // Constructor // //////////////////////////////////////////////////////////////////////////// - public EditEventManager(FigureCanvas canvas, EditDomain domain, IEditPartViewer viewer) { + public EditEventManager(FigureCanvas canvas, EditDomain domain, EditPartViewer viewer) { super(canvas); m_domain = domain; m_viewer = viewer; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java index 61ed6b154..c16b0a058 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.tree; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.gef.tree.dnd.TreeDropListener; import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer; import org.eclipse.gef.EditDomain; +import org.eclipse.gef.EditPartViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSource; @@ -40,7 +40,7 @@ final class TreeEventManager MouseMoveListener, MouseTrackListener { private final Tree m_tree; - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; private EditDomain m_domain; final TreeDropListener m_dropListener; @@ -49,7 +49,7 @@ final class TreeEventManager // Constructor // //////////////////////////////////////////////////////////////////////////// - public TreeEventManager(Tree tree, IEditPartViewer viewer) { + public TreeEventManager(Tree tree, EditPartViewer viewer) { m_tree = tree; m_viewer = viewer; // add listeners diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/dnd/TreeDropListener.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/dnd/TreeDropListener.java index 8237d2415..5fd2da607 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/dnd/TreeDropListener.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/dnd/TreeDropListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.tree.dnd; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPartViewer.Conditional; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -40,7 +40,7 @@ * @coverage gef.tree */ public class TreeDropListener implements DropTargetListener { - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; private DropTargetEvent m_currentEvent; private EditPart m_target; @@ -49,7 +49,7 @@ public class TreeDropListener implements DropTargetListener { // Constructor // //////////////////////////////////////////////////////////////////////////// - public TreeDropListener(IEditPartViewer viewer) { + public TreeDropListener(EditPartViewer viewer) { m_viewer = viewer; // add DND listener DropTarget target = new DropTarget(m_viewer.getControl(), DND.DROP_MOVE); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java index 1b2108c8f..3fac1d206 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -13,16 +13,16 @@ package org.eclipse.wb.core.gef.header; import org.eclipse.wb.draw2d.Layer; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.editparts.LayerManager; /** * Abstract implementation of {@link LayoutEditPolicy} for headers. It provides additional utilities - * for interacting with main {@link LayoutEditPolicy} and main {@link IEditPartViewer}. + * for interacting with main {@link LayoutEditPolicy} and main {@link EditPartViewer}. * * @author scheglov_ke * @coverage core.gef.header @@ -55,16 +55,16 @@ protected boolean isRequestCondition(Request request) { // //////////////////////////////////////////////////////////////////////////// /** - * @return the {@link Layer} from main {@link IEditPartViewer} with given id. + * @return the {@link Layer} from main {@link EditPartViewer} with given id. */ protected final Layer getMainLayer(String layerId) { return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); } /** - * @return the main {@link IEditPartViewer}. + * @return the main {@link EditPartViewer}. */ - private IEditPartViewer getMainViewer() { + private EditPartViewer getMainViewer() { return m_mainPolicy.getHost().getViewer(); } } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java index bcaaa377e..d1e1b24cd 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/AbstractHeaderSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -13,15 +13,15 @@ package org.eclipse.wb.core.gef.header; import org.eclipse.wb.draw2d.Layer; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.editparts.LayerManager; /** * Abstract implementation of {@link SelectionEditPolicy} for headers. It provides additional - * utilities for interacting with main {@link LayoutEditPolicy} and main {@link IEditPartViewer}. + * utilities for interacting with main {@link LayoutEditPolicy} and main {@link EditPartViewer}. * * @author scheglov_ke * @coverage core.gef.header @@ -44,16 +44,16 @@ public AbstractHeaderSelectionEditPolicy(LayoutEditPolicy mainPolicy) { // //////////////////////////////////////////////////////////////////////////// /** - * @return the {@link Layer} from main {@link IEditPartViewer} with given id. + * @return the {@link Layer} from main {@link EditPartViewer} with given id. */ protected final Layer getMainLayer(String layerId) { return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); } /** - * @return the main {@link IEditPartViewer}. + * @return the main {@link EditPartViewer}. */ - private IEditPartViewer getMainViewer() { + private EditPartViewer getMainViewer() { return m_mainPolicy.getHost().getViewer(); } } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java index bcba864ff..b4fb9dd6b 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java @@ -19,7 +19,6 @@ import org.eclipse.wb.draw2d.border.Border; import org.eclipse.wb.draw2d.border.CompoundBorder; import org.eclipse.wb.draw2d.border.LineBorder; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.policies.GraphicalEditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -308,7 +307,7 @@ private static void absoluteToModel_rightToLeft(Translatable t, IAbstractCompone * Schedules selection of {@link EditPart} with given model. * * @param host - * the {@link EditPolicy} to get {@link IEditPartViewer} to select in. + * the {@link EditPolicy} to get {@link EditPartViewer} to select in. */ public static void scheduleSelection(EditPolicy policy, Object model) { scheduleSelection(policy.getHost(), model); @@ -318,7 +317,7 @@ public static void scheduleSelection(EditPolicy policy, Object model) { * Schedules selection of {@link EditPart} with given model. * * @param host - * the {@link EditPart} to get {@link IEditPartViewer} to select in. + * the {@link EditPart} to get {@link EditPartViewer} to select in. */ public static void scheduleSelection(EditPart host, Object model) { scheduleSelection(host.getViewer(), model); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractPopupFigure.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractPopupFigure.java index 0885006c8..d1dbefbe0 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractPopupFigure.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/generic/AbstractPopupFigure.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -13,7 +13,6 @@ package org.eclipse.wb.core.gef.policy.layout.generic; import org.eclipse.wb.draw2d.Figure; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.utils.ui.DrawUtils; import org.eclipse.draw2d.ColorConstants; @@ -23,6 +22,7 @@ import org.eclipse.draw2d.MouseEvent; import org.eclipse.draw2d.MouseListener; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.resource.ImageDescriptor; @@ -45,7 +45,7 @@ public abstract class AbstractPopupFigure extends Figure { private static final Color COLOR_FOREGROUND = DrawUtils.getShiftedColor( ColorConstants.white, -64); - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; //////////////////////////////////////////////////////////////////////////// // @@ -60,7 +60,7 @@ public abstract class AbstractPopupFigure extends Figure { * @param height * the height of the image. */ - public AbstractPopupFigure(IEditPartViewer viewer, int width, int height) { + public AbstractPopupFigure(EditPartViewer viewer, int width, int height) { m_viewer = viewer; // configure figure setSize(width + MARGIN, height + MARGIN); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignToolbarHelper.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignToolbarHelper.java index d504f3724..90ada9f19 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignToolbarHelper.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/DesignToolbarHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -14,11 +14,11 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IContributionItem; @@ -45,7 +45,7 @@ */ public class DesignToolbarHelper { protected final ToolBarManager m_toolBarManager; - private IEditPartViewer m_viewer; + private EditPartViewer m_viewer; private ObjectInfo m_rootObject; //////////////////////////////////////////////////////////////////////////// @@ -77,9 +77,9 @@ public void widgetDisposed(DisposeEvent e) { // //////////////////////////////////////////////////////////////////////////// /** - * Initializes {@link IEditPartViewer}. + * Initializes {@link EditPartViewer}. */ - protected void initialize(IEditPartViewer viewer) { + protected void initialize(EditPartViewer viewer) { m_viewer = viewer; } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/DesignComponentsComposite.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/DesignComponentsComposite.java index 98083ed26..8afeac9a5 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/DesignComponentsComposite.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/DesignComponentsComposite.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 @@ -14,13 +14,13 @@ import org.eclipse.wb.core.controls.SelfOrientingSashForm; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.editor.Messages; import org.eclipse.wb.internal.core.editor.structure.components.ComponentsTreePage; import org.eclipse.wb.internal.core.editor.structure.property.ComponentsPropertiesPage; import org.eclipse.wb.internal.gef.tree.TreeViewer; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -88,7 +88,7 @@ public TreeViewer getTreeViewer() { /** * Sets information about editor. */ - public void setInput(IEditPartViewer editPartViewer, ObjectInfo rootObject) { + public void setInput(EditPartViewer editPartViewer, ObjectInfo rootObject) { m_treePage.setInput(editPartViewer, rootObject); } } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/components/ComponentsTreePage.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/components/ComponentsTreePage.java index 7097428eb..b0ae631dc 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/components/ComponentsTreePage.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/editor/structure/components/ComponentsTreePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -15,7 +15,6 @@ import org.eclipse.wb.core.editor.IDesignPageSite; import org.eclipse.wb.core.model.HasSourcePosition; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.editor.DesignPageSite; import org.eclipse.wb.internal.core.editor.Messages; @@ -29,6 +28,7 @@ import org.eclipse.wb.internal.gef.tree.TreeViewer; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IToolBarManager; @@ -51,7 +51,7 @@ */ public final class ComponentsTreePage implements IPage { private TreeViewer m_viewer; - private IEditPartViewer m_graphicalViewer; + private EditPartViewer m_graphicalViewer; private ObjectInfo m_rootObject; //////////////////////////////////////////////////////////////////////////// @@ -182,18 +182,18 @@ private void selectGraphicalViewer() { } /** - * Sets selection in given {@link IEditPartViewer} using {@link List} of selected {@link EditPart} + * Sets selection in given {@link EditPartViewer} using {@link List} of selected {@link EditPart} * 's. * * @param targetViewer - * the {@link IEditPartViewer} to set selection. + * the {@link EditPartViewer} to set selection. * @param selectionListener * the {@link ISelectionChangedListener} that should be temporary removed from - * {@link IEditPartViewer} to avoid recursive selection even handling. + * {@link EditPartViewer} to avoid recursive selection even handling. * @param sourceEditParts * the selected {@link EditPart}'s for which corresponding selection should be set. */ - private static void setSelection(IEditPartViewer targetViewer, + private static void setSelection(EditPartViewer targetViewer, ISelectionChangedListener selectionListener, List sourceEditParts) { // prepare EditPart's in target viewer @@ -249,10 +249,10 @@ public TreeViewer getTreeViewer() { } /** - * Sets the {@link IEditPartViewer} and root {@link ObjectInfo} that should be bound to components + * Sets the {@link EditPartViewer} and root {@link ObjectInfo} that should be bound to components * tree. */ - public void setInput(IEditPartViewer editPartViewer, ObjectInfo rootObject) { + public void setInput(EditPartViewer editPartViewer, ObjectInfo rootObject) { // set root m_rootObject = rootObject; // set EditPart viewer diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContextMenuProvider.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContextMenuProvider.java index 5c8d3ce9b..62945e191 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContextMenuProvider.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContextMenuProvider.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 @@ -13,11 +13,11 @@ package org.eclipse.wb.internal.core.gef.header; import org.eclipse.wb.core.gef.header.IHeaderMenuProvider; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.gef.core.ContextMenuProvider; import org.eclipse.wb.internal.gef.core.MultiSelectionContextMenuProvider; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; /** @@ -32,7 +32,7 @@ public final class HeadersContextMenuProvider extends MultiSelectionContextMenuP // Constructor // //////////////////////////////////////////////////////////////////////////// - public HeadersContextMenuProvider(IEditPartViewer viewer) { + public HeadersContextMenuProvider(EditPartViewer viewer) { super(viewer); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/KeyboardMovingLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/KeyboardMovingLayoutEditPolicy.java index 8c86641b6..222c7f3fd 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/KeyboardMovingLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/KeyboardMovingLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.command.CompoundEditCommand; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.core.tools.ToolUtilities; @@ -24,6 +23,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.swt.SWT; @@ -211,9 +211,9 @@ public void run() { // //////////////////////////////////////////////////////////////////////////// /** - * Convenience method for returning the {@link IEditPartViewer} for this host. + * Convenience method for returning the {@link EditPartViewer} for this host. */ - protected final IEditPartViewer getViewer() { + protected final EditPartViewer getViewer() { return getHost().getViewer(); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsContentProvider.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsContentProvider.java index ae5a0b5b4..f3ce0e11c 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsContentProvider.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsContentProvider.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.core.utils.gef; -import org.eclipse.wb.gef.core.IEditPartViewer; - import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -25,7 +23,7 @@ import java.util.List; /** - * Implementation of {@link ITreeContentProvider} for GEF {@link IEditPartViewer}. + * Implementation of {@link ITreeContentProvider} for GEF {@link EditPartViewer}. * * @author scheglov_ke * @coverage gef.core diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsSelectionProvider.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsSelectionProvider.java index 993565556..ce659928e 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsSelectionProvider.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/utils/gef/EditPartsSelectionProvider.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.core.utils.gef; -import org.eclipse.wb.gef.core.IEditPartViewer; - import org.eclipse.draw2d.EventListenerList; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; @@ -29,7 +27,7 @@ /** * Implementation of {@link ISelectionProvider} for models of {@link EditPart}'s in GEF - * {@link IEditPartViewer}. + * {@link EditPartViewer}. * * @author scheglov_ke * @coverage gef.core diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapSelectionEditPolicy.java index 8ef6c44f5..9947b2700 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -30,6 +29,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; @@ -116,7 +116,7 @@ protected void hideSelection() { @Override @SuppressWarnings("unchecked") protected IFigure createAlignmentFigure(IAbstractComponentInfo component, boolean horizontal) { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); try { final ITableWrapDataInfo layoutData = m_layout.getTableWrapData2((C) component); if (horizontal) { diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/actions/DimensionHeaderAction.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/actions/DimensionHeaderAction.java index ca030acb4..c4e0dd02a 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/actions/DimensionHeaderAction.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/actions/DimensionHeaderAction.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 @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.internal.rcp.gef.policy.forms.layout.grid.header.actions; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.rcp.gef.policy.forms.layout.grid.header.edit.DimensionHeaderEditPart; import org.eclipse.wb.internal.rcp.model.forms.layout.table.TableWrapDimensionInfo; import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; @@ -31,7 +31,7 @@ * @coverage rcp.gef.policy */ public abstract class DimensionHeaderAction extends ObjectInfoAction { - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java index 769e263d2..7aad85faf 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/layout/StackLayoutSelectionEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.rcp.gef.policy.layout; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; import org.eclipse.wb.gef.graphical.handles.ResizeHandle; @@ -27,6 +26,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import java.util.ArrayList; import java.util.List; @@ -120,7 +120,7 @@ protected void hideSelection() { * Sets show previous component relative of current. */ void showPrevComponent() { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); // show previous component C component = m_layout.getPrevControl(); m_layout.show(component); @@ -133,7 +133,7 @@ void showPrevComponent() { * Sets show next component relative of current. */ void showNextComponent() { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); // show next component C component = m_layout.getNextControl(); m_layout.show(component); diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormSelectionEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormSelectionEditPolicy.java index 91d8d630f..ad1f9cf24 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormSelectionEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -30,6 +29,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; @@ -113,7 +113,7 @@ protected void hideSelection() { @Override protected IFigure createAlignmentFigure(IAbstractComponentInfo component, boolean horizontal) { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); final CellConstraintsSupport constraints = FormLayoutInfo.getConstraints((ComponentInfo) component); if (horizontal) { diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/actions/DimensionHeaderAction.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/actions/DimensionHeaderAction.java index f1cb9cb2e..553d4b308 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/actions/DimensionHeaderAction.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/actions/DimensionHeaderAction.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 @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.FormLayout.gef.header.actions; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.swing.FormLayout.gef.header.edit.DimensionHeaderEditPart; import org.eclipse.wb.internal.swing.FormLayout.model.FormDimensionInfo; import org.eclipse.wb.internal.swing.FormLayout.model.FormLayoutInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; @@ -31,7 +31,7 @@ * @coverage swing.FormLayout.header */ public abstract class DimensionHeaderAction extends ObjectInfoAction { - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; private final FormLayoutInfo m_layout; //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigSelectionEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigSelectionEditPolicy.java index 524428a26..08f0789f0 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigSelectionEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -32,6 +31,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; @@ -112,7 +112,7 @@ protected void hideSelection() { @Override protected IFigure createAlignmentFigure(IAbstractComponentInfo component, boolean horizontal) { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); final CellConstraintsSupport constraints = MigLayoutInfo.getConstraints((ComponentInfo) component); if (horizontal) { diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/actions/DimensionHeaderAction.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/actions/DimensionHeaderAction.java index c6ca129b5..18b29f215 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/actions/DimensionHeaderAction.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/actions/DimensionHeaderAction.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 @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.MigLayout.gef.header.actions; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.swing.MigLayout.gef.header.edit.ColumnHeaderEditPart; import org.eclipse.wb.internal.swing.MigLayout.gef.header.edit.DimensionHeaderEditPart; @@ -20,6 +19,7 @@ import org.eclipse.wb.internal.swing.MigLayout.model.MigLayoutInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; @@ -33,7 +33,7 @@ */ public abstract class DimensionHeaderAction extends ObjectInfoAction { private final boolean m_horizontal; - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; private final MigLayoutInfo m_layout; //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java index c5813f98c..0868eba42 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutSelectionEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swing.gef.policy.layout; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; import org.eclipse.wb.gef.graphical.handles.ResizeHandle; @@ -27,6 +26,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; @@ -119,7 +119,7 @@ protected void hideSelection() { * Sets show previous component relative of current. */ public void showPrevComponent() { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); // show previous component ComponentInfo component = m_layout.getPrevComponent(); m_layout.show(component); @@ -132,7 +132,7 @@ public void showPrevComponent() { * Sets show next component relative of current. */ public void showNextComponent() { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); // show next component ComponentInfo component = m_layout.getNextComponent(); m_layout.show(component); diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagSelectionEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagSelectionEditPolicy.java index 0724cc63a..b21345aab 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagSelectionEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -18,7 +18,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; @@ -115,7 +115,7 @@ protected void hideSelection() { @Override protected IFigure createAlignmentFigure(IAbstractComponentInfo component, boolean horizontal) { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); final AbstractGridBagConstraintsInfo constraints = m_layout.getConstraints(m_component); if (horizontal) { return new AbstractPopupFigure(viewer, 9, 5) { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/actions/DimensionHeaderAction.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/actions/DimensionHeaderAction.java index 1799b605d..b330de59d 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/actions/DimensionHeaderAction.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/actions/DimensionHeaderAction.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 @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.gef.policy.layout.gbl.header.actions; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.swing.gef.policy.layout.gbl.header.edit.DimensionHeaderEditPart; import org.eclipse.wb.internal.swing.model.layout.gbl.DimensionInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; @@ -30,7 +30,7 @@ * @coverage swing.gef.policy */ public abstract class DimensionHeaderAction extends ObjectInfoAction { - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; //////////////////////////////////////////////////////////////////////////// // diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java index 2faa90c00..01446c3b9 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormSelectionEditPolicyClassic.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Polyline; import org.eclipse.wb.draw2d.border.LineBorder; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.handles.Handle; @@ -56,6 +55,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; @@ -1035,7 +1035,7 @@ private void addSideLinesForControlAttachment(Rectangle b, IFormAttachmentInfo attachment, boolean vertical) { C alignControl = attachment.getControl(); - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); GraphicalEditPart bindPart = (GraphicalEditPart) viewer.getEditPartRegistry().get(alignControl); if (bindPart == null) { return; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridSelectionEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridSelectionEditPolicy.java index 98fec3db5..b516c557c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridSelectionEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridSelectionEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 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 @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -30,6 +29,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; @@ -119,7 +119,7 @@ protected void hideSelection() { @Override @SuppressWarnings("unchecked") protected IFigure createAlignmentFigure(IAbstractComponentInfo component, boolean horizontal) { - IEditPartViewer viewer = getHost().getViewer(); + EditPartViewer viewer = getHost().getViewer(); try { final IGridDataInfo constraints = m_layout.getGridData2((C) component); if (horizontal) { diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/actions/DimensionHeaderAction.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/actions/DimensionHeaderAction.java index 740b95c57..1af6174aa 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/actions/DimensionHeaderAction.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/actions/DimensionHeaderAction.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 @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.internal.swt.gef.policy.layout.grid.header.actions; -import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.internal.core.model.util.ObjectInfoAction; import org.eclipse.wb.internal.swt.gef.policy.layout.grid.header.edit.DimensionHeaderEditPart; import org.eclipse.wb.internal.swt.model.layout.grid.GridDimensionInfo; import org.eclipse.wb.internal.swt.model.widgets.IControlInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.resource.ImageDescriptor; import java.util.ArrayList; @@ -31,7 +31,7 @@ * @coverage swt.gef.GridLayout */ public abstract class DimensionHeaderAction extends ObjectInfoAction { - private final IEditPartViewer m_viewer; + private final EditPartViewer m_viewer; //////////////////////////////////////////////////////////////////////////// //