Skip to content

[GEF] Avoid usage of TargetFigureFindVisitor in Designer palette #1146

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
Jul 2, 2025
Merged

[GEF] Avoid usage of TargetFigureFindVisitor in Designer palette #1146

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
34 changes: 19 additions & 15 deletions org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.wb.internal.core.utils.ui.DrawUtils;
import org.eclipse.wb.internal.draw2d.EventManager;
import org.eclipse.wb.internal.draw2d.FigureCanvas;
import org.eclipse.wb.internal.draw2d.TargetFigureFindVisitor;

import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.FigureUtilities;
Expand Down Expand Up @@ -187,14 +186,11 @@ public PaletteComposite(Composite parent, int style) {
@SuppressWarnings("removal")
private void addPopupActions(IMenuManager menuManager) {
// prepare target figure
Figure targetFigure;
IFigure targetFigure;
{
org.eclipse.swt.graphics.Point cursorLocation = getDisplay().getCursorLocation();
cursorLocation = m_figureCanvas.toControl(cursorLocation);
TargetFigureFindVisitor visitor =
new TargetFigureFindVisitor(m_figureCanvas, cursorLocation.x, cursorLocation.y);
m_figureCanvas.getRootFigure().accept(visitor, false);
targetFigure = visitor.getTargetFigure();
targetFigure = m_figureCanvas.getLightweightSystem().getRootFigure().findFigureAt(cursorLocation.x, cursorLocation.y);
}
// prepare target object
Object targetObject = null;
Expand Down Expand Up @@ -771,6 +767,11 @@ private Rectangle getTitleRectangle() {
r.height = m_titleHeight;
return r;
}

@Override
public String toString() {
return "[%s] %s".formatted(getClass().getSimpleName(), m_category.getText());
}
}
////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -922,7 +923,7 @@ private void move_showFeedback(Point p) {
move_eraseFeedback();
m_moveCommand = null;
// handle target
Figure targetFigure = getTargetFigure(this, p);
IFigure targetFigure = getTargetFigure(this, p);
if (targetFigure instanceof final EntryFigure targetEntryFigure) {
final CategoryFigure targetCategoryFigure = (CategoryFigure) targetFigure.getParent();
final ICategory targetCategory = targetCategoryFigure.m_category;
Expand Down Expand Up @@ -1162,6 +1163,11 @@ private Image getIcon() {
}
return NO_ICON;
}

@Override
public String toString() {
return "[%s] %s".formatted(getClass().getSimpleName(), m_entry.getText());
}
}
////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -1263,15 +1269,13 @@ protected void paintClientArea(Graphics graphics) {
* @param p
* the mouse location relative to given <code>source</code>
*/
private Figure getTargetFigure(Figure source, Point p) {
private IFigure getTargetFigure(Figure source, Point p) {
// use absolute coordinates
Point absoluteLocation = p.getCopy();
FigureUtils.translateFigureToCanvas(source, absoluteLocation);
// do search
TargetFigureFindVisitor visitor =
new TargetFigureFindVisitor(m_figureCanvas, absoluteLocation.x, absoluteLocation.y);
m_figureCanvas.getRootFigure().accept(visitor, false);
return visitor.getTargetFigure();
Point location = Point.SINGLETON;
location.setLocation(p);
source.translateFromParent(p);
IFigure targetFigure = m_figureCanvas.getLightweightSystem().getRootFigure().findFigureAt(location);
return targetFigure;
}

/**
Expand Down
Loading