public boolean pickHoveredElement(Point2D currentMousePos, boolean isConnectionTool) {
PickRequest req = new PickRequest(new Rectangle2D.Double(currentMousePos.getX(), currentMousePos.getY(), 1e-8, 1e-8)).context(getContext());
- List<IElement> pickables = new ArrayList<IElement>();
+ List<IElement> pickables = new ArrayList<>();
pick.pick(diagram, req, pickables);
-
- List<IElement> snap = new ArrayList<>(diagram.getSnapshot());
-
- // snap.removeAll(pickables);
-
+
+ List<IElement> snap = diagram.getSnapshot();
+
boolean changed = false;
- changed = hoverVertexNodes(snap, false, isConnectionTool, changed, currentMousePos);
- changed = hoverEdgeNodes(snap, false, isConnectionTool, changed, currentMousePos);
- changed = hoverVertexNodes(pickables, true, isConnectionTool, changed, currentMousePos);
- changed = hoverEdgeNodes(pickables, true, isConnectionTool, changed, currentMousePos);
+ changed |= hoverNodes(snap, false, isConnectionTool, currentMousePos);
+ changed |= hoverNodes(pickables, true, isConnectionTool, currentMousePos);
return changed;
}
- private boolean hoverVertexNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, boolean changed, Point2D p) {
+ private boolean hoverNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, Point2D p) {
+ boolean changed = false;
for (IElement elem : elements) {
Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
if (node instanceof DistrictNetworkVertexNode) {
- changed = ((DistrictNetworkVertexNode) node).hover(hover, isConnectionTool) || changed;
+ changed |= ((DistrictNetworkVertexNode) node).hover(hover, isConnectionTool);
if (hover)
((DistrictNetworkVertexNode) node).setMousePosition(p);
- }
- }
- return changed;
- }
-
- private boolean hoverEdgeNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, boolean changed, Point2D p) {
- for (IElement elem : elements) {
- Node node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
- if (node instanceof DistrictNetworkEdgeNode) {
- for (IG2DNode n : ((DistrictNetworkEdgeNode) node).getNodes()) {
- if (n instanceof HoverSensitiveNode) {
- changed = ((HoverSensitiveNode)n).hover(hover, isConnectionTool) || changed;
- if (hover)
- ((HoverSensitiveNode)n).setMousePosition(p);
+ } else {
+ node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
+ if (node instanceof DistrictNetworkEdgeNode) {
+ for (IG2DNode n : ((DistrictNetworkEdgeNode) node).getNodes()) {
+ if (n instanceof HoverSensitiveNode) {
+ changed |= ((HoverSensitiveNode)n).hover(hover, isConnectionTool);
+ if (hover)
+ ((HoverSensitiveNode)n).setMousePosition(p);
+ }
}
}
}
}
return changed;
}
-
+
public boolean isHoveringOverNode(Point2D currentMousePos) {
PickRequest req = new PickRequest(currentMousePos).context(getContext());
List<IElement> pickables = new ArrayList<IElement>();