[GEF] Generalize IHeadersProvider to provide generic GEF edit parts

ptziegler · Apr 30, 2024 · baf41bc · baf41bc
1 parent 239be46
commit baf41bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/IHeadersProvider.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/header/IHeadersProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wb.core.gef.header;
 
-import org.eclipse.wb.gef.core.EditPart;
 import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
 import org.eclipse.wb.internal.gef.graphical.HeaderGraphicalViewer;
 
+import org.eclipse.gef.EditPart;
 import org.eclipse.jface.action.IMenuManager;
 
 import java.util.List;

diff --git a/...eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java b/...eclipse.wb.core/src/org/eclipse/wb/internal/core/gef/header/HeadersContainerEditPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 Google, Inc.
+ * Copyright (c) 2011, 2024 Google, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,13 +14,13 @@
 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.EditPart;
 import org.eclipse.wb.gef.core.IEditPartViewer;
 import org.eclipse.wb.gef.graphical.GraphicalEditPart;
 import org.eclipse.wb.internal.gef.graphical.GraphicalViewer;
 
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;
@@ -174,9 +174,9 @@ private void doRefreshHeaders() {
 	 */
 	private IHeadersProvider getHeadersProvider() {
 		// prepare selected EditPart
-		EditPart selectedEditPart;
+		org.eclipse.wb.gef.core.EditPart selectedEditPart;
 		{
-			List<EditPart> selectedEditParts = m_viewer.getSelectedEditParts();
+			List<org.eclipse.wb.gef.core.EditPart> selectedEditParts = m_viewer.getSelectedEditParts();
 			if (selectedEditParts.size() != 1) {
 				return null;
 			}
@@ -187,7 +187,7 @@ private IHeadersProvider getHeadersProvider() {
 		}
 		// get provider from container of selected EditPart
 		{
-			EditPart containerEditPart = selectedEditPart.getParent();
+			org.eclipse.wb.gef.core.EditPart containerEditPart = selectedEditPart.getParent();
 			if (containerEditPart != null) {
 				IHeadersProvider headersProvider = getHeadersProvider(containerEditPart);
 				if (headersProvider != null) {
@@ -210,7 +210,7 @@ private IHeadersProvider getHeadersProvider() {
 	 * @return the {@link IHeadersProvider} implemented by one of the {@link EditPolicy} of given
 	 *         {@link EditPart}.
 	 */
-	private static IHeadersProvider getHeadersProvider(EditPart editPart) {
+	private static IHeadersProvider getHeadersProvider(org.eclipse.wb.gef.core.EditPart editPart) {
 		// find policy that implements IHeadersProvider
 		for (EditPolicy editPolicy : editPart.getEditPolicies()) {
 			if (editPolicy instanceof IHeadersProvider headersProvider && headersProvider.isActive()) {