Skip to content

Commit fc06288

Browse files
committed
[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.
1 parent c6ae223 commit fc06288

70 files changed

Lines changed: 111 additions & 103 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/part/AbstractComponentEditPart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.eclipse.wb.core.model.AbstractComponentInfo;
1919
import org.eclipse.wb.core.model.broadcast.DisplayEventListener;
2020
import org.eclipse.wb.draw2d.Figure;
21-
import org.eclipse.wb.gef.core.policies.EditPolicy;
2221
import org.eclipse.wb.gef.core.requests.DragPermissionRequest;
2322
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2423
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
@@ -36,6 +35,7 @@
3635
import org.eclipse.draw2d.geometry.Point;
3736
import org.eclipse.draw2d.geometry.Rectangle;
3837
import org.eclipse.gef.EditPart;
38+
import org.eclipse.gef.EditPolicy;
3939
import org.eclipse.gef.Request;
4040
import org.eclipse.gef.commands.CompoundCommand;
4141
import org.eclipse.gef.requests.SelectionRequest;

org.eclipse.wb.core.java/src/org/eclipse/wb/core/gef/policy/DirectTextPropertyEditPolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc. and others.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -16,7 +16,6 @@
1616
import org.eclipse.wb.core.model.AbstractComponentInfo;
1717
import org.eclipse.wb.core.model.JavaInfo;
1818
import org.eclipse.wb.gef.core.EditPart;
19-
import org.eclipse.wb.gef.core.policies.EditPolicy;
2019
import org.eclipse.wb.gef.core.requests.KeyRequest;
2120
import org.eclipse.wb.gef.graphical.policies.DirectTextEditPolicy;
2221
import org.eclipse.wb.internal.core.model.JavaInfoUtils;
@@ -32,6 +31,7 @@
3231
import org.eclipse.draw2d.geometry.Dimension;
3332
import org.eclipse.draw2d.geometry.Point;
3433
import org.eclipse.draw2d.geometry.Rectangle;
34+
import org.eclipse.gef.EditPolicy;
3535
import org.eclipse.gef.Request;
3636
import org.eclipse.jface.preference.IPreferenceStore;
3737
import org.eclipse.swt.SWT;

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/GenericContainersConfigurator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc. and others.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,6 @@
1414

1515
import org.eclipse.wb.core.gef.IEditPartConfigurator;
1616
import org.eclipse.wb.core.model.JavaInfo;
17-
import org.eclipse.wb.gef.core.policies.EditPolicy;
1817
import org.eclipse.wb.internal.core.gef.policy.layout.generic.FlowContainerLayoutEditPolicy;
1918
import org.eclipse.wb.internal.core.gef.policy.layout.generic.SimpleContainerLayoutEditPolicy;
2019
import org.eclipse.wb.internal.core.model.generic.FlowContainer;
@@ -23,6 +22,7 @@
2322
import org.eclipse.wb.internal.core.model.generic.SimpleContainerFactory;
2423

2524
import org.eclipse.gef.EditPart;
25+
import org.eclipse.gef.EditPolicy;
2626

2727
import java.util.List;
2828

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/AbstractWrapperEditPart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -17,13 +17,13 @@
1717
import org.eclipse.wb.core.model.IWrapperInfo;
1818
import org.eclipse.wb.draw2d.Figure;
1919
import org.eclipse.wb.gef.core.EditPart;
20-
import org.eclipse.wb.gef.core.policies.EditPolicy;
2120
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2221

2322
import org.eclipse.draw2d.ColorConstants;
2423
import org.eclipse.draw2d.Graphics;
2524
import org.eclipse.draw2d.geometry.Point;
2625
import org.eclipse.draw2d.geometry.Rectangle;
26+
import org.eclipse.gef.EditPolicy;
2727
import org.eclipse.jface.resource.ImageDescriptor;
2828
import org.eclipse.swt.graphics.Image;
2929
import org.eclipse.swt.graphics.ImageData;

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/DesignRootEditPart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.eclipse.wb.draw2d.Figure;
1919
import org.eclipse.wb.draw2d.border.Border;
2020
import org.eclipse.wb.draw2d.border.MarginBorder;
21-
import org.eclipse.wb.gef.core.policies.EditPolicy;
2221
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2322
import org.eclipse.wb.internal.core.gef.part.nonvisual.NonVisualBeanEditPart;
2423
import org.eclipse.wb.internal.core.gef.policy.nonvisual.NonVisualLayoutEditPolicy;
@@ -33,6 +32,7 @@
3332
import org.eclipse.draw2d.geometry.Point;
3433
import org.eclipse.draw2d.geometry.Rectangle;
3534
import org.eclipse.gef.EditPart;
35+
import org.eclipse.gef.EditPolicy;
3636

3737
import java.util.List;
3838

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/ArrayObjectEditPart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -15,10 +15,10 @@
1515
import org.eclipse.wb.core.gef.policy.selection.NonResizableSelectionEditPolicy;
1616
import org.eclipse.wb.draw2d.Figure;
1717
import org.eclipse.wb.gef.core.EditPart;
18-
import org.eclipse.wb.gef.core.policies.EditPolicy;
1918
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2019
import org.eclipse.wb.internal.core.model.nonvisual.AbstractArrayObjectInfo;
2120

21+
import org.eclipse.gef.EditPolicy;
2222
/**
2323
* {@link EditPart} for <i>array objects</i> model.
2424
*

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gef/part/nonvisual/NonVisualBeanEditPart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -17,10 +17,10 @@
1717
import org.eclipse.wb.core.model.ObjectInfo;
1818
import org.eclipse.wb.draw2d.Figure;
1919
import org.eclipse.wb.gef.core.EditPart;
20-
import org.eclipse.wb.gef.core.policies.EditPolicy;
2120
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2221
import org.eclipse.wb.internal.core.model.nonvisual.NonVisualBeanInfo;
2322

23+
import org.eclipse.gef.EditPolicy;
2424
import org.eclipse.jface.resource.ImageDescriptor;
2525

2626
/**

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/GenericContainersConfigurator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2024 Google, Inc. and others.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -15,7 +15,6 @@
1515
import org.eclipse.wb.core.gef.IEditPartConfigurator;
1616
import org.eclipse.wb.core.model.AbstractComponentInfo;
1717
import org.eclipse.wb.core.model.JavaInfo;
18-
import org.eclipse.wb.gef.core.policies.EditPolicy;
1918
import org.eclipse.wb.internal.core.DesignerPlugin;
2019
import org.eclipse.wb.internal.core.gefTree.policy.generic.FlowContainerLayoutEditPolicy;
2120
import org.eclipse.wb.internal.core.gefTree.policy.generic.SimpleContainerLayoutEditPolicy;
@@ -27,6 +26,7 @@
2726
import org.eclipse.wb.internal.core.model.nonvisual.FlowContainerGroupInfo;
2827

2928
import org.eclipse.gef.EditPart;
29+
import org.eclipse.gef.EditPolicy;
3030

3131
import org.apache.commons.lang3.StringUtils;
3232

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/gefTree/part/ArrayObjectEditPart.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -13,11 +13,12 @@
1313
package org.eclipse.wb.internal.core.gefTree.part;
1414

1515
import org.eclipse.wb.core.gefTree.part.ObjectEditPart;
16-
import org.eclipse.wb.gef.core.policies.EditPolicy;
1716
import org.eclipse.wb.gef.tree.TreeEditPart;
1817
import org.eclipse.wb.internal.core.gefTree.policy.ArrayObjectLayoutEditPolicy;
1918
import org.eclipse.wb.internal.core.model.nonvisual.AbstractArrayObjectInfo;
2019

20+
import org.eclipse.gef.EditPolicy;
21+
2122
/**
2223
* {@link TreeEditPart} for {@link AbstractArrayObjectInfo}.
2324
*

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/RequestProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011 Google, Inc.
2+
* Copyright (c) 2011, 2025 Google, Inc. and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License 2.0 which is available at
@@ -12,9 +12,9 @@
1212
*******************************************************************************/
1313
package org.eclipse.wb.gef.core;
1414

15-
import org.eclipse.wb.gef.core.policies.EditPolicy;
1615
import org.eclipse.wb.gef.core.tools.Tool;
1716

17+
import org.eclipse.gef.EditPolicy;
1818
import org.eclipse.gef.Request;
1919

2020
/**

0 commit comments

Comments
 (0)