Skip to content

Commit 96edb3c

Browse files
committed
[GEF] Harmonize EditDomain event methods
Rename the mouse/key/viewer methods so that their names match the ones defined by the GEF interface.
1 parent 181f377 commit 96edb3c

3 files changed

Lines changed: 30 additions & 70 deletions

File tree

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

Lines changed: 24 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 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,13 +13,12 @@
1313
package org.eclipse.wb.internal.gef.core;
1414

1515
import org.eclipse.wb.gef.core.ICommandExceptionHandler;
16-
import org.eclipse.wb.gef.core.IEditPartViewer;
1716
import org.eclipse.wb.gef.core.tools.Tool;
1817
import org.eclipse.wb.gef.graphical.tools.SelectionTool;
1918

2019
import org.eclipse.draw2d.EventListenerList;
20+
import org.eclipse.gef.EditPartViewer;
2121
import org.eclipse.gef.commands.Command;
22-
import org.eclipse.swt.events.KeyEvent;
2322
import org.eclipse.swt.events.MouseEvent;
2423

2524
/**
@@ -29,7 +28,7 @@
2928
public class EditDomain extends org.eclipse.gef.EditDomain {
3029
private Tool m_activeTool;
3130
private Tool m_defaultTool;
32-
private IEditPartViewer m_currentViewer;
31+
private EditPartViewer m_currentViewer;
3332
private MouseEvent m_currentMouseEvent;
3433
private ICommandExceptionHandler m_exceptionHandler;
3534

@@ -197,31 +196,6 @@ public void setActiveTool(org.eclipse.gef.Tool activeTool) {
197196
}
198197
}
199198

200-
////////////////////////////////////////////////////////////////////////////
201-
//
202-
// Handle key events
203-
//
204-
////////////////////////////////////////////////////////////////////////////
205-
/**
206-
* Called when the key has been pressed on a viewer.
207-
*/
208-
public void keyPressed(KeyEvent event, IEditPartViewer viewer) {
209-
Tool tool = getActiveTool();
210-
if (tool != null) {
211-
tool.keyDown(event, viewer);
212-
}
213-
}
214-
215-
/**
216-
* Called when the key has been released on a viewer.
217-
*/
218-
public void keyReleased(KeyEvent event, IEditPartViewer viewer) {
219-
Tool tool = getActiveTool();
220-
if (tool != null) {
221-
tool.keyUp(event, viewer);
222-
}
223-
}
224-
225199
////////////////////////////////////////////////////////////////////////////
226200
//
227201
// Handle mouse events
@@ -230,79 +204,65 @@ public void keyReleased(KeyEvent event, IEditPartViewer viewer) {
230204
/**
231205
* Called when the mouse button has been double-clicked on a viewer.
232206
*/
233-
public void mouseDoubleClick(MouseEvent event, IEditPartViewer viewer) {
207+
@Override
208+
public void mouseDoubleClick(MouseEvent event, EditPartViewer viewer) {
234209
m_currentMouseEvent = event;
235-
Tool tool = getActiveTool();
236-
if (tool != null) {
237-
tool.mouseDoubleClick(event, viewer);
238-
}
210+
super.mouseDoubleClick(event, viewer);
239211
}
240212

241213
/**
242214
* Called when the mouse button has been pressed on a viewer.
243215
*/
244-
public void mouseDown(MouseEvent event, IEditPartViewer viewer) {
216+
@Override
217+
public void mouseDown(MouseEvent event, EditPartViewer viewer) {
245218
m_currentMouseEvent = event;
246-
Tool tool = getActiveTool();
247-
if (tool != null) {
248-
tool.mouseDown(event, viewer);
249-
}
219+
super.mouseDown(event, viewer);
250220
}
251221

252222
/**
253223
* Called when the mouse button has been released on a viewer.
254224
*/
255-
public void mouseUp(MouseEvent event, IEditPartViewer viewer) {
225+
@Override
226+
public void mouseUp(MouseEvent event, EditPartViewer viewer) {
256227
m_currentMouseEvent = event;
257-
Tool tool = getActiveTool();
258-
if (tool != null) {
259-
tool.mouseUp(event, viewer);
260-
}
228+
super.mouseUp(event, viewer);
261229
}
262230

263231
/**
264232
* Called when the mouse has been moved on a viewer.
265233
*/
266-
public void mouseMove(MouseEvent event, IEditPartViewer viewer) {
234+
@Override
235+
public void mouseMove(MouseEvent event, EditPartViewer viewer) {
267236
m_currentMouseEvent = event;
268-
Tool tool = getActiveTool();
269-
if (tool != null) {
270-
tool.mouseMove(event, viewer);
271-
}
237+
super.mouseMove(event, viewer);
272238
}
273239

274240
/**
275241
* Called when the mouse has been dragged within a viewer.
276242
*/
277-
public void mouseDrag(MouseEvent event, IEditPartViewer viewer) {
243+
@Override
244+
public void mouseDrag(MouseEvent event, EditPartViewer viewer) {
278245
m_currentMouseEvent = event;
279-
Tool tool = getActiveTool();
280-
if (tool != null) {
281-
tool.mouseDrag(event, viewer);
282-
}
246+
super.mouseDrag(event, viewer);
283247
}
284248

285249
/**
286250
* Called when the mouse enters a viewer.
287251
*/
288-
public void viewerEntered(MouseEvent event, IEditPartViewer viewer) {
252+
@Override
253+
public void viewerEntered(MouseEvent event, EditPartViewer viewer) {
289254
m_currentMouseEvent = event;
290255
m_currentViewer = viewer;
291-
Tool tool = getActiveTool();
292-
if (tool != null) {
293-
tool.viewerEntered(event, viewer);
294-
}
256+
super.viewerEntered(event, viewer);
295257
}
296258

297259
/**
298260
* Called when the mouse exits a viewer.
299261
*/
300-
public void viewerExited(MouseEvent event, IEditPartViewer viewer) {
262+
@Override
263+
public void viewerExited(MouseEvent event, EditPartViewer viewer) {
301264
m_currentMouseEvent = event;
302265
m_currentViewer = null;
303-
Tool tool = getActiveTool();
304-
if (tool != null) {
305-
tool.viewerExited(event, viewer);
306-
}
266+
super.viewerExited(event, viewer);
307267
}
308268
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 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
@@ -91,12 +91,12 @@ public void setOverrideCursor(Cursor cursor) {
9191
////////////////////////////////////////////////////////////////////////////
9292
@Override
9393
public void dispatchKeyPressed(KeyEvent event) {
94-
m_domain.keyPressed(event, m_viewer);
94+
m_domain.keyDown(event, m_viewer);
9595
}
9696

9797
@Override
9898
public void dispatchKeyReleased(KeyEvent event) {
99-
m_domain.keyReleased(event, m_viewer);
99+
m_domain.keyUp(event, m_viewer);
100100
}
101101

102102
////////////////////////////////////////////////////////////////////////////

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2011, 2023 Google, Inc.
2+
* Copyright (c) 2011, 2025 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
@@ -81,14 +81,14 @@ public void setDomain(EditDomain domain) {
8181
@Override
8282
public void keyPressed(KeyEvent event) {
8383
if (m_domain != null) {
84-
m_domain.keyPressed(event, m_viewer);
84+
m_domain.keyDown(event, m_viewer);
8585
}
8686
}
8787

8888
@Override
8989
public void keyReleased(KeyEvent event) {
9090
if (m_domain != null) {
91-
m_domain.keyReleased(event, m_viewer);
91+
m_domain.keyUp(event, m_viewer);
9292
}
9393
}
9494

0 commit comments

Comments
 (0)