Skip to content

Commit b2c1ad4

Browse files
ptzieglerptziegler
committed
[GEF] Switch to LayerConstants.FEEDBACK_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 3e1a4ad commit b2c1ad4

18 files changed

Lines changed: 58 additions & 58 deletions

File tree

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

Lines changed: 1 addition & 6 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
@@ -65,11 +65,6 @@ public interface IEditPartViewer extends ISelectionProvider, org.eclipse.gef.Edi
6565
* The layer directly below {@link #FEEDBACK_LAYER}.
6666
*/
6767
String FEEDBACK_LAYER_SUB_2 = "Feedback Layer Sub 2";
68-
/**
69-
* The layer containing feedback, which generally temporary visuals that appear on top of all
70-
* other visuals.
71-
*/
72-
String FEEDBACK_LAYER = "Feedback Layer";
7368
/**
7469
* The layer containing feedback figures that can accept clicks.
7570
*/

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

Lines changed: 4 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
@@ -19,6 +19,7 @@
1919
import org.eclipse.wb.gef.graphical.GraphicalEditPart;
2020

2121
import org.eclipse.draw2d.IFigure;
22+
import org.eclipse.gef.LayerConstants;
2223
import org.eclipse.gef.editparts.LayerManager;
2324

2425
/**
@@ -66,7 +67,7 @@ protected final Layer getLayer(String name) {
6667
name = IEditPartViewer.MENU_HANDLE_LAYER;
6768
} else if (name == IEditPartViewer.HANDLE_LAYER_STATIC) {
6869
name = IEditPartViewer.MENU_HANDLE_LAYER_STATIC;
69-
} else if (name == IEditPartViewer.FEEDBACK_LAYER) {
70+
} else if (name == LayerConstants.FEEDBACK_LAYER) {
7071
name = IEditPartViewer.MENU_FEEDBACK_LAYER;
7172
}
7273
}
@@ -77,7 +78,7 @@ protected final Layer getLayer(String name) {
7778
* @return the {@link Layer} for {@link IEditPartViewer#FEEDBACK_LAYER}.
7879
*/
7980
protected Layer getFeedbackLayer() {
80-
return getLayer(IEditPartViewer.FEEDBACK_LAYER);
81+
return getLayer(LayerConstants.FEEDBACK_LAYER);
8182
}
8283

8384
/**

‎org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/graphical/tools/MarqueeSelectionTool.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
@@ -24,6 +24,7 @@
2424
import org.eclipse.draw2d.IFigure;
2525
import org.eclipse.draw2d.geometry.Rectangle;
2626
import org.eclipse.gef.EditPart;
27+
import org.eclipse.gef.LayerConstants;
2728
import org.eclipse.gef.Request;
2829
import org.eclipse.gef.RequestConstants;
2930
import org.eclipse.gef.editparts.LayerManager;
@@ -279,7 +280,7 @@ private void eraseMarqueeFeedback() {
279280
* Returns feedback layer.
280281
*/
281282
private IFigure getFeedbackPane() {
282-
return LayerManager.Helper.find(getCurrentViewer()).getLayer(IEditPartViewer.FEEDBACK_LAYER);
283+
return LayerManager.Helper.find(getCurrentViewer()).getLayer(LayerConstants.FEEDBACK_LAYER);
283284
}
284285

285286
/**

‎org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/RootEditPart.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
@@ -22,6 +22,7 @@
2222

2323
import org.eclipse.draw2d.IFigure;
2424
import org.eclipse.gef.EditPartViewer;
25+
import org.eclipse.gef.LayerConstants;
2526
import org.eclipse.gef.Request;
2627
import org.eclipse.gef.editparts.LayerManager;
2728

@@ -63,7 +64,7 @@ private void createLayers() {
6364
m_rootFigure.addLayer(new Layer(IEditPartViewer.HANDLE_LAYER_STATIC));
6465
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_1));
6566
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_SUB_2));
66-
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER));
67+
m_rootFigure.addLayer(new Layer(LayerConstants.FEEDBACK_LAYER));
6768
m_rootFigure.addLayer(new Layer(IEditPartViewer.FEEDBACK_LAYER_ABV_1));
6869
m_rootFigure.addLayer(new Layer(IEditPartViewer.CLICKABLE_LAYER));
6970
m_rootFigure.addLayer(new Layer(IEditPartViewer.MENU_PRIMARY_LAYER));

‎org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/PolicyUtils.java‎

Lines changed: 6 additions & 5 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
@@ -36,6 +36,7 @@
3636
import org.eclipse.gef.EditPart;
3737
import org.eclipse.gef.EditPartViewer;
3838
import org.eclipse.gef.EditPolicy;
39+
import org.eclipse.gef.LayerConstants;
3940
import org.eclipse.gef.editparts.LayerManager;
4041

4142
import java.lang.reflect.Method;
@@ -69,7 +70,7 @@ public static void showBorderTargetFeedback(final GraphicalEditPolicy policy) {
6970
* Shows border around given {@link GraphicalEditPart} figure.
7071
*/
7172
public static void showBorderTargetFeedback(GraphicalEditPart part) {
72-
Layer feedbackLayer = (Layer) LayerManager.Helper.find(part.getViewer()).getLayer(IEditPartViewer.FEEDBACK_LAYER);
73+
Layer feedbackLayer = (Layer) LayerManager.Helper.find(part.getViewer()).getLayer(LayerConstants.FEEDBACK_LAYER);
7374
showBorderTargetFeedback(feedbackLayer, part);
7475
}
7576

@@ -169,7 +170,7 @@ public static Rectangle getAbsoluteBounds(GraphicalEditPart editPart) {
169170
////////////////////////////////////////////////////////////////////////////
170171
public static void translateAbsoluteToFeedback(GraphicalEditPolicy policy, Translatable t) {
171172
try {
172-
IFigure layer = getLayer(policy, IEditPartViewer.FEEDBACK_LAYER);
173+
IFigure layer = getLayer(policy, LayerConstants.FEEDBACK_LAYER);
173174
FigureUtils.translateAbsoluteToFigure(layer, t);
174175
} catch (Throwable e) {
175176
DesignerPlugin.log(e);
@@ -241,7 +242,7 @@ public static void translateModelToFeedback(LayoutEditPolicy policy, Translatabl
241242
// translate to layer
242243
{
243244
IFigure hostFigure = containerEditPart.getFigure();
244-
IFigure layer = getLayer(policy, IEditPartViewer.FEEDBACK_LAYER);
245+
IFigure layer = getLayer(policy, LayerConstants.FEEDBACK_LAYER);
245246
FigureUtils.translateFigureToFigure2(hostFigure, layer, t);
246247
}
247248
} catch (Throwable e) {
@@ -261,7 +262,7 @@ public static void translateModelToFeedback(SelectionEditPolicy policy, Translat
261262
// translate to layer
262263
{
263264
IFigure hostFigure = containerEditPart.getFigure();
264-
IFigure layer = getLayer(policy, IEditPartViewer.FEEDBACK_LAYER);
265+
IFigure layer = getLayer(policy, LayerConstants.FEEDBACK_LAYER);
265266
FigureUtils.translateFigureToFigure2(hostFigure, layer, t);
266267
}
267268
} catch (Throwable e) {

‎org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/ColumnsLayoutEditPolicy.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
@@ -19,7 +19,6 @@
1919
import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo;
2020
import org.eclipse.wb.draw2d.FigureUtils;
2121
import org.eclipse.wb.draw2d.Layer;
22-
import org.eclipse.wb.gef.core.IEditPartViewer;
2322
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
2423
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
2524
import org.eclipse.wb.internal.rcp.gef.GefMessages;
@@ -37,6 +36,7 @@
3736
import org.eclipse.draw2d.geometry.Rectangle;
3837
import org.eclipse.gef.EditPart;
3938
import org.eclipse.gef.EditPolicy;
39+
import org.eclipse.gef.LayerConstants;
4040
import org.eclipse.gef.Request;
4141
import org.eclipse.gef.commands.Command;
4242
import org.eclipse.gef.requests.DropRequest;
@@ -172,7 +172,7 @@ protected void showLayoutTargetFeedback(Request request) {
172172
}
173173
// show text feedback
174174
{
175-
Layer feedbackLayer = getMainLayer(IEditPartViewer.FEEDBACK_LAYER);
175+
Layer feedbackLayer = getMainLayer(LayerConstants.FEEDBACK_LAYER);
176176
// add feedback
177177
if (m_feedback == null) {
178178
m_feedback = new TextFeedback(feedbackLayer);

‎org.eclipse.wb.rcp/src/org/eclipse/wb/internal/rcp/gef/policy/forms/layout/grid/header/layout/RowsLayoutEditPolicy.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
@@ -19,7 +19,6 @@
1919
import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo;
2020
import org.eclipse.wb.draw2d.FigureUtils;
2121
import org.eclipse.wb.draw2d.Layer;
22-
import org.eclipse.wb.gef.core.IEditPartViewer;
2322
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
2423
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
2524
import org.eclipse.wb.internal.rcp.gef.GefMessages;
@@ -37,6 +36,7 @@
3736
import org.eclipse.draw2d.geometry.Rectangle;
3837
import org.eclipse.gef.EditPart;
3938
import org.eclipse.gef.EditPolicy;
39+
import org.eclipse.gef.LayerConstants;
4040
import org.eclipse.gef.Request;
4141
import org.eclipse.gef.commands.Command;
4242
import org.eclipse.gef.requests.DropRequest;
@@ -170,7 +170,7 @@ protected void showLayoutTargetFeedback(Request request) {
170170
}
171171
// show text feedback
172172
{
173-
Layer feedbackLayer = getMainLayer(IEditPartViewer.FEEDBACK_LAYER);
173+
Layer feedbackLayer = getMainLayer(LayerConstants.FEEDBACK_LAYER);
174174
// add feedback
175175
if (m_feedback == null) {
176176
m_feedback = new TextFeedback(feedbackLayer);

‎org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/ColumnsLayoutEditPolicy.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
@@ -19,7 +19,6 @@
1919
import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo;
2020
import org.eclipse.wb.draw2d.FigureUtils;
2121
import org.eclipse.wb.draw2d.Layer;
22-
import org.eclipse.wb.gef.core.IEditPartViewer;
2322
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
2423
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
2524
import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy;
@@ -35,6 +34,7 @@
3534
import org.eclipse.draw2d.geometry.Rectangle;
3635
import org.eclipse.gef.EditPart;
3736
import org.eclipse.gef.EditPolicy;
37+
import org.eclipse.gef.LayerConstants;
3838
import org.eclipse.gef.Request;
3939
import org.eclipse.gef.commands.Command;
4040
import org.eclipse.gef.requests.DropRequest;
@@ -165,7 +165,7 @@ protected void showLayoutTargetFeedback(Request request) {
165165
}
166166
// show text feedback
167167
{
168-
Layer feedbackLayer = getMainLayer(IEditPartViewer.FEEDBACK_LAYER);
168+
Layer feedbackLayer = getMainLayer(LayerConstants.FEEDBACK_LAYER);
169169
// add feedback
170170
if (m_feedback == null) {
171171
m_feedback = new TextFeedback(feedbackLayer);

‎org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/layout/RowsLayoutEditPolicy.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
@@ -19,7 +19,6 @@
1919
import org.eclipse.wb.core.gef.policy.layout.grid.IGridInfo;
2020
import org.eclipse.wb.draw2d.FigureUtils;
2121
import org.eclipse.wb.draw2d.Layer;
22-
import org.eclipse.wb.gef.core.IEditPartViewer;
2322
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
2423
import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
2524
import org.eclipse.wb.internal.swing.FormLayout.gef.FormLayoutEditPolicy;
@@ -35,6 +34,7 @@
3534
import org.eclipse.draw2d.geometry.Rectangle;
3635
import org.eclipse.gef.EditPart;
3736
import org.eclipse.gef.EditPolicy;
37+
import org.eclipse.gef.LayerConstants;
3838
import org.eclipse.gef.Request;
3939
import org.eclipse.gef.commands.Command;
4040
import org.eclipse.gef.requests.DropRequest;
@@ -165,7 +165,7 @@ protected void showLayoutTargetFeedback(Request request) {
165165
}
166166
// show text feedback
167167
{
168-
Layer feedbackLayer = getMainLayer(IEditPartViewer.FEEDBACK_LAYER);
168+
Layer feedbackLayer = getMainLayer(LayerConstants.FEEDBACK_LAYER);
169169
// add feedback
170170
if (m_feedback == null) {
171171
m_feedback = new TextFeedback(feedbackLayer);

‎org.eclipse.wb.swing.FormLayout/src/org/eclipse/wb/internal/swing/FormLayout/gef/header/selection/DimensionSelectionEditPolicy.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
@@ -17,7 +17,6 @@
1717
import org.eclipse.wb.draw2d.FigureUtils;
1818
import org.eclipse.wb.draw2d.Layer;
1919
import org.eclipse.wb.draw2d.border.LineBorder;
20-
import org.eclipse.wb.gef.core.IEditPartViewer;
2120
import org.eclipse.wb.gef.core.requests.ChangeBoundsRequest;
2221
import org.eclipse.wb.gef.core.requests.KeyRequest;
2322
import org.eclipse.wb.gef.graphical.handles.Handle;
@@ -33,6 +32,7 @@
3332
import org.eclipse.draw2d.Locator;
3433
import org.eclipse.draw2d.geometry.Point;
3534
import org.eclipse.draw2d.geometry.Rectangle;
35+
import org.eclipse.gef.LayerConstants;
3636
import org.eclipse.gef.Request;
3737
import org.eclipse.gef.commands.Command;
3838
import org.eclipse.swt.SWT;
@@ -177,7 +177,7 @@ public void showSourceFeedback(Request request) {
177177
}
178178
// text feedback
179179
{
180-
Layer feedbackLayer = getMainLayer(IEditPartViewer.FEEDBACK_LAYER);
180+
Layer feedbackLayer = getMainLayer(LayerConstants.FEEDBACK_LAYER);
181181
// add feedback
182182
if (m_feedback == null) {
183183
m_feedback = new ResizeHintFigure();

0 commit comments

Comments
 (0)