From 3289289a417c83aae34ae4b55cd292d30d8cb888 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Sun, 29 Jun 2025 11:02:04 +0200 Subject: [PATCH] [GEF] Use declaring class as qualifier for EditPolicy constants Most of the constants for an EditPolicy are declared by the GEF EditPolicy but accessed via the WindowBuilder EditPolicy. This is changed so that the declaring class is referenced directly. --- .../eclipse/wb/core/gef/part/AbstractComponentEditPart.java | 2 +- .../wb/core/gef/policy/DirectTextPropertyEditPolicy.java | 4 ++-- .../wb/internal/core/gef/GenericContainersConfigurator.java | 4 ++-- .../wb/internal/core/gef/part/AbstractWrapperEditPart.java | 4 ++-- .../wb/internal/core/gef/part/DesignRootEditPart.java | 2 +- .../core/gef/part/nonvisual/ArrayObjectEditPart.java | 4 ++-- .../core/gef/part/nonvisual/NonVisualBeanEditPart.java | 4 ++-- .../internal/core/gefTree/GenericContainersConfigurator.java | 4 ++-- .../wb/internal/core/gefTree/part/ArrayObjectEditPart.java | 5 +++-- .../src-gef/org/eclipse/wb/gef/core/RequestProcessor.java | 4 ++-- .../wb/gef/graphical/policies/SelectionEditPolicy.java | 4 ++-- .../src/org/eclipse/wb/core/gef/IEditPartConfigurator.java | 4 ++-- .../org/eclipse/wb/core/gef/part/ComponentIconEditPart.java | 4 ++-- .../src/org/eclipse/wb/core/gef/policy/PolicyUtils.java | 2 +- .../wb/core/gef/policy/layout/grid/AbstractGridHelper.java | 2 +- .../src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java | 2 +- .../eclipse/wb/internal/core/gef/part/menu/MenuEditPart.java | 4 ++-- .../layout/absolute/AbsoluteBasedSelectionEditPolicy.java | 2 +- .../policy/layout/generic/FlowContainerLayoutEditPolicy.java | 2 +- .../policy/layout/generic/SelectionEditPolicyInstaller.java | 2 +- .../wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java | 2 +- .../rcp/gef/part/rcp/perspective/EditorAreaEditPart.java | 4 ++-- .../gef/part/rcp/perspective/PageLayoutAddViewEditPart.java | 5 +++-- .../part/rcp/perspective/PageLayoutCreateFolderEditPart.java | 5 +++-- .../shortcuts/AbstractShortcutContainerEditPart.java | 4 ++-- .../wb/internal/rcp/gef/part/widgets/DialogEditPart.java | 2 +- .../policy/forms/layout/grid/TableWrapLayoutEditPolicy.java | 2 +- .../layout/grid/header/layout/ColumnsLayoutEditPolicy.java | 2 +- .../layout/grid/header/layout/RowsLayoutEditPolicy.java | 2 +- .../internal/swing/FormLayout/gef/FormLayoutEditPolicy.java | 2 +- .../gef/header/layout/ColumnsLayoutEditPolicy.java | 2 +- .../FormLayout/gef/header/layout/RowsLayoutEditPolicy.java | 2 +- .../MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java | 2 +- .../MigLayout/gef/header/layout/RowsLayoutEditPolicy.java | 2 +- .../wb/internal/swing/java6/gef/GroupLayoutEditPolicy.java | 2 +- .../wb/internal/swing/gef/part/JScrollPaneEditPart.java | 5 +++-- .../wb/internal/swing/gef/part/JSplitPaneEditPart.java | 5 +++-- .../wb/internal/swing/gef/part/JTabbedPaneEditPart.java | 5 +++-- .../wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java | 4 ++-- .../wb/internal/swing/gef/part/box/BoxGlueEditPart.java | 4 ++-- .../swing/gef/part/box/BoxGlueHorizontalEditPart.java | 4 ++-- .../internal/swing/gef/part/box/BoxGlueVerticalEditPart.java | 4 ++-- .../wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java | 4 ++-- .../swing/gef/part/box/BoxStrutHorizontalEditPart.java | 4 ++-- .../swing/gef/part/box/BoxStrutVerticalEditPart.java | 4 ++-- .../gef/policy/action/ActionDropPolicyConfigurator.java | 4 ++-- .../swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java | 2 +- .../swing/gef/policy/layout/CardLayoutEditPolicy.java | 4 ++-- .../swing/gef/policy/layout/GenericFlowLayoutEditPolicy.java | 2 +- .../swing/gef/policy/layout/SpringLayoutEditPolicy.java | 2 +- .../swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java | 2 +- .../layout/gbl/header/layout/ColumnsLayoutEditPolicy.java | 2 +- .../layout/gbl/header/layout/RowsLayoutEditPolicy.java | 2 +- .../swing/gef/policy/menu/MenuDropPolicyConfigurator.java | 4 ++-- .../wb/internal/swing/gefTree/part/ContainerEditPart.java | 5 +++-- .../swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java | 2 +- .../swt/gef/policy/layout/DefaultLayoutEditPolicy.java | 2 +- .../gef/policy/layout/form/FormHeaderLayoutEditPolicy.java | 2 +- .../swt/gef/policy/layout/form/FormLayoutEditPolicy.java | 2 +- .../swt/gef/policy/layout/form/FormLayoutEditPolicy2.java | 2 +- .../policy/layout/form/FormSelectionEditPolicyClassic.java | 2 +- .../swt/gef/policy/layout/grid/GridLayoutEditPolicy.java | 2 +- .../layout/grid/header/layout/ColumnsLayoutEditPolicy.java | 2 +- .../layout/grid/header/layout/RowsLayoutEditPolicy.java | 2 +- .../wb/internal/swt/gefTree/part/CompositeEditPart.java | 5 +++-- .../rcp/model/layout/form/gef/FormLayoutMoveTest.java | 4 ++-- .../tests/designer/swt/model/menu/MenuPopupSimpleTest.java | 2 +- .../src/org/eclipse/wb/tests/gef/GefCursorTestCase.java | 2 +- .../org/eclipse/wb/tests/gef/SelectionToolCursorTest.java | 4 ++-- .../src/org/eclipse/wb/tests/gef/TreeToolTest.java | 2 +- 70 files changed, 111 insertions(+), 103 deletions(-) diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/part/AbstractComponentEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/part/AbstractComponentEditPart.java index 057f5004a..3c5089662 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/part/AbstractComponentEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/part/AbstractComponentEditPart.java @@ -18,7 +18,6 @@ import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.broadcast.DisplayEventListener; import org.eclipse.wb.draw2d.Figure; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.DragPermissionRequest; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -36,6 +35,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.CompoundCommand; import org.eclipse.gef.requests.SelectionRequest; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/DirectTextPropertyEditPolicy.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/DirectTextPropertyEditPolicy.java index 8f900dd8d..ca834810d 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/DirectTextPropertyEditPolicy.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/DirectTextPropertyEditPolicy.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 @@ -16,7 +16,6 @@ import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.JavaInfo; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.KeyRequest; import org.eclipse.wb.gef.graphical.policies.DirectTextEditPolicy; import org.eclipse.wb.internal.core.model.JavaInfoUtils; @@ -32,6 +31,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java index 845a15795..903c78f31 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.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 @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.IEditPartConfigurator; import org.eclipse.wb.core.model.JavaInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.generic.FlowContainerLayoutEditPolicy; import org.eclipse.wb.internal.core.gef.policy.layout.generic.SimpleContainerLayoutEditPolicy; import org.eclipse.wb.internal.core.model.generic.FlowContainer; @@ -23,6 +22,7 @@ import org.eclipse.wb.internal.core.model.generic.SimpleContainerFactory; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import java.util.List; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/AbstractWrapperEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/AbstractWrapperEditPart.java index 66f402605..f54c75b8d 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/AbstractWrapperEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/AbstractWrapperEditPart.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 @@ -17,13 +17,13 @@ import org.eclipse.wb.core.model.IWrapperInfo; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java index 9de7f4fa8..b1c3308ff 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java @@ -18,7 +18,6 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.border.Border; import org.eclipse.wb.draw2d.border.MarginBorder; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.core.gef.part.nonvisual.NonVisualBeanEditPart; import org.eclipse.wb.internal.core.gef.policy.nonvisual.NonVisualLayoutEditPolicy; @@ -33,6 +32,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import java.util.List; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/ArrayObjectEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/ArrayObjectEditPart.java index b8076dea5..a0ae8ae82 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/ArrayObjectEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/ArrayObjectEditPart.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 @@ -15,10 +15,10 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.core.model.nonvisual.AbstractArrayObjectInfo; +import org.eclipse.gef.EditPolicy; /** * {@link EditPart} for array objects model. * diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/NonVisualBeanEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/NonVisualBeanEditPart.java index 4901cbfe0..07adcb75e 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/NonVisualBeanEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/NonVisualBeanEditPart.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 @@ -17,10 +17,10 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.core.model.nonvisual.NonVisualBeanInfo; +import org.eclipse.gef.EditPolicy; import org.eclipse.jface.resource.ImageDescriptor; /** diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java index 6b1731fcb..58071a879 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.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 @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.IEditPartConfigurator; import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.JavaInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.core.DesignerPlugin; import org.eclipse.wb.internal.core.gefTree.policy.generic.FlowContainerLayoutEditPolicy; import org.eclipse.wb.internal.core.gefTree.policy.generic.SimpleContainerLayoutEditPolicy; @@ -27,6 +26,7 @@ import org.eclipse.wb.internal.core.model.nonvisual.FlowContainerGroupInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.apache.commons.lang3.StringUtils; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/part/ArrayObjectEditPart.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/part/ArrayObjectEditPart.java index a6e203566..253399edb 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/part/ArrayObjectEditPart.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/part/ArrayObjectEditPart.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 @@ -13,11 +13,12 @@ package org.eclipse.wb.internal.core.gefTree.part; import org.eclipse.wb.core.gefTree.part.ObjectEditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.tree.TreeEditPart; import org.eclipse.wb.internal.core.gefTree.policy.ArrayObjectLayoutEditPolicy; import org.eclipse.wb.internal.core.model.nonvisual.AbstractArrayObjectInfo; +import org.eclipse.gef.EditPolicy; + /** * {@link TreeEditPart} for {@link AbstractArrayObjectInfo}. * diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/RequestProcessor.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/RequestProcessor.java index d6eb98464..7dacc6684 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/RequestProcessor.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/RequestProcessor.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,9 +12,9 @@ *******************************************************************************/ package org.eclipse.wb.gef.core; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.tools.Tool; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; /** diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java index ae06620c1..24e3585a9 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.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,10 +16,10 @@ 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.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.gef.EditPartListener; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java index 5829f7330..bb7758c59 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/IEditPartConfigurator.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,10 @@ *******************************************************************************/ package org.eclipse.wb.core.gef; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.core.gef.EditPartFactory; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; /** * Implementations of {@link IEditPartConfigurator} are used by {@link EditPartFactory} to configure diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/ComponentIconEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/ComponentIconEditPart.java index bf6aecfdb..f30cb2a07 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/ComponentIconEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/ComponentIconEditPart.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 @@ -15,13 +15,13 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.core.model.description.IComponentDescription; import org.eclipse.wb.internal.core.utils.state.GlobalState; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; 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 70d034a98..dcfbfe725 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 @@ -20,7 +20,6 @@ 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.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.policies.GraphicalEditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -35,6 +34,7 @@ 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.editparts.LayerManager; import java.lang.reflect.Method; 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 b3baea58e..6d5a99a7c 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 @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.RectangleFigure; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.policies.GraphicalEditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -36,6 +35,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.editparts.LayerManager; import org.eclipse.swt.graphics.Color; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java index 5d040c0cd..84a824219 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gefTree/part/ObjectEditPart.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.model.ObjectInfo; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.tree.TreeEditPart; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.gef.tree.TreeViewer; @@ -25,6 +24,7 @@ import org.eclipse.wb.internal.gef.tree.policies.SelectionEditPolicy; import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.gef.EditPolicy; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuEditPart.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuEditPart.java index a49c1c18c..106558b94 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuEditPart.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MenuEditPart.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 @@ -15,7 +15,6 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.tools.SelectEditPartTracker; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.gef.graphical.GraphicalEditPart; @@ -28,6 +27,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java index 13bb54078..f02b64473 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/absolute/AbsoluteBasedSelectionEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.core.gef.policy.layout.absolute; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.handles.Handle; import org.eclipse.wb.gef.graphical.handles.MoveHandle; import org.eclipse.wb.gef.graphical.handles.ResizeHandle; @@ -22,6 +21,7 @@ import org.eclipse.wb.internal.core.gef.policy.snapping.PlacementsSupport; import org.eclipse.draw2d.PositionConstants; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/FlowContainerLayoutEditPolicy.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/FlowContainerLayoutEditPolicy.java index c0850d7a9..311ed51fc 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/FlowContainerLayoutEditPolicy.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/FlowContainerLayoutEditPolicy.java @@ -16,12 +16,12 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.core.gef.policy.validator.LayoutRequestValidators; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.model.generic.FlowContainer; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; /** diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SelectionEditPolicyInstaller.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SelectionEditPolicyInstaller.java index e546ccf3c..e21ec9fc3 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SelectionEditPolicyInstaller.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/policy/layout/generic/SelectionEditPolicyInstaller.java @@ -12,12 +12,12 @@ *******************************************************************************/ package org.eclipse.wb.internal.core.gef.policy.layout.generic; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.policies.SelectionEditPolicy; import org.eclipse.wb.internal.core.utils.state.GlobalState; import org.eclipse.wb.internal.core.utils.state.IParametersProvider; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.apache.commons.lang3.StringUtils; diff --git a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java index 46321167e..9e923d204 100644 --- a/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java +++ b/org.eclipse.wb.layout.group/src/org/eclipse/wb/internal/layout/group/gef/GroupLayoutEditPolicy2.java @@ -21,7 +21,6 @@ import org.eclipse.wb.core.model.ObjectInfoUtils; import org.eclipse.wb.core.model.broadcast.ObjectEventListener; import org.eclipse.wb.draw2d.Figure; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.core.requests.PasteRequest; @@ -40,6 +39,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/EditorAreaEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/EditorAreaEditPart.java index 330274e56..c9a75e767 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/EditorAreaEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/EditorAreaEditPart.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 @@ -15,12 +15,12 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.PageLayoutSidesLayoutEditPolicy; import org.eclipse.wb.internal.rcp.model.rcp.perspective.EditorAreaInfo; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; /** * {@link EditPart} for {@link EditorAreaInfo}. diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutAddViewEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutAddViewEditPart.java index 43b020521..d356d4b1d 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutAddViewEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutAddViewEditPart.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 @@ -14,11 +14,12 @@ import org.eclipse.wb.core.gef.part.AbstractComponentEditPart; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.AbstractPartSelectionEditPolicy; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.PageLayoutSidesLayoutEditPolicy; import org.eclipse.wb.internal.rcp.model.rcp.perspective.PageLayoutAddViewInfo; +import org.eclipse.gef.EditPolicy; + /** * {@link EditPart} for {@link PageLayoutAddViewInfo}. * diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutCreateFolderEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutCreateFolderEditPart.java index d3eabc61f..d92dfec69 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutCreateFolderEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/PageLayoutCreateFolderEditPart.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 @@ -14,12 +14,13 @@ import org.eclipse.wb.core.gef.part.AbstractComponentEditPart; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.AbstractPartSelectionEditPolicy; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.PageLayoutCreateFolderLayoutEditPolicy; import org.eclipse.wb.internal.rcp.gef.policy.rcp.perspective.PageLayoutSidesLayoutEditPolicy; import org.eclipse.wb.internal.rcp.model.rcp.perspective.PageLayoutCreateFolderInfo; +import org.eclipse.gef.EditPolicy; + /** * {@link EditPart} for {@link PageLayoutCreateFolderInfo}. * diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/shortcuts/AbstractShortcutContainerEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/shortcuts/AbstractShortcutContainerEditPart.java index 555a22a52..bc98c42b0 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/shortcuts/AbstractShortcutContainerEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/perspective/shortcuts/AbstractShortcutContainerEditPart.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 @@ -15,12 +15,12 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.rcp.model.rcp.perspective.shortcuts.AbstractShortcutContainerInfo; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import java.util.Collections; import java.util.List; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/widgets/DialogEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/widgets/DialogEditPart.java index 3a553489c..65182a59c 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/widgets/DialogEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/widgets/DialogEditPart.java @@ -14,10 +14,10 @@ import org.eclipse.wb.core.gef.part.AbstractComponentEditPart; import org.eclipse.wb.core.gef.policy.selection.TopSelectionEditPolicy; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.rcp.model.widgets.DialogInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; /** * {@link EditPart} for {@link DialogInfo}. diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java index 1784e280d..03a37f3e1 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/TableWrapLayoutEditPolicy.java @@ -16,7 +16,6 @@ import org.eclipse.wb.core.gef.policy.PolicyUtils; import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; @@ -37,6 +36,7 @@ import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java index b55a1389b..d0620bf17 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.rcp.gef.GefMessages; @@ -37,6 +36,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java index dc1dc05a3..0635d8271 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.rcp.gef.GefMessages; @@ -37,6 +36,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java index a15226569..81db53ca2 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/FormLayoutEditPolicy.java @@ -18,7 +18,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.draw2d.FigureUtils; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; @@ -42,6 +41,7 @@ import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java index 9dfcb2d43..17c33c4e0 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java index 2f65af585..6349298ac 100644 --- a/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java index cfb5409da..a395b0dad 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/ColumnsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.MigLayout.gef.GefMessages; @@ -34,6 +33,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java index ef334abd6..68295d9ba 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/header/layout/RowsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.MigLayout.gef.GefMessages; @@ -34,6 +33,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupLayoutEditPolicy.java b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupLayoutEditPolicy.java index ee298eb91..b6b87d3be 100644 --- a/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.java6/src/org/eclipse/wb/internal/swing/java6/gef/GroupLayoutEditPolicy.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -28,6 +27,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JScrollPaneEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JScrollPaneEditPart.java index 9df088fdc..1af6b43f5 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JScrollPaneEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JScrollPaneEditPart.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 @@ -13,10 +13,11 @@ package org.eclipse.wb.internal.swing.gef.part; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.JScrollPaneLayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.JScrollPaneInfo; +import org.eclipse.gef.EditPolicy; + /** * The {@link EditPart} for {@link JScrollPaneInfo}. * diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JSplitPaneEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JSplitPaneEditPart.java index b4db992a6..8aff42976 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JSplitPaneEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JSplitPaneEditPart.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 @@ -13,10 +13,11 @@ package org.eclipse.wb.internal.swing.gef.part; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.JSplitPaneLayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.JSplitPaneInfo; +import org.eclipse.gef.EditPolicy; + /** * The {@link EditPart} for {@link JSplitPaneInfo}. * diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneEditPart.java index c51fa06ad..353668584 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneEditPart.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 @@ -13,11 +13,12 @@ package org.eclipse.wb.internal.swing.gef.part; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.JTabbedPaneLayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.JTabbedPaneTabLayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.JTabbedPaneInfo; +import org.eclipse.gef.EditPolicy; + import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java index 076886a98..5a974b36d 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.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 @@ -15,12 +15,12 @@ import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.swing.model.component.JTabbedPaneInfo; import org.eclipse.wb.internal.swing.model.component.JTabbedPaneTabInfo; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java index dad27d045..a9f080e7a 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueEditPart.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 @@ -14,12 +14,12 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.GlueSelectionEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java index a67c3371e..4e6fa2d50 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueHorizontalEditPart.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 @@ -14,12 +14,12 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.GlueSelectionEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java index 66f124f0a..eed7f558a 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxGlueVerticalEditPart.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 @@ -14,12 +14,12 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.GlueSelectionEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java index 67d1ce36b..1aaa4348d 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxRigidAreaEditPart.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 @@ -14,13 +14,13 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutDirectRigidEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutSelectionRigidEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java index e487ae10d..56b244815 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutHorizontalEditPart.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 @@ -14,13 +14,13 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutDirectHorizontalEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutSelectionHorizontalEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java index 3fd714185..e702e8bdb 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/box/BoxStrutVerticalEditPart.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 @@ -14,13 +14,13 @@ import org.eclipse.wb.draw2d.Figure; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutDirectVerticalEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.component.box.StrutSelectionVerticalEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import javax.swing.Box; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java index 2849d6e73..ca7de882d 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/action/ActionDropPolicyConfigurator.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 @@ -13,11 +13,11 @@ package org.eclipse.wb.internal.swing.gef.policy.action; import org.eclipse.wb.core.gef.IEditPartConfigurator; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.model.bean.ActionInfo; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import javax.swing.AbstractButton; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java index 2c89564f6..1f4543b6f 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/AbsoluteLayoutEditPolicy.java @@ -14,7 +14,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.IAbstractComponentInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; @@ -38,6 +37,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import java.util.ArrayList; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutEditPolicy.java index 36ab3d697..da8e5971e 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/CardLayoutEditPolicy.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.wb.internal.swing.gef.policy.layout; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.policy.ComponentFlowLayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.layout.CardLayoutInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; /** @@ -69,7 +69,7 @@ protected void decorateChild(EditPart child) { Object model = child.getModel(); if (m_layout.isManagedObject(model)) { EditPolicy policy = new CardLayoutSelectionEditPolicy(m_layout); - child.installEditPolicy(org.eclipse.gef.EditPolicy.SELECTION_FEEDBACK_ROLE, policy); + child.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy); } } diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/GenericFlowLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/GenericFlowLayoutEditPolicy.java index a2125770c..98dfb3f09 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/GenericFlowLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/GenericFlowLayoutEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swing.gef.policy.layout; import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.core.utils.state.GlobalState; import org.eclipse.wb.internal.swing.gef.policy.ComponentFlowLayoutEditPolicy; @@ -21,6 +20,7 @@ import org.eclipse.wb.internal.swing.model.layout.GenericFlowLayoutInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; /** diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java index e9c7babb3..70039658c 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/SpringLayoutEditPolicy.java @@ -15,7 +15,6 @@ import org.eclipse.wb.core.gef.command.EditCommand; import org.eclipse.wb.core.model.AbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -31,6 +30,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import java.util.List; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java index 4dd3034e1..5bad4b6fc 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/GridBagLayoutEditPolicy.java @@ -18,7 +18,6 @@ import org.eclipse.wb.core.gef.policy.layout.LayoutPolicyUtils2.IPasteProcessor; import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; @@ -40,6 +39,7 @@ import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java index 44fab1471..b6cc15729 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/ColumnsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.GefMessages; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java index c7acf37d2..9d764237a 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/layout/gbl/header/layout/RowsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gef.GefMessages; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java index 4986a486f..c90b62038 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/policy/menu/MenuDropPolicyConfigurator.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 @@ -13,11 +13,11 @@ package org.eclipse.wb.internal.swing.gef.policy.menu; import org.eclipse.wb.core.gef.IEditPartConfigurator; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.internal.swing.model.component.ComponentInfo; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import javax.swing.JApplet; import javax.swing.JDialog; diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/part/ContainerEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/part/ContainerEditPart.java index d6fd1129b..790d8b550 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/part/ContainerEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/part/ContainerEditPart.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 @@ -14,13 +14,14 @@ import org.eclipse.wb.core.gefTree.policy.layout.LayoutPolicyUtils; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swing.gefTree.policy.DefaultLayoutEditPolicy; import org.eclipse.wb.internal.swing.gefTree.policy.DropLayoutEditPolicy; import org.eclipse.wb.internal.swing.model.component.ContainerInfo; import org.eclipse.wb.internal.swing.model.layout.LayoutInfo; +import org.eclipse.gef.EditPolicy; + /** * {@link EditPart} for {@link ContainerInfo} for GEF Tree. * diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java index 9446fb268..6f4604ba1 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/AbsoluteLayoutEditPolicy.java @@ -13,7 +13,6 @@ package org.eclipse.wb.internal.swt.gef.policy.layout; import org.eclipse.wb.core.gef.command.EditCommand; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -29,6 +28,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import java.util.ArrayList; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DefaultLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DefaultLayoutEditPolicy.java index 70e8b2fab..0aa80c545 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DefaultLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/DefaultLayoutEditPolicy.java @@ -13,13 +13,13 @@ package org.eclipse.wb.internal.swt.gef.policy.layout; import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; import org.eclipse.wb.internal.swt.model.widgets.ControlInfo; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; /** * {@link LayoutEditPolicy} {@link CompositeInfo} without known {@link LayoutInfo}. 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 e1d07465a..3bb61b583 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 @@ -18,7 +18,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -35,6 +34,7 @@ import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.draw2d.geometry.Transposer; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java index 76ffd4164..bc35f326f 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy.java @@ -18,7 +18,6 @@ import org.eclipse.wb.core.gef.policy.helpers.BroadcastListenerHelper; import org.eclipse.wb.core.model.IAbstractComponentInfo; import org.eclipse.wb.core.model.ObjectInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -38,6 +37,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.TabFolder; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy2.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy2.java index 76d42017c..1834ea874 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy2.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicy2.java @@ -25,7 +25,6 @@ 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.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.core.requests.CreateRequest; @@ -49,6 +48,7 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; 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 9d61d442e..971eb3f57 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 @@ -23,7 +23,6 @@ import org.eclipse.wb.draw2d.border.LineBorder; import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; 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.PointList; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Translatable; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java index b9960ee38..d1e125435 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/GridLayoutEditPolicy.java @@ -17,7 +17,6 @@ import org.eclipse.wb.core.gef.policy.layout.grid.AbstractGridLayoutEditPolicy; import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo; import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.policies.ILayoutRequestValidator; import org.eclipse.wb.gef.core.policies.IRefreshableEditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; @@ -40,6 +39,7 @@ import org.eclipse.draw2d.geometry.Interval; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.jface.action.IMenuManager; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java index 7bc746af2..a34af2137 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/ColumnsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.gef.GefMessages; @@ -37,6 +36,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java index 3a4fc84ea..ed6e21dcb 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/grid/header/layout/RowsLayoutEditPolicy.java @@ -21,7 +21,6 @@ import org.eclipse.wb.draw2d.FigureUtils; import org.eclipse.wb.draw2d.Layer; import org.eclipse.wb.gef.core.IEditPartViewer; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.gef.GefMessages; @@ -37,6 +36,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.DropRequest; diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/part/CompositeEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/part/CompositeEditPart.java index a2fef943d..6c6e8c0ed 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/part/CompositeEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/part/CompositeEditPart.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 @@ -14,12 +14,13 @@ import org.eclipse.wb.core.gefTree.policy.layout.LayoutPolicyUtils; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.tree.policies.LayoutEditPolicy; import org.eclipse.wb.internal.swt.gefTree.policy.DropLayoutEditPolicy; import org.eclipse.wb.internal.swt.model.layout.LayoutInfo; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; +import org.eclipse.gef.EditPolicy; + /** * {@link EditPart} for {@link CompositeInfo}. * diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java index 5ca73adac..0e1569da4 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/rcp/model/layout/form/gef/FormLayoutMoveTest.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,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.tests.designer.rcp.model.layout.form.gef; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.internal.swt.gef.policy.layout.form.FormLayoutEditPolicy; import org.eclipse.wb.internal.swt.model.widgets.CompositeInfo; @@ -23,6 +22,7 @@ import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java index 3c1b4dc4c..691151898 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/swt/model/menu/MenuPopupSimpleTest.java @@ -13,7 +13,6 @@ package org.eclipse.wb.tests.designer.swt.model.menu; import org.eclipse.wb.core.model.JavaInfo; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.core.tools.SelectEditPartTracker; import org.eclipse.wb.gef.graphical.GraphicalEditPart; @@ -29,6 +28,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java index d82764905..bf6316367 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/GefCursorTestCase.java @@ -13,7 +13,6 @@ package org.eclipse.wb.tests.gef; import org.eclipse.wb.draw2d.Figure; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.CreateRequest; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.gef.graphical.GraphicalEditPart; @@ -30,6 +29,7 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java index c44fe6e95..4f7dd92e6 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolCursorTest.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 @@ -13,7 +13,6 @@ package org.eclipse.wb.tests.gef; import org.eclipse.wb.gef.core.EditPart; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest; import org.eclipse.wb.gef.graphical.GraphicalEditPart; import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy; @@ -21,6 +20,7 @@ import org.eclipse.draw2d.Cursors; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.commands.Command; import org.eclipse.swt.SWT; diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java index 8bfeb0388..a767e4dae 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/TreeToolTest.java @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.tests.gef; -import org.eclipse.wb.gef.core.policies.EditPolicy; import org.eclipse.wb.gef.core.requests.PasteRequest; import org.eclipse.wb.gef.core.tools.Tool; import org.eclipse.wb.gef.tree.TreeEditPart; @@ -24,6 +23,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.SelectionRequest;