[GEF] Switch to LayerConstants.PRIMARY_LAYER

This constant is identical to the one defined by the IEditPartViewer. No
need to keep two fields that serve the same purpose.

Author: ptziegler

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

@@ -32,10 +32,6 @@ public interface IEditPartViewer extends ISelectionProvider, org.eclipse.gef.Edi
 	 * The layer directly below {@link #PRIMARY_LAYER}.
 	 */
 	String PRIMARY_LAYER_SUB_1 = "Primary Layer Sub 1";
-	/**
-	 * Identifies the layer containing the primary pieces of the application.
-	 */
-	String PRIMARY_LAYER = "Primary Layer";
 	/**
 	 * The layer directly below {@link #HANDLE_LAYER}.
 	 */

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

@@ -156,7 +156,7 @@ public EditPart findObjectAtExcluding(Point location,
 			final Conditional conditional) {
 		EditPart editPart = findObjectAtExcluding(location, exclude, conditional, MENU_PRIMARY_LAYER);
 		if (editPart == null) {
-			editPart = findObjectAtExcluding(location, exclude, conditional, PRIMARY_LAYER);
+			editPart = findObjectAtExcluding(location, exclude, conditional, LayerConstants.PRIMARY_LAYER);
 		}
 		return editPart;
 	}

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

@@ -57,7 +57,7 @@ public RootEditPart(IRootFigure rootFigure) {
 	////////////////////////////////////////////////////////////////////////////
 	private void createLayers() {
 		m_rootFigure.addLayer(new Layer(IEditPartViewer.PRIMARY_LAYER_SUB_1));
-		m_rootFigure.addLayer(new Layer(IEditPartViewer.PRIMARY_LAYER));
+		m_rootFigure.addLayer(new Layer(LayerConstants.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(LayerConstants.HANDLE_LAYER));
@@ -106,7 +106,7 @@ public void setViewer(EditPartViewer viewer) {
 	 */
 	@Override
 	public IFigure getContentPane() {
-		return m_rootFigure.getLayer(IEditPartViewer.PRIMARY_LAYER);
+		return m_rootFigure.getLayer(LayerConstants.PRIMARY_LAYER);
 	}
 
 	/**

org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.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
@@ -16,7 +16,6 @@
 import org.eclipse.wb.core.gef.header.IHeadersProvider;
 import org.eclipse.wb.core.gef.policy.selection.EmptySelectionEditPolicy;
 import org.eclipse.wb.draw2d.Figure;
-import org.eclipse.wb.gef.core.IEditPartViewer;
 import org.eclipse.wb.gef.graphical.GraphicalEditPart;
 import org.eclipse.wb.internal.gef.graphical.GraphicalViewer;
 
@@ -25,6 +24,7 @@
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.LayerConstants;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;
 import org.eclipse.gef.editparts.LayerManager;
@@ -105,7 +105,7 @@ protected void refreshVisuals() {
 			// prepare viewer size
 			org.eclipse.swt.graphics.Point size = viewer.getControl().getSize();
 			// prepare main viewer size
-			Dimension mainSize = LayerManager.Helper.find(m_viewer).getLayer(IEditPartViewer.PRIMARY_LAYER).getSize();
+			Dimension mainSize = LayerManager.Helper.find(m_viewer).getLayer(LayerConstants.PRIMARY_LAYER).getSize();
 			// set bounds
 			if (m_horizontal) {
 				getFigure().setBounds(new Rectangle(0, 0, mainSize.width, size.y));

org.eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/part/menu/MacMenuEditPart.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
@@ -15,12 +15,12 @@
 import org.eclipse.wb.core.gef.part.menu.MenuEditPartFactory;
 import org.eclipse.wb.draw2d.Figure;
 import org.eclipse.wb.draw2d.FigureUtils;
-import org.eclipse.wb.gef.core.IEditPartViewer;
 import org.eclipse.wb.gef.graphical.GraphicalEditPart;
 import org.eclipse.wb.internal.core.model.menu.IMenuInfo;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.LayerConstants;
 import org.eclipse.gef.editparts.LayerManager;
 
 /**
@@ -67,7 +67,7 @@ protected void refreshVisuals() {
 	@Override
 	protected boolean addSelfVisual(int index) {
 		if (!isSubMenu()) {
-			LayerManager.Helper.find(getViewer()).getLayer(IEditPartViewer.PRIMARY_LAYER).add(getFigure());
+			LayerManager.Helper.find(getViewer()).getLayer(LayerConstants.PRIMARY_LAYER).add(getFigure());
 			m_addedSelf = true;
 			// add invisible fake figure to the content pane to keep index right
 			GraphicalEditPart parent = (GraphicalEditPart) getParent();
@@ -79,7 +79,7 @@ protected boolean addSelfVisual(int index) {
 	@Override
 	protected boolean removeSelfVisual() {
 		if (m_addedSelf) {
-			LayerManager.Helper.find(getViewer()).getLayer(IEditPartViewer.PRIMARY_LAYER).remove(getFigure());
+			LayerManager.Helper.find(getViewer()).getLayer(LayerConstants.PRIMARY_LAYER).remove(getFigure());
 			FigureUtils.removeFigure(getFakeFigure());
 			m_addedSelf = false;
 			return true;