Skip to content

[GEF] Switch to LayerConstants.HANDLE_LAYER #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Jan 26, 2026
Merged

[GEF] Switch to LayerConstants.HANDLE_LAYER #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/IEditPartViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ public interface IEditPartViewer extends ISelectionProvider, org.eclipse.gef.Edi
* The layer directly below {@link #HANDLE_LAYER}.
*/
String HANDLE_LAYER_SUB_2 = "Handle Layer Sub 2";
/**
* Identifies the layer containing handles, which are typically editing decorations that appear on
* top of any model representations.
*/
String HANDLE_LAYER = "Handle Layer";
/**
* The layer directly below {@link #HANDLE_LAYER}.
*/
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/GraphicalEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected final IFigure getHostFigure() {
//@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ")
protected final Layer getLayer(String name) {
if (isOnMenuLayer()) {
if (name == IEditPartViewer.HANDLE_LAYER) {
if (name == LayerConstants.HANDLE_LAYER) {
name = IEditPartViewer.MENU_HANDLE_LAYER;
} else if (name == IEditPartViewer.HANDLE_LAYER_STATIC) {
name = IEditPartViewer.MENU_HANDLE_LAYER_STATIC;
Expand Down
5 changes: 3 additions & 2 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/policies/SelectionEditPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,7 @@

import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;

Expand Down Expand Up @@ -122,7 +123,7 @@ protected void hideStaticHandles() {
*/
protected void showSelection() {
hideSelection();
Layer layer = getLayer(IEditPartViewer.HANDLE_LAYER);
Layer layer = getLayer(LayerConstants.HANDLE_LAYER);
m_handles = createSelectionHandles();
for (Handle handle : m_handles) {
layer.add(handle);
Expand Down
3 changes: 2 additions & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/GraphicalViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Handle;
import org.eclipse.gef.LayerConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.widgets.Composite;
Expand Down Expand Up @@ -218,7 +219,7 @@ public Handle findHandleAt(Point p) {
if ((target = findTargetHandle(HANDLE_LAYER_STATIC, p)) != null) {
return target;
}
if ((target = findTargetHandle(HANDLE_LAYER, p)) != null) {
if ((target = findTargetHandle(LayerConstants.HANDLE_LAYER, p)) != null) {
return target;
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void createLayers() {
m_rootFigure.addLayer(new Layer(IEditPartViewer.PRIMARY_LAYER));
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_SUB_1));
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_SUB_2));
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER));
m_rootFigure.addLayer(new Layer(LayerConstants.HANDLE_LAYER));
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_STATIC));
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_1));
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_2));
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/SelectionToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,14 +12,14 @@
*******************************************************************************/
package org.eclipse.wb.tests.gef;

import org.eclipse.wb.gef.core.IEditPartViewer;
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
import org.eclipse.wb.gef.core.requests.DragPermissionRequest;
import org.eclipse.wb.gef.core.tools.Tool;
import org.eclipse.wb.gef.graphical.handles.MoveHandle;
import org.eclipse.wb.gef.graphical.tools.SelectionTool;

import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.editparts.LayerManager;
import org.eclipse.gef.requests.SelectionRequest;
Expand Down Expand Up @@ -231,7 +231,7 @@ public void test_DragTracker_MoveHandle() throws Exception {
addEditPart(editPart, "ChildEditPart", actualLogger, 50, 50, 70, 50);
//
MoveHandle handle = new MoveHandle(childEditPart);
LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.HANDLE_LAYER).add(handle);
LayerManager.Helper.find(m_viewer).getLayer(LayerConstants.HANDLE_LAYER).add(handle);
//
RequestsLogger expectedLogger = new RequestsLogger();
//
Expand Down
Loading