Skip to content

Commit c8b32c2

Browse files
committed
[GEF] Remove duplicate EditDomain and EditPartFactory fields
Use the fields of the GEF viewer to get rid of the duplicate setters. The getter have to remain overridden, in order to cast the objects to the WindowBuilder types.
1 parent c6f3515 commit c8b32c2

File tree

5 files changed

+8
-34
lines changed

5 files changed

+8
-34
lines changed

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/AbstractEditPartViewer.java

Lines changed: 3 additions & 29 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
@@ -13,7 +13,6 @@
1313
*******************************************************************************/
1414
package org.eclipse.wb.internal.gef.core;
1515

16-
import org.eclipse.wb.gef.core.IEditPartFactory;
1716
import org.eclipse.wb.gef.core.IEditPartViewer;
1817

1918
import org.eclipse.core.runtime.Assert;
@@ -39,8 +38,6 @@
3938
* @coverage gef.core
4039
*/
4140
public abstract class AbstractEditPartViewer extends org.eclipse.gef.ui.parts.AbstractEditPartViewer implements IEditPartViewer {
42-
private EditDomain m_domain;
43-
private IEditPartFactory m_factory;
4441
private MenuManager m_contextMenu;
4542
private List<EditPart> m_selectionList = new ArrayList<>();
4643
private EventListenerList m_eventTable;
@@ -55,43 +52,20 @@ public abstract class AbstractEditPartViewer extends org.eclipse.gef.ui.parts.Ab
5552
//
5653
////////////////////////////////////////////////////////////////////////////
5754

58-
/**
59-
* Get factory for creating new EditParts.
60-
*/
61-
@Override
62-
public IEditPartFactory getEditPartFactory() {
63-
return m_factory;
64-
}
65-
66-
/**
67-
* Set factory for creating new EditParts.
68-
*/
69-
public void setEditPartFactory(IEditPartFactory factory) {
70-
m_factory = factory;
71-
}
72-
7355
/**
7456
* Returns the {@link EditDomain EditDomain} to which this viewer belongs.
7557
*/
7658
@Override
7759
public EditDomain getEditDomain() {
78-
return m_domain;
79-
}
80-
81-
/**
82-
* Sets the <code>{@link EditDomain}</code> for this viewer. The Viewer will route all mouse and
83-
* keyboard events to the {@link EditDomain}.
84-
*/
85-
public void setEditDomain(EditDomain domain) {
86-
m_domain = domain;
60+
return (EditDomain) super.getEditDomain();
8761
}
8862

8963
/**
9064
* Set input model for this viewer.
9165
*/
9266
public void setInput(Object model) {
9367
RootEditPart rootEditPart = getRootEditPart();
94-
EditPart contentEditPart = m_factory.createEditPart(rootEditPart, model);
68+
EditPart contentEditPart = getEditPartFactory().createEditPart(rootEditPart, model);
9569
rootEditPart.setContents(contentEditPart);
9670
}
9771

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

Lines changed: 2 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
@@ -15,8 +15,8 @@
1515
import org.eclipse.wb.gef.core.IEditPartViewer;
1616
import org.eclipse.wb.internal.draw2d.EventManager;
1717
import org.eclipse.wb.internal.draw2d.FigureCanvas;
18-
import org.eclipse.wb.internal.gef.core.EditDomain;
1918

19+
import org.eclipse.gef.EditDomain;
2020
import org.eclipse.swt.SWT;
2121
import org.eclipse.swt.events.KeyEvent;
2222
import org.eclipse.swt.events.MouseEvent;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import org.eclipse.wb.internal.draw2d.IRootFigure;
1818
import org.eclipse.wb.internal.draw2d.RootFigure;
1919
import org.eclipse.wb.internal.gef.core.AbstractEditPartViewer;
20-
import org.eclipse.wb.internal.gef.core.EditDomain;
2120

2221
import org.eclipse.draw2d.ExclusionSearch;
2322
import org.eclipse.draw2d.IFigure;
2423
import org.eclipse.draw2d.TreeSearch;
2524
import org.eclipse.draw2d.geometry.Point;
25+
import org.eclipse.gef.EditDomain;
2626
import org.eclipse.gef.EditPart;
2727
import org.eclipse.gef.Handle;
2828
import org.eclipse.gef.LayerConstants;

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package org.eclipse.wb.internal.gef.tree;
1414

1515
import org.eclipse.wb.gef.core.IEditPartViewer;
16-
import org.eclipse.wb.internal.gef.core.EditDomain;
1716
import org.eclipse.wb.internal.gef.tree.dnd.TreeDropListener;
1817
import org.eclipse.wb.internal.gef.tree.dnd.TreeTransfer;
1918

19+
import org.eclipse.gef.EditDomain;
2020
import org.eclipse.swt.SWT;
2121
import org.eclipse.swt.dnd.DND;
2222
import org.eclipse.swt.dnd.DragSource;

org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeViewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import org.eclipse.wb.gef.tree.TreeEditPart;
1616
import org.eclipse.wb.internal.gef.core.AbstractEditPartViewer;
17-
import org.eclipse.wb.internal.gef.core.EditDomain;
1817

1918
import org.eclipse.draw2d.geometry.Point;
19+
import org.eclipse.gef.EditDomain;
2020
import org.eclipse.gef.EditPart;
2121
import org.eclipse.jface.viewers.ISelectionChangedListener;
2222
import org.eclipse.jface.viewers.SelectionChangedEvent;

0 commit comments

Comments
 (0)