Skip to content

Commit 89c4f02

Browse files
committed
[GEF] Switch to LayerConstants.HANDLE_LAYER
This constant is identical to the one defined by the IEditPartViewer. No need to keep two fields that serve the same purpose.
1 parent b2c1ad4 commit 89c4f02

6 files changed

Lines changed: 10 additions & 13 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ public interface IEditPartViewer extends ISelectionProvider, org.eclipse.gef.Edi
4444
* The layer directly below {@link #HANDLE_LAYER}.
4545
*/
4646
String HANDLE_LAYER_SUB_2 = "Handle Layer Sub 2";
47-
/**
48-
* Identifies the layer containing handles, which are typically editing decorations that appear on
49-
* top of any model representations.
50-
*/
51-
String HANDLE_LAYER = "Handle Layer";
5247
/**
5348
* The layer directly below {@link #HANDLE_LAYER}.
5449
*/

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected final IFigure getHostFigure() {
6363
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ")
6464
protected final Layer getLayer(String name) {
6565
if (isOnMenuLayer()) {
66-
if (name == IEditPartViewer.HANDLE_LAYER) {
66+
if (name == LayerConstants.HANDLE_LAYER) {
6767
name = IEditPartViewer.MENU_HANDLE_LAYER;
6868
} else if (name == IEditPartViewer.HANDLE_LAYER_STATIC) {
6969
name = IEditPartViewer.MENU_HANDLE_LAYER_STATIC;

org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2025 Google, Inc. and others.
2+
* Copyright (c) 2011, 2026 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
@@ -20,6 +20,7 @@
2020

2121
import org.eclipse.gef.EditPartListener;
2222
import org.eclipse.gef.EditPolicy;
23+
import org.eclipse.gef.LayerConstants;
2324
import org.eclipse.gef.Request;
2425
import org.eclipse.gef.RequestConstants;
2526

@@ -122,7 +123,7 @@ protected void hideStaticHandles() {
122123
*/
123124
protected void showSelection() {
124125
hideSelection();
125-
Layer layer = getLayer(IEditPartViewer.HANDLE_LAYER);
126+
Layer layer = getLayer(LayerConstants.HANDLE_LAYER);
126127
m_handles = createSelectionHandles();
127128
for (Handle handle : m_handles) {
128129
layer.add(handle);

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.draw2d.geometry.Point;
2626
import org.eclipse.gef.EditPart;
2727
import org.eclipse.gef.Handle;
28+
import org.eclipse.gef.LayerConstants;
2829
import org.eclipse.swt.SWT;
2930
import org.eclipse.swt.graphics.Cursor;
3031
import org.eclipse.swt.widgets.Composite;
@@ -218,7 +219,7 @@ public Handle findHandleAt(Point p) {
218219
if ((target = findTargetHandle(HANDLE_LAYER_STATIC, p)) != null) {
219220
return target;
220221
}
221-
if ((target = findTargetHandle(HANDLE_LAYER, p)) != null) {
222+
if ((target = findTargetHandle(LayerConstants.HANDLE_LAYER, p)) != null) {
222223
return target;
223224
}
224225
return null;

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void createLayers() {
6060
m_rootFigure.addLayer(new Layer(IEditPartViewer.PRIMARY_LAYER));
6161
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_SUB_1));
6262
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_SUB_2));
63-
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER));
63+
m_rootFigure.addLayer(new Layer(LayerConstants.HANDLE_LAYER));
6464
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_STATIC));
6565
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_1));
6666
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_2));

org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2025 Google, Inc. and others.
2+
* Copyright (c) 2011, 2026 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,14 +12,14 @@
1212
*******************************************************************************/
1313
package org.eclipse.wb.tests.gef;
1414

15-
import org.eclipse.wb.gef.core.IEditPartViewer;
1615
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
1716
import org.eclipse.wb.gef.core.requests.DragPermissionRequest;
1817
import org.eclipse.wb.gef.core.tools.Tool;
1918
import org.eclipse.wb.gef.graphical.handles.MoveHandle;
2019
import org.eclipse.wb.gef.graphical.tools.SelectionTool;
2120

2221
import org.eclipse.draw2d.geometry.Point;
22+
import org.eclipse.gef.LayerConstants;
2323
import org.eclipse.gef.RequestConstants;
2424
import org.eclipse.gef.editparts.LayerManager;
2525
import org.eclipse.gef.requests.SelectionRequest;
@@ -231,7 +231,7 @@ public void test_DragTracker_MoveHandle() throws Exception {
231231
addEditPart(editPart, "ChildEditPart", actualLogger, 50, 50, 70, 50);
232232
//
233233
MoveHandle handle = new MoveHandle(childEditPart);
234-
LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.HANDLE_LAYER).add(handle);
234+
LayerManager.Helper.find(m_viewer).getLayer(LayerConstants.HANDLE_LAYER).add(handle);
235235
//
236236
RequestsLogger expectedLogger = new RequestsLogger();
237237
//

0 commit comments

Comments
 (0)