From bf0f3abe04728e3b9a432d51592c0fad37138564 Mon Sep 17 00:00:00 2001 From: Giacomo Bertolazzi <20015159@studenti.uniupo.it> Date: Tue, 26 Feb 2019 22:13:31 +0100 Subject: [PATCH] Hotfix * fixed graph adding edge to same vertex --- .../sim/util/graph/view/edge/EdgeListener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/berack96/sim/util/graph/view/edge/EdgeListener.java b/src/berack96/sim/util/graph/view/edge/EdgeListener.java index fee506a..eb7609e 100644 --- a/src/berack96/sim/util/graph/view/edge/EdgeListener.java +++ b/src/berack96/sim/util/graph/view/edge/EdgeListener.java @@ -54,7 +54,8 @@ public abstract class EdgeListener implements GraphListener VertexComponent source = componentPressed.get(); VertexComponent destination = graphPanel.getVertexAt(e.getPoint()); - if (!graphPanel.getGraph().containsEdge(source.vertex.getValue(), destination.vertex.getValue())) + if (!graphPanel.getGraph().containsEdge(source.vertex.getValue(), destination.vertex.getValue()) + && !source.vertex.equals(destination.vertex)) graphPanel.addEdge(source, destination, buildNewEdge(source.vertex, destination.vertex)); } catch (Exception ignore) { } @@ -78,12 +79,11 @@ public abstract class EdgeListener implements GraphListener public void keyPressed(KeyEvent e) { if (edge.get() != null && Character.isDigit(e.getKeyChar())) { string.append(e.getKeyChar()); - if (!edge.get().source.equals(edge.get().destination)) - try { - graphPanel.modEdge(edge.get().source, edge.get().destination, buildEdgeFrom(string.toString())); - graphPanel.repaint(); - } catch (Exception ignored) { - } + try { + graphPanel.modEdge(edge.get().source, edge.get().destination, buildEdgeFrom(string.toString())); + graphPanel.repaint(); + } catch (Exception ignored) { + } } else { try {