diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/EditPartFactory2.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/EditPartFactory2.java index 840e09fc0..9d33cb266 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/EditPartFactory2.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/EditPartFactory2.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -47,7 +47,7 @@ private EditPartFactory2() { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model == null) { return null; } diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory2.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory2.java index cf803bf77..d8999b882 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory2.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory2.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -47,7 +47,7 @@ private EditPartFactory2() { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model == null) { return null; } diff --git a/org.eclipse.wb.core/.settings/.api_filters b/org.eclipse.wb.core/.settings/.api_filters index c7d2b5e38..326cfaf2a 100644 --- a/org.eclipse.wb.core/.settings/.api_filters +++ b/org.eclipse.wb.core/.settings/.api_filters @@ -30,6 +30,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java index 176244a41..c440a1140 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java @@ -26,7 +26,10 @@ * * @author lobas_av * @coverage gef.core + * @deprecated Cast to {@link org.eclipse.gef.EditPart EditPart} directly or + * extend {@link AbstractEditPart}. */ +@Deprecated(forRemoval = true, since = "2026-06") public abstract class EditPart extends org.eclipse.gef.editparts.AbstractEditPart { //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartFactory.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartFactory.java index cb7991f78..b39b77853 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartFactory.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,6 +12,7 @@ *******************************************************************************/ package org.eclipse.wb.gef.core; +import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; /** @@ -28,5 +29,5 @@ public interface IEditPartFactory extends org.eclipse.gef.EditPartFactory { * Creates a new {@link EditPart} given the specified context and model. */ @Override - EditPart createEditPart(org.eclipse.gef.EditPart context, Object model); + EditPart createEditPart(EditPart context, Object model); } \ No newline at end of file diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ParentTargetDragEditPartTracker.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ParentTargetDragEditPartTracker.java index dce585a61..4a690504d 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ParentTargetDragEditPartTracker.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/ParentTargetDragEditPartTracker.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -30,7 +30,7 @@ public class ParentTargetDragEditPartTracker extends DragEditPartTracker { // Constructor // //////////////////////////////////////////////////////////////////////////// - public ParentTargetDragEditPartTracker(org.eclipse.wb.gef.core.EditPart sourceEditPart) { + public ParentTargetDragEditPartTracker(EditPart sourceEditPart) { super(sourceEditPart); } 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 27f38dfda..4c791c5fc 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 @@ -34,6 +34,7 @@ * @deprecated Extend {@link AbstractGraphicalEditPart} directly or cast to * {@link org.eclipse.gef.GraphicalEditPart GraphicalEditPart}. */ +@SuppressWarnings("removal") @Deprecated(since = "2026-06", forRemoval = true) public abstract class GraphicalEditPart extends org.eclipse.wb.gef.core.EditPart implements org.eclipse.gef.GraphicalEditPart { private IFigure m_figure; diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java index 95183d089..9cd70489b 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/tree/TreeEditPart.java @@ -29,6 +29,7 @@ * @author lobas_av * @coverage gef.tree */ +@SuppressWarnings("removal") public abstract class TreeEditPart extends org.eclipse.wb.gef.core.EditPart implements org.eclipse.gef.TreeEditPart { private TreeItem m_widget; private boolean m_expandedShouldRestore; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java index 5dcfbec19..39006e2b3 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/MatchingEditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -60,10 +60,10 @@ public MatchingEditPartFactory(List modelPackages, List partPack // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { Class modelClass = model.getClass(); for (; modelClass != null; modelClass = modelClass.getSuperclass()) { - org.eclipse.wb.gef.core.EditPart editPart = createEditPart(model, modelClass); + EditPart editPart = createEditPart(model, modelClass); if (editPart != null) { return editPart; } @@ -86,17 +86,17 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object * @return the {@link EditPart} corresponding to modelClass, may be null * , if no match found. */ - private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, Class modelClass) { + private EditPart createEditPart(Object model, Class modelClass) { // "Info" suffix { - org.eclipse.wb.gef.core.EditPart editPart = createEditPart(model, modelClass, "Info"); + EditPart editPart = createEditPart(model, modelClass, "Info"); if (editPart != null) { return editPart; } } // no suffix { - org.eclipse.wb.gef.core.EditPart editPart = createEditPart(model, modelClass, ""); + EditPart editPart = createEditPart(model, modelClass, ""); if (editPart != null) { return editPart; } @@ -107,7 +107,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, Class m if (modelClassName.contains("$")) { modelClassName = StringUtils.remove(modelClassName, "Info"); modelClassName = StringUtils.remove(modelClassName, "$"); - org.eclipse.wb.gef.core.EditPart editPart = createEditPart(model, modelClass, modelClassName, ""); + EditPart editPart = createEditPart(model, modelClass, modelClassName, ""); if (editPart != null) { return editPart; } @@ -120,7 +120,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, Class m /** * Implementation for {@link #createEditPart(Object, Class)}, with single model suffix. */ - private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, Class modelClass, String modelSuffix) { + private EditPart createEditPart(Object model, Class modelClass, String modelSuffix) { String modelClassName = modelClass.getName(); return createEditPart(model, modelClass, modelClassName, modelSuffix); } @@ -128,7 +128,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, Class m /** * Implementation for {@link #createEditPart(Object, Class)}, with single model suffix. */ - private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, + private EditPart createEditPart(Object model, Class modelClass, String modelClassName, String modelSuffix) { @@ -144,7 +144,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, // create corresponding EditPart, use "EditPart" prefix { String partClassName = partPackage + componentName + "EditPart"; - org.eclipse.wb.gef.core.EditPart editPart = createEditPart0(model, modelClass, partClassName); + EditPart editPart = createEditPart0(model, modelClass, partClassName); if (editPart != null) { return editPart; } @@ -155,14 +155,14 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(Object model, return null; } - private static org.eclipse.wb.gef.core.EditPart createEditPart0(Object model, Class modelClass, String partClassName) { + private static EditPart createEditPart0(Object model, Class modelClass, String partClassName) { try { ClassLoader classLoader = modelClass.getClassLoader(); Class partClass = classLoader.loadClass(partClassName); // try all constructors for (Constructor constructor : partClass.getConstructors()) { try { - return (org.eclipse.wb.gef.core.EditPart) constructor.newInstance(model); + return (EditPart) constructor.newInstance(model); } catch (Throwable e) { // ignore } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/menu/MenuEditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/menu/MenuEditPartFactory.java index c9ed44701..799b2707e 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/menu/MenuEditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/part/menu/MenuEditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,7 +12,6 @@ *******************************************************************************/ package org.eclipse.wb.core.gef.part.menu; -import org.eclipse.wb.gef.core.EditPart; import org.eclipse.wb.internal.core.gef.part.menu.MacMenuEditPart; import org.eclipse.wb.internal.core.gef.part.menu.MenuEditPart; import org.eclipse.wb.internal.core.gef.part.menu.MenuItemEditPart; @@ -21,6 +20,8 @@ import org.eclipse.wb.internal.core.model.menu.IMenuItemInfo; import org.eclipse.wb.internal.core.model.menu.IMenuPopupInfo; +import org.eclipse.gef.EditPart; + /** * Factory for "menu" {@link EditPart}s. * @@ -30,6 +31,7 @@ public final class MenuEditPartFactory { /** * @return the {@link EditPart} for {@link IMenuInfo}. + * @since 1.24 */ public static EditPart createPopupMenu(Object toolkitModel, IMenuPopupInfo popup) { return new MenuPopupEditPart(toolkitModel, popup); @@ -37,6 +39,7 @@ public static EditPart createPopupMenu(Object toolkitModel, IMenuPopupInfo popup /** * @return the {@link EditPart} for {@link IMenuInfo}. + * @since 1.24 */ public static EditPart createMenu(Object toolkitModel, IMenuInfo menu) { return new MenuEditPart(toolkitModel, menu); @@ -44,6 +47,7 @@ public static EditPart createMenu(Object toolkitModel, IMenuInfo menu) { /** * @return the {@link EditPart} for {@link IMenuInfo}, used on Mac. + * @since 1.24 */ public static EditPart createMenuMac(Object toolkitModel, IMenuInfo menu) { return new MacMenuEditPart(toolkitModel, menu); @@ -51,6 +55,7 @@ public static EditPart createMenuMac(Object toolkitModel, IMenuInfo menu) { /** * @return the {@link EditPart} for {@link IMenuItemInfo}. + * @since 1.24 */ public static EditPart createMenuItem(Object toolkitModel, IMenuItemInfo item) { return new MenuItemEditPart(toolkitModel, item); diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/LayoutPolicyUtils.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/LayoutPolicyUtils.java index 01c03c377..504a158d6 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/LayoutPolicyUtils.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/LayoutPolicyUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -33,8 +33,19 @@ public class LayoutPolicyUtils { //////////////////////////////////////////////////////////////////////////// /** * @return the {@link LayoutEditPolicy} for given model. + * @deprecated Use {@link #createLayoutEditPolicy(EditPart, Object)} instead. + * Will be removed after the 2028-06 release. */ - public static LayoutEditPolicy createLayoutEditPolicy(org.eclipse.wb.gef.core.EditPart context, Object model) { + @Deprecated(forRemoval = true, since = "2026-06") + public static LayoutEditPolicy createLayoutEditPolicy(@SuppressWarnings("removal") org.eclipse.wb.gef.core.EditPart context, Object model) { + return createLayoutEditPolicy((EditPart) context, model); + } + + /** + * @return the {@link LayoutEditPolicy} for given model. + * @since 1.24 + */ + public static LayoutEditPolicy createLayoutEditPolicy(EditPart context, Object model) { // try to create policy List factories = ExternalFactoriesHelper.getElementsInstances( diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/EditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/EditPartFactory.java index eb513a7b2..17c4b9f92 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/EditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -44,7 +44,7 @@ private EditPartFactory() { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model == null) { return null; } @@ -70,7 +70,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object // } // check each external factory for (IEditPartFactory factory : getFactories()) { - org.eclipse.wb.gef.core.EditPart editPart = factory.createEditPart(context, model); + EditPart editPart = factory.createEditPart(context, model); if (editPart != null) { configureEditPart(context, editPart); return editPart; @@ -104,7 +104,7 @@ private static List getFactories() { /** * Configures given {@link EditPart} using externally contributed {@link IEditPartConfigurator}'s. */ - public static void configureEditPart(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) { + public static void configureEditPart(EditPart context, EditPart editPart) { List configurators = ExternalFactoriesHelper.getElementsInstances( IEditPartConfigurator.class, diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersEditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersEditPartFactory.java index c785a5321..948101b8b 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersEditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersEditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -24,7 +24,7 @@ */ public final class HeadersEditPartFactory implements IEditPartFactory { @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { - return (org.eclipse.wb.gef.core.EditPart) model; + public EditPart createEditPart(EditPart context, Object model) { + return (EditPart) model; } } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory.java index dab4b899c..9501a0087 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gefTree/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -50,12 +50,12 @@ private EditPartFactory() { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model == null) { return null; } // create EditPart - org.eclipse.wb.gef.core.EditPart editPart = createEditPartPure(context, model); + EditPart editPart = createEditPartPure(context, model); if (editPart != null) { configureEditPart(context, editPart); return editPart; @@ -63,7 +63,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object // no EditPart found return null; } - private org.eclipse.wb.gef.core.EditPart createEditPartPure(EditPart context, Object model) { + private EditPart createEditPartPure(EditPart context, Object model) { // menu if (model instanceof ObjectInfo objectInfo) { { @@ -81,7 +81,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPartPure(EditPart context, Ob } // check each external factory for (IEditPartFactory factory : getFactories()) { - org.eclipse.wb.gef.core.EditPart editPart = factory.createEditPart(context, model); + EditPart editPart = factory.createEditPart(context, model); if (editPart != null) { return editPart; } @@ -124,7 +124,7 @@ private static List getFactories() { /** * Configures given {@link EditPart} using externally contributed {@link IEditPartConfigurator}'s. */ - private static void configureEditPart(EditPart context, org.eclipse.wb.gef.core.EditPart editPart) { + private static void configureEditPart(EditPart context, EditPart editPart) { List configurators = ExternalFactoriesHelper.getElementsInstances( IEditPartConfigurator.class, diff --git a/org.eclipse.wb.rcp.nebula/src/org/eclipse/wb/internal/rcp/nebula/gef/EditPartFactory.java b/org.eclipse.wb.rcp.nebula/src/org/eclipse/wb/internal/rcp/nebula/gef/EditPartFactory.java index 7ea579857..cfd6774b0 100644 --- a/org.eclipse.wb.rcp.nebula/src/org/eclipse/wb/internal/rcp/nebula/gef/EditPartFactory.java +++ b/org.eclipse.wb.rcp.nebula/src/org/eclipse/wb/internal/rcp/nebula/gef/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -36,7 +36,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { return MATCHING_FACTORY.createEditPart(context, model); } } \ No newline at end of file diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/EditPartFactory.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/EditPartFactory.java index 0ef66c16a..ee0c05d47 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/EditPartFactory.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -48,7 +48,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { // special Composite's if (model instanceof CompositeInfo composite) { // Form.getHead() @@ -92,7 +92,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object // Utils // //////////////////////////////////////////////////////////////////////////// - private static org.eclipse.wb.gef.core.EditPart createMenuEditPart(Object model, IMenuInfo menuInfo) { + private static EditPart createMenuEditPart(Object model, IMenuInfo menuInfo) { return EnvironmentUtils.IS_MAC ? MenuEditPartFactory.createMenuMac(model, menuInfo) : MenuEditPartFactory.createMenu(model, menuInfo); diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/forms/FormEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/forms/FormEditPart.java index 8d6efad99..92ed425a7 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/forms/FormEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/forms/FormEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -47,7 +47,7 @@ public FormEditPart(FormInfo form) { @Override protected EditPart createChild(Object model) { if (model instanceof MenuManagerInfo manager) { - org.eclipse.wb.gef.core.EditPart editPart = MenuEditPartFactory.createPopupMenu(model, m_form.getMenuImpl(manager)); + EditPart editPart = MenuEditPartFactory.createPopupMenu(model, m_form.getMenuImpl(manager)); EditPartFactory.configureEditPart(this, editPart); return editPart; } diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/ViewPartLikeEditPart.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/ViewPartLikeEditPart.java index b707dbbc2..7089023aa 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/ViewPartLikeEditPart.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/part/rcp/ViewPartLikeEditPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -46,7 +46,7 @@ public ViewPartLikeEditPart(ViewPartLikeInfo part) { @Override protected EditPart createChild(Object model) { if (model instanceof MenuManagerInfo manager) { - org.eclipse.wb.gef.core.EditPart editPart = MenuEditPartFactory.createPopupMenu(model, m_part.getMenuImpl(manager)); + EditPart editPart = MenuEditPartFactory.createPopupMenu(model, m_part.getMenuImpl(manager)); EditPartFactory.configureEditPart(this, editPart); return editPart; } 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 03a37f3e1..44fcbf03c 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -426,7 +426,7 @@ public List getHeaders(boolean horizontal) { @Override @SuppressWarnings("unchecked") - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean horizontal, Object model) { + public EditPart createHeaderEditPart(boolean horizontal, Object model) { if (horizontal) { return new ColumnHeaderEditPart<>(m_layout, (TableWrapColumnInfo) model, getHostFigure()); } else { diff --git a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/EditPartFactory.java b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/EditPartFactory.java index 4330f513d..a7a878441 100644 --- a/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/EditPartFactory.java +++ b/org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gefTree/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -39,7 +39,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { // special Composite's if (model instanceof CompositeInfo composite) { // Form.getHead() 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 81db53ca2..889a5003c 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -399,7 +399,7 @@ public List getHeaders(boolean horizontal) { } @Override - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean horizontal, Object model) { + public EditPart createHeaderEditPart(boolean horizontal, Object model) { if (horizontal) { return new ColumnHeaderEditPart(m_layout, (FormColumnInfo) model, getHostFigure()); } else { diff --git a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java index ae57d95ea..6b90b9dc2 100644 --- a/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java +++ b/org.eclipse.wb.swing.MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/gef/MigLayoutEditPolicy.java @@ -494,7 +494,7 @@ public List getHeaders(boolean horizontal) { } @Override - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean horizontal, Object model) { + public EditPart createHeaderEditPart(boolean horizontal, Object model) { if (horizontal) { return new ColumnHeaderEditPart(m_layout, (MigColumnInfo) model, getHostFigure()); } else { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/EditPartFactory.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/EditPartFactory.java index 50ccd17f3..279d7d270 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/EditPartFactory.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -70,9 +70,9 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { for (IEditPartFactory factory : FACTORIES) { - org.eclipse.wb.gef.core.EditPart editPart = factory.createEditPart(null, model); + EditPart editPart = factory.createEditPart(null, model); if (editPart != null) { return editPart; } @@ -87,7 +87,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object //////////////////////////////////////////////////////////////////////////// private static final IEditPartFactory MENU_FACTORY = new IEditPartFactory() { @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model instanceof JMenuBarInfo menu) { IMenuInfo menuObject = MenuObjectInfoUtils.getMenuInfo(menu); return MenuEditPartFactory.createMenu(model, menuObject); @@ -112,7 +112,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object }; private static final IEditPartFactory SPECIAL_FACTORY = new IEditPartFactory() { @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model instanceof JSplitPaneInfo) { return new JSplitPaneEditPart((JSplitPaneInfo) model); } @@ -130,7 +130,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object }; private static final IEditPartFactory BOX_FACTORY = new IEditPartFactory() { @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model instanceof ComponentInfo component) { if (component.getCreationSupport() instanceof StaticFactoryCreationSupport) { StaticFactoryCreationSupport factoryCreationSupport = @@ -146,7 +146,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object return null; } - private org.eclipse.wb.gef.core.EditPart createEditPart(ComponentInfo component, String signature) { + private EditPart createEditPart(ComponentInfo component, String signature) { // glue if (signature.equals("createGlue()")) { return new BoxGlueEditPart(component); @@ -176,7 +176,7 @@ private org.eclipse.wb.gef.core.EditPart createEditPart(ComponentInfo component, List.of("org.eclipse.wb.internal.swing.gef.part")); private static final IEditPartFactory GENERIC_FACTORY = new IEditPartFactory() { @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { if (model instanceof ContainerInfo) { return new ContainerEditPart((ContainerInfo) model); } diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/ContainerEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/ContainerEditPart.java index dc62822e6..722e9e4e1 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/ContainerEditPart.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/ContainerEditPart.java @@ -112,7 +112,7 @@ protected void refreshEditPolicies() { } } } - LayoutEditPolicy policy = LayoutPolicyUtils.createLayoutEditPolicy(this, layout); + LayoutEditPolicy policy = LayoutPolicyUtils.createLayoutEditPolicy((EditPart) this, layout); installEditPolicy(EditPolicy.LAYOUT_ROLE, policy); } else { 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 5bad4b6fc..df7bf8b30 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -395,7 +395,7 @@ public List getHeaders(boolean horizontal) { } @Override - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean horizontal, Object model) { + public EditPart createHeaderEditPart(boolean horizontal, Object model) { if (horizontal) { return new ColumnHeaderEditPart(m_layout, (ColumnInfo) model, getHostFigure()); } else { diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/EditPartFactory.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/EditPartFactory.java index faa3941c2..f686f828f 100644 --- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/EditPartFactory.java +++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gefTree/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -33,7 +33,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { // components if (model instanceof ContainerInfo) { return new ContainerEditPart((ContainerInfo) model); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/EditPartFactory.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/EditPartFactory.java index 43c9bf507..571fc6a60 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/EditPartFactory.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -48,7 +48,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { // menu { if (model instanceof MenuInfo menu) { @@ -74,7 +74,7 @@ public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object // Utils // //////////////////////////////////////////////////////////////////////////// - private org.eclipse.wb.gef.core.EditPart createMenuEditPart(Object model, IMenuInfo menuInfo) { + private EditPart createMenuEditPart(Object model, IMenuInfo menuInfo) { return EnvironmentUtils.IS_MAC ? MenuEditPartFactory.createMenuMac(model, menuInfo) : MenuEditPartFactory.createMenu(model, menuInfo); diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/CompositeEditPart.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/CompositeEditPart.java index f2d97d1c2..b882ce0cf 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/CompositeEditPart.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/part/CompositeEditPart.java @@ -116,7 +116,7 @@ protected void refreshEditPolicies() { m_composite.setLayout(m_currentLayout); } } - LayoutEditPolicy policy = LayoutPolicyUtils.createLayoutEditPolicy(this, m_currentLayout); + LayoutEditPolicy policy = LayoutPolicyUtils.createLayoutEditPolicy((EditPart) this, m_currentLayout); if (policy == null) { policy = new DefaultLayoutEditPolicy(); } 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 6bce858e9..82a89da93 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 @@ -448,7 +448,7 @@ private void translateAbsoluteToModel(Translatable t) { private FormHeaderLayoutEditPolicy m_headersPolicyVertical; @Override - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean isHorizontal, Object model) { + public EditPart createHeaderEditPart(boolean isHorizontal, Object model) { return new FormHeaderEditPart<>(m_layout, model, isHorizontal, getHostFigure()); } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java index c7ab68e45..0074276c6 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gef/policy/layout/form/FormLayoutEditPolicyClassic.java @@ -1584,7 +1584,7 @@ protected void executeEdit() throws Exception { private FormHeaderLayoutEditPolicy headersPolicyVertical; @Override - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean isHorizontal, Object model) { + public EditPart createHeaderEditPart(boolean isHorizontal, Object model) { return new FormHeaderEditPart<>(layout, model, isHorizontal, getHostFigure()); } 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 d1e125435..2654e65d5 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2025 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -482,7 +482,7 @@ public List getHeaders(boolean horizontal) { @Override @SuppressWarnings("unchecked") - public org.eclipse.wb.gef.core.EditPart createHeaderEditPart(boolean horizontal, Object model) { + public EditPart createHeaderEditPart(boolean horizontal, Object model) { if (horizontal) { return new ColumnHeaderEditPart<>(m_layout, (GridColumnInfo) model, getHostFigure()); } else { diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/EditPartFactory.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/EditPartFactory.java index 4564347d2..8b5db88e0 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/EditPartFactory.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/gefTree/EditPartFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2026 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -36,7 +36,7 @@ public final class EditPartFactory implements IEditPartFactory { // //////////////////////////////////////////////////////////////////////////// @Override - public org.eclipse.wb.gef.core.EditPart createEditPart(EditPart context, Object model) { + public EditPart createEditPart(EditPart context, Object model) { // most EditPart's can be created using matching return MATCHING_FACTORY.createEditPart(context, model); } 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 078093503..3df07b142 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 @@ -81,7 +81,7 @@ public IEditPartFactory getEditPartFactory() { } @Override - public List getSelectedEditParts() { + public List getSelectedEditParts() { return null; }