Skip to content

[GEF] Harmonize EditDomain event methods #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

[GEF] Harmonize EditDomain event methods #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 24 additions & 64 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/EditDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2023 Google, Inc.
* Copyright (c) 2011, 2025 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
Expand All @@ -13,13 +13,12 @@
package org.eclipse.wb.internal.gef.core;

import org.eclipse.wb.gef.core.ICommandExceptionHandler;
import org.eclipse.wb.gef.core.IEditPartViewer;
import org.eclipse.wb.gef.core.tools.Tool;
import org.eclipse.wb.gef.graphical.tools.SelectionTool;

import org.eclipse.draw2d.EventListenerList;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.commands.Command;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.MouseEvent;

/**
Expand All @@ -29,7 +28,7 @@
public class EditDomain extends org.eclipse.gef.EditDomain {
private Tool m_activeTool;
private Tool m_defaultTool;
private IEditPartViewer m_currentViewer;
private EditPartViewer m_currentViewer;
private MouseEvent m_currentMouseEvent;
private ICommandExceptionHandler m_exceptionHandler;

Expand Down Expand Up @@ -197,31 +196,6 @@ public void setActiveTool(org.eclipse.gef.Tool activeTool) {
}
}

////////////////////////////////////////////////////////////////////////////
//
// Handle key events
//
////////////////////////////////////////////////////////////////////////////
/**
* Called when the key has been pressed on a viewer.
*/
public void keyPressed(KeyEvent event, IEditPartViewer viewer) {
Tool tool = getActiveTool();
if (tool != null) {
tool.keyDown(event, viewer);
}
}

/**
* Called when the key has been released on a viewer.
*/
public void keyReleased(KeyEvent event, IEditPartViewer viewer) {
Tool tool = getActiveTool();
if (tool != null) {
tool.keyUp(event, viewer);
}
}

////////////////////////////////////////////////////////////////////////////
//
// Handle mouse events
Expand All @@ -230,79 +204,65 @@ public void keyReleased(KeyEvent event, IEditPartViewer viewer) {
/**
* Called when the mouse button has been double-clicked on a viewer.
*/
public void mouseDoubleClick(MouseEvent event, IEditPartViewer viewer) {
@Override
public void mouseDoubleClick(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
Tool tool = getActiveTool();
if (tool != null) {
tool.mouseDoubleClick(event, viewer);
}
super.mouseDoubleClick(event, viewer);
}

/**
* Called when the mouse button has been pressed on a viewer.
*/
public void mouseDown(MouseEvent event, IEditPartViewer viewer) {
@Override
public void mouseDown(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
Tool tool = getActiveTool();
if (tool != null) {
tool.mouseDown(event, viewer);
}
super.mouseDown(event, viewer);
}

/**
* Called when the mouse button has been released on a viewer.
*/
public void mouseUp(MouseEvent event, IEditPartViewer viewer) {
@Override
public void mouseUp(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
Tool tool = getActiveTool();
if (tool != null) {
tool.mouseUp(event, viewer);
}
super.mouseUp(event, viewer);
}

/**
* Called when the mouse has been moved on a viewer.
*/
public void mouseMove(MouseEvent event, IEditPartViewer viewer) {
@Override
public void mouseMove(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
Tool tool = getActiveTool();
if (tool != null) {
tool.mouseMove(event, viewer);
}
super.mouseMove(event, viewer);
}

/**
* Called when the mouse has been dragged within a viewer.
*/
public void mouseDrag(MouseEvent event, IEditPartViewer viewer) {
@Override
public void mouseDrag(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
Tool tool = getActiveTool();
if (tool != null) {
tool.mouseDrag(event, viewer);
}
super.mouseDrag(event, viewer);
}

/**
* Called when the mouse enters a viewer.
*/
public void viewerEntered(MouseEvent event, IEditPartViewer viewer) {
@Override
public void viewerEntered(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
m_currentViewer = viewer;
Tool tool = getActiveTool();
if (tool != null) {
tool.viewerEntered(event, viewer);
}
super.viewerEntered(event, viewer);
}

/**
* Called when the mouse exits a viewer.
*/
public void viewerExited(MouseEvent event, IEditPartViewer viewer) {
@Override
public void viewerExited(MouseEvent event, EditPartViewer viewer) {
m_currentMouseEvent = event;
m_currentViewer = null;
Tool tool = getActiveTool();
if (tool != null) {
tool.viewerExited(event, viewer);
}
super.viewerExited(event, viewer);
}
}
6 changes: 3 additions & 3 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/graphical/EditEventManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2023 Google, Inc.
* Copyright (c) 2011, 2025 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
Expand Down Expand Up @@ -91,12 +91,12 @@ public void setOverrideCursor(Cursor cursor) {
////////////////////////////////////////////////////////////////////////////
@Override
public void dispatchKeyPressed(KeyEvent event) {
m_domain.keyPressed(event, m_viewer);
m_domain.keyDown(event, m_viewer);
}

@Override
public void dispatchKeyReleased(KeyEvent event) {
m_domain.keyReleased(event, m_viewer);
m_domain.keyUp(event, m_viewer);
}

////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/tree/TreeEventManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2023 Google, Inc.
* Copyright (c) 2011, 2025 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
Expand Down Expand Up @@ -81,14 +81,14 @@ public void setDomain(EditDomain domain) {
@Override
public void keyPressed(KeyEvent event) {
if (m_domain != null) {
m_domain.keyPressed(event, m_viewer);
m_domain.keyDown(event, m_viewer);
}
}

@Override
public void keyReleased(KeyEvent event) {
if (m_domain != null) {
m_domain.keyReleased(event, m_viewer);
m_domain.keyUp(event, m_viewer);
}
}

Expand Down
Loading