diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartViewer.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartViewer.java index 88638c38d..55ad4e032 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartViewer.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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,7 @@ *******************************************************************************/ package org.eclipse.wb.gef.core; -import org.eclipse.wb.draw2d.Figure; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.handles.Handle; -import org.eclipse.wb.internal.draw2d.IRootFigure; import org.eclipse.wb.internal.gef.core.EditDomain; import org.eclipse.draw2d.geometry.Point; @@ -112,16 +109,6 @@ public interface IEditPartViewer extends ISelectionProvider, org.eclipse.gef.Edi */ int getVOffset(); - /** - * Returns root {@link Figure} use for access to {@link Layer}'s. - */ - IRootFigure getRootFigure(); - - /** - * Returns the layer identified by the name given in the input. - */ - Layer getLayer(String name); - /** * Returns the {@link EditDomain EditDomain} to which this viewer belongs. */ diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/GraphicalEditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/GraphicalEditPart.java index e00227f76..1c8c65719 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/GraphicalEditPart.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/GraphicalEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2025 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,6 +17,7 @@ import org.eclipse.wb.gef.core.tools.DragEditPartTracker; import org.eclipse.wb.gef.core.tools.Tool; +import org.eclipse.draw2d.IFigure; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; @@ -44,9 +45,9 @@ public Figure getFigure() { } /** - * The {@link Figure} into which childrens' {@link Figure}s will be added. + * The {@link IFigure} into which childrens' {@link IFigure}s will be added. */ - public Figure getContentPane() { + public IFigure getContentPane() { return getFigure(); } diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java index 2c90d0a16..c2f3f74b0 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -20,6 +20,7 @@ import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.draw2d.IFigure; +import org.eclipse.gef.editparts.LayerManager; /** * @author lobas_av @@ -70,7 +71,7 @@ protected final Layer getLayer(String name) { name = IEditPartViewer.MENU_FEEDBACK_LAYER; } } - return getHost().getViewer().getLayer(name); + return (Layer) LayerManager.Helper.find(getHost()).getLayer(name); } /** @@ -100,7 +101,7 @@ protected final void removeFeedback(Figure figure) { * {@link IEditPartViewer#MENU_PRIMARY_LAYER}. */ private boolean isOnMenuLayer() { - Layer menuPrimaryLayer = getHost().getViewer().getLayer(IEditPartViewer.MENU_PRIMARY_LAYER); + Layer menuPrimaryLayer = (Layer) LayerManager.Helper.find(getHost()).getLayer(IEditPartViewer.MENU_PRIMARY_LAYER); for (IFigure figure = getHostFigure(); figure != null; figure = figure.getParent()) { if (figure == menuPrimaryLayer) { return true; 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 33cf7b2c7..63bd9075d 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -21,10 +21,12 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Cursors; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Cursor; @@ -276,8 +278,8 @@ private void eraseMarqueeFeedback() { /** * Returns feedback layer. */ - private Figure getFeedbackPane() { - return getCurrentViewer().getLayer(IEditPartViewer.FEEDBACK_LAYER); + private IFigure getFeedbackPane() { + return LayerManager.Helper.find(getCurrentViewer()).getLayer(IEditPartViewer.FEEDBACK_LAYER); } /** diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java index 0ca7908ad..3bbf39161 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java @@ -111,7 +111,6 @@ public RootEditPart getRootEditPart() { /** * Returns root {@link Figure} use for access to {@link Layer}'s. */ - @Override public final IRootFigure getRootFigure() { return getRootFigureInternal(); } @@ -123,14 +122,6 @@ protected final RootFigure getRootFigureInternal() { return m_canvas.getRootFigure(); } - /** - * Returns the layer identified by the name given in the input. - */ - @Override - public Layer getLayer(String name) { - return getRootFigure().getLayer(name); - } - /** * Sets the {@link EditDomain} for this viewer. The Viewer will route all mouse and * keyboard events to the {@link EditDomain}. @@ -199,7 +190,7 @@ protected boolean acceptResult(Figure figure) { return editPart != null && (conditional == null || conditional.evaluate(editPart)); } }; - getLayer(layer).accept(visitor, false); + ((Layer) m_rootEditPart.getLayer(layer)).accept(visitor, false); return visitor.getTargetEditPart(); } @@ -240,7 +231,7 @@ public Handle findTargetHandle(int x, int y) { */ private Handle findTargetHandle(String layer, int x, int y) { TargetFigureFindVisitor visitor = new TargetFigureFindVisitor(m_canvas, x, y); - getLayer(layer).accept(visitor, false); + ((Layer) m_rootEditPart.getLayer(layer)).accept(visitor, false); Figure targetFigure = visitor.getTargetFigure(); return targetFigure instanceof Handle ? (Handle) targetFigure : null; } diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeViewer.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeViewer.java index 109691708..62d88f1bd 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeViewer.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeViewer.java @@ -12,11 +12,9 @@ *******************************************************************************/ package org.eclipse.wb.internal.gef.tree; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.tree.TreeEditPart; import org.eclipse.wb.internal.core.utils.ui.UiUtils; -import org.eclipse.wb.internal.draw2d.IRootFigure; import org.eclipse.wb.internal.gef.core.AbstractEditPartViewer; import org.eclipse.wb.internal.gef.core.EditDomain; @@ -113,16 +111,6 @@ public RootEditPart getRootEditPart() { return m_rootEditPart; } - @Override - public IRootFigure getRootFigure() { - return null; - } - - @Override - public Layer getLayer(String name) { - return null; - } - /** * Sets the {@link EditDomain} for this viewer. The Viewer will route all mouse and * keyboard events to the {@link EditDomain}. 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 8e92ba88b..1b2108c8f 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, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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,6 +18,7 @@ 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 @@ -57,7 +58,7 @@ protected boolean isRequestCondition(Request request) { * @return the {@link Layer} from main {@link IEditPartViewer} with given id. */ protected final Layer getMainLayer(String layerId) { - return getMainViewer().getLayer(layerId); + return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); } /** 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 d94f872bb..bcaaa377e 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 Google, Inc. + * Copyright (c) 2011, 2025 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,6 +17,8 @@ import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; +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}. @@ -45,7 +47,7 @@ public AbstractHeaderSelectionEditPolicy(LayoutEditPolicy mainPolicy) { * @return the {@link Layer} from main {@link IEditPartViewer} with given id. */ protected final Layer getMainLayer(String layerId) { - return getMainViewer().getLayer(layerId); + return (Layer) LayerManager.Helper.find(getMainViewer()).getLayer(layerId); } /** 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 8211f9b3e..5f31ea5e9 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 @@ -34,6 +34,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; +import org.eclipse.gef.editparts.LayerManager; import java.lang.reflect.Method; import java.util.Objects; @@ -66,7 +67,7 @@ public static void showBorderTargetFeedback(final GraphicalEditPolicy policy) { * Shows border around given {@link GraphicalEditPart} figure. */ public static void showBorderTargetFeedback(GraphicalEditPart part) { - Layer feedbackLayer = part.getViewer().getLayer(IEditPartViewer.FEEDBACK_LAYER); + Layer feedbackLayer = (Layer) LayerManager.Helper.find(part.getViewer()).getLayer(IEditPartViewer.FEEDBACK_LAYER); showBorderTargetFeedback(feedbackLayer, part); } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java index 1304bb857..b3baea58e 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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 @@ -36,6 +36,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.swt.graphics.Color; import java.lang.reflect.Field; @@ -247,7 +248,7 @@ public final void showGridFeedback() { prepareHostClientArea(); translateModelToFeedback(hostClientArea); m_gridFigure.setBounds(hostClientArea); - getHost().getViewer().getLayer(IEditPartViewer.HANDLE_LAYER_SUB_2).add(m_gridFigure); + LayerManager.Helper.find(getHost()).getLayer(IEditPartViewer.HANDLE_LAYER_SUB_2).add(m_gridFigure); } /** diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java index 7e04d24c2..fc574492f 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -26,6 +26,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -103,7 +104,7 @@ protected void refreshVisuals() { // prepare viewer size org.eclipse.swt.graphics.Point size = viewer.getControl().getSize(); // prepare main viewer size - Dimension mainSize = m_viewer.getLayer(IEditPartViewer.PRIMARY_LAYER).getSize(); + Dimension mainSize = LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.PRIMARY_LAYER).getSize(); // set bounds if (m_horizontal) { getFigure().setBounds(new Rectangle(0, 0, mainSize.width, size.y)); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MacMenuEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MacMenuEditPart.java index c9af87cc0..a3d8c80dc 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MacMenuEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MacMenuEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 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 @@ -20,6 +20,7 @@ import org.eclipse.wb.internal.core.model.menu.IMenuInfo; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.editparts.LayerManager; /** * {@link MenuEditPart} for MacOSX which does special handling for OSX menu bar. @@ -65,7 +66,7 @@ protected void refreshVisuals() { @Override protected boolean addSelfVisual(int index) { if (!isSubMenu()) { - getViewer().getLayer(IEditPartViewer.PRIMARY_LAYER).add(getFigure()); + LayerManager.Helper.find(getViewer()).getLayer(IEditPartViewer.PRIMARY_LAYER).add(getFigure()); m_addedSelf = true; // add invisible fake figure to the content pane to keep index right GraphicalEditPart parent = (GraphicalEditPart) getParent(); @@ -77,7 +78,7 @@ protected boolean addSelfVisual(int index) { @Override protected boolean removeSelfVisual() { if (m_addedSelf) { - getViewer().getLayer(IEditPartViewer.PRIMARY_LAYER).remove(getFigure()); + LayerManager.Helper.find(getViewer()).getLayer(IEditPartViewer.PRIMARY_LAYER).remove(getFigure()); FigureUtils.removeFigure(getFakeFigure()); m_addedSelf = false; return true; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/SubmenuAwareEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/SubmenuAwareEditPart.java index 19664c631..2278a9b6d 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/SubmenuAwareEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/SubmenuAwareEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -21,9 +21,11 @@ import org.eclipse.wb.internal.core.model.menu.IMenuObjectInfo; import org.eclipse.wb.internal.core.model.menu.MenuObjectInfoUtils; +import org.eclipse.draw2d.IFigure; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.editparts.LayerManager; import java.util.Collections; import java.util.List; @@ -54,8 +56,8 @@ public SubmenuAwareEditPart(Object toolkitModel, IMenuObjectInfo menuModel) { // ///////////////////////////////////////////////////////////////////// @Override - public final Figure getContentPane() { - return getViewer().getLayer(IEditPartViewer.MENU_PRIMARY_LAYER); + public final IFigure getContentPane() { + return LayerManager.Helper.find(getViewer()).getLayer(IEditPartViewer.MENU_PRIMARY_LAYER); } @Override diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/TreeItemEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/TreeItemEditPart.java index b1edc8782..3561bc846 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/TreeItemEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/TreeItemEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2025 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,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.swt.gef.part; -import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.swt.model.widgets.TreeItemInfo; +import org.eclipse.draw2d.IFigure; + /** * {@link EditPart} for {@link TreeItemInfo}. * @@ -39,7 +40,7 @@ public TreeItemEditPart(TreeItemInfo item) { // //////////////////////////////////////////////////////////////////////////// @Override - public Figure getContentPane() { + public IFigure getContentPane() { EditPart parent = this; while (parent instanceof TreeItemEditPart) { parent = parent.getParent(); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java index 7b71f66fe..0055bb31e 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/AnchorFiguresClassic.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 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,6 +16,7 @@ import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils; import org.eclipse.wb.core.gef.policy.layout.generic.AbstractPopupFigure; import org.eclipse.wb.draw2d.Figure; +import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; @@ -27,6 +28,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; @@ -160,7 +162,7 @@ private void addAlignmentFigure(C component, Figure figure, boolean isLeading, boolean isHorisontal) { - Figure layer = m_policy.getHost().getViewer().getLayer(IEditPartViewer.CLICKABLE_LAYER); + Layer layer = (Layer) LayerManager.Helper.find(m_policy.getHost()).getLayer(IEditPartViewer.CLICKABLE_LAYER); // prepare rectangle for cells used by component (in layer coordinates) Rectangle widgetRect; { diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java index 7b5260f29..04e42fe8c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormHeaderLayoutEditPolicy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -38,6 +38,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -129,8 +130,8 @@ protected void showLayoutTargetFeedback(Request request) { if (percent > 0 && percent < 100) { { if (hintFeedback == null) { - Layer layer = - mainPolicy.getHost().getViewer().getLayer(IEditPartViewer.FEEDBACK_LAYER_ABV_1); + Layer layer = (Layer) LayerManager.Helper.find(mainPolicy.getHost()) + .getLayer(IEditPartViewer.FEEDBACK_LAYER_ABV_1); hintFeedback = new TextFeedback(layer, true); hintFeedback.add(); } @@ -139,7 +140,8 @@ protected void showLayoutTargetFeedback(Request request) { } { if (feedback == null) { - Layer layer = getHost().getViewer().getLayer(IEditPartViewer.FEEDBACK_LAYER_ABV_1); + Layer layer = (Layer) LayerManager.Helper.find(mainPolicy.getHost()) + .getLayer(IEditPartViewer.FEEDBACK_LAYER_ABV_1); feedback = new FormHeaderEditPart.PercentFigure(isHorizontal); layer.add(feedback); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EmptyEditPartViewer.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EmptyEditPartViewer.java index 3465eb564..ea186d49a 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EmptyEditPartViewer.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/EmptyEditPartViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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,9 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartFactory; import org.eclipse.wb.gef.core.IEditPartViewer; import org.eclipse.wb.gef.graphical.handles.Handle; -import org.eclipse.wb.internal.draw2d.IRootFigure; import org.eclipse.wb.internal.gef.core.AbstractEditPartViewer; import org.eclipse.wb.internal.gef.core.EditDomain; @@ -97,16 +95,6 @@ public IEditPartFactory getEditPartFactory() { return null; } - @Override - public Layer getLayer(String name) { - return null; - } - - @Override - public IRootFigure getRootFigure() { - return null; - } - @Override public List getSelectedEditParts() { return null; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java index 919fceabc..bb4b0cfd1 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GraphicalRobot.java @@ -34,6 +34,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Text; @@ -876,7 +877,7 @@ public boolean match(IFigure figure) { * @return the list of {@link IFigure}'s on feedback {@link Layer}. */ public List getFeedbackFigures() { - return m_viewer.getLayer(IEditPartViewer.FEEDBACK_LAYER).getChildren(); + return LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.FEEDBACK_LAYER).getChildren(); } /** @@ -952,7 +953,7 @@ public void assertFigures(String layerName, Predicate... predicates) { // prepare feedback's List feedbacks; { - Layer feedbackLayer = m_viewer.getLayer(layerName); + Layer feedbackLayer = (Layer) LayerManager.Helper.find(m_viewer).getLayer(layerName); feedbacks = feedbackLayer.getChildren(); assertEquals(feedbacks.size(), predicates.length, "Wrong count of feedbacks."); } diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java index 26865ddcb..f1928f705 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 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 @@ -21,6 +21,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.editparts.LayerManager; import org.eclipse.gef.requests.SelectionRequest; import org.junit.jupiter.api.BeforeEach; @@ -230,7 +231,7 @@ public void test_DragTracker_MoveHandle() throws Exception { addEditPart(editPart, "ChildEditPart", actualLogger, 50, 50, 70, 50); // MoveHandle handle = new MoveHandle(childEditPart); - m_viewer.getLayer(IEditPartViewer.HANDLE_LAYER).add(handle); + LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.HANDLE_LAYER).add(handle); // RequestsLogger expectedLogger = new RequestsLogger(); //