From c57c23571986a410bac02d9b7f72069cffdae8c9 Mon Sep 17 00:00:00 2001
From: LeonardoBizzoni <leo2002714@gmail.com>
Date: Sun, 27 Jun 2021 09:19:39 +0200
Subject: [PATCH] Fixed duplicate nodes and added replayability

---
 src/main/java/Main/AStar.java                 |  18 +++-----
 src/main/java/Main/ControlPanel.java          |   2 +
 src/main/java/Main/Map.java                   |  41 ++++++++++--------
 src/main/java/Main/PathfinderUtils.java       |   6 +++
 target/PathVisualizer-1.0-SNAPSHOT.jar        | Bin 10529 -> 10685 bytes
 target/classes/Main/AStar.class               | Bin 2881 -> 2824 bytes
 target/classes/Main/ControlPanel.class        | Bin 1423 -> 1475 bytes
 target/classes/Main/Map.class                 | Bin 6897 -> 7014 bytes
 target/classes/Main/PathfinderUtils.class     | Bin 1431 -> 1597 bytes
 target/surefire-reports/Main.AppTest.txt      |   2 +-
 target/surefire-reports/TEST-Main.AppTest.xml |   8 ++--
 11 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/main/java/Main/AStar.java b/src/main/java/Main/AStar.java
index 6a60a95..086bc04 100644
--- a/src/main/java/Main/AStar.java
+++ b/src/main/java/Main/AStar.java
@@ -24,18 +24,8 @@ public class AStar{
         PathfinderUtils.closedNodes.add(parent);
         PathfinderUtils.openNodes.remove(parent);
 
-        if (parent.getX() == PathfinderUtils.endNode.getX() && parent.getY() == PathfinderUtils.endNode.getY()) {
-            ControlPanel.toggleRunBtn.setText("End");
-            map.isFinished = true;
-            map.repaint();
-            return;
-        }
-
-        if (!map.isFinished) {
+        if (!map.isFinished) 
             searchPath(parent);
-        }
-        else
-            System.exit(0);
     }
 
     public void calculateOpenNode(int nextX, int nextY, Node parent) {
@@ -45,6 +35,12 @@ public class AStar{
             return;
         if (nextX == PathfinderUtils.startNode.getX() && nextY == PathfinderUtils.startNode.getY())
             return;
+        if (nextX == PathfinderUtils.endNode.getX() && nextY == PathfinderUtils.endNode.getY()) {
+            map.isFinished = true;
+            ControlPanel.toggleRunBtn.setText("Clear");
+            map.repaint();
+            return;
+        }
 
         Node openNode = new Node(nextX, nextY);
         openNode.setParentNode(parent);
diff --git a/src/main/java/Main/ControlPanel.java b/src/main/java/Main/ControlPanel.java
index e5186ef..30e7aa4 100644
--- a/src/main/java/Main/ControlPanel.java
+++ b/src/main/java/Main/ControlPanel.java
@@ -13,12 +13,14 @@ public class ControlPanel {
     public ControlPanel(Map map) {
         algo = new JComboBox<>(new String[] { "Select an algorithm", "A*", "Dijkstra", "Breadth-first search"});
         algo.setVisible(true);
+        algo.setFocusable(false);
 
         toggleRunBtn = new JButton("Run");
         toggleRunBtn.setVisible(true);
         toggleRunBtn.setMargin(new Insets(0, 0, 0, 0));
         toggleRunBtn.setBackground(Color.white);
         toggleRunBtn.addActionListener(map);
+        toggleRunBtn.setFocusable(false);
 
         map.add(algo);
         map.add(toggleRunBtn);
diff --git a/src/main/java/Main/Map.java b/src/main/java/Main/Map.java
index 167847a..cc96245 100644
--- a/src/main/java/Main/Map.java
+++ b/src/main/java/Main/Map.java
@@ -16,8 +16,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.MouseEvent; import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 
 import javax.swing.JFrame;
@@ -98,7 +97,7 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
         }
 
         // Draws closed nodes
-        g.setColor(Color.orange);
+        g.setColor(new Color(132, 255, 138));
         for (Node node : PathfinderUtils.closedNodes) {
             g.fillRect(node.getX() + 1, node.getY() + 1, size - 1, size - 1);
         }
@@ -112,10 +111,9 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
                 int posX = e.getX() - (e.getX() % size);
                 int posY = e.getY() - (e.getY() % size);
 
-                // TODO fa cagare
                 // Checks if start node and end node are the same
-                if (PathfinderUtils.endNode != null) {
-                    if (PathfinderUtils.endNode.getX() == posX && PathfinderUtils.endNode.getY() == posY) {
+                if (PathfinderUtils.startNode != null && PathfinderUtils.endNode != null) {
+                    if (PathfinderUtils.checkDuplicateNode(PathfinderUtils.startNode, PathfinderUtils.endNode)) {
                         JOptionPane.showMessageDialog(null, "End node and start node can't be the same node",
                                 "Same node error", JOptionPane.ERROR_MESSAGE);
                         return;
@@ -136,10 +134,9 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
                 int posX = e.getX() - (e.getX() % size);
                 int posY = e.getY() - (e.getY() % size);
 
-                // TODO fa cagare
                 // Checks if end node and start node are the same
-                if (PathfinderUtils.startNode != null) {
-                    if (PathfinderUtils.startNode.getX() == posX && PathfinderUtils.startNode.getY() == posY) {
+                if (PathfinderUtils.startNode != null && PathfinderUtils.endNode != null) {
+                    if (PathfinderUtils.checkDuplicateNode(PathfinderUtils.startNode, PathfinderUtils.endNode)) {
                         JOptionPane.showMessageDialog(null, "End node and start node can't be the same node!",
                                 "SAME NODE ERROR", JOptionPane.ERROR_MESSAGE);
                         return;
@@ -161,7 +158,12 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
                 int posY = e.getY() - (e.getY() % size);
                 Node barrierNode = new Node(posX, posY);
 
-                // TODO controlla se si sta creando una barriera su start o end
+                if(PathfinderUtils.startNode != null)
+                    if(PathfinderUtils.checkDuplicateNode(barrierNode, PathfinderUtils.startNode))
+                        return;
+                if(PathfinderUtils.endNode != null)
+                    if(PathfinderUtils.checkDuplicateNode(barrierNode, PathfinderUtils.endNode))
+                        return;
 
                 PathfinderUtils.barriers.add(barrierNode);
 
@@ -225,7 +227,6 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
             switch (ControlPanel.algo.getItemAt(ControlPanel.algo.getSelectedIndex())) {
 
             case ("A*"):
-                System.out.println("A* selected");
                 new AStar(this).start();
                 break;
 
@@ -234,11 +235,6 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
                 // AStar.start();
                 break;
 
-            case ("Greedy best-first search"):
-                System.out.println("Greedy best-first search selected");
-                // AStar.start();
-                break;
-
             case ("Breadth-first search"):
                 System.out.println("Breadth-first search selected");
                 // AStar.start();
@@ -249,11 +245,18 @@ class Map extends JPanel implements ActionListener, MouseListener, MouseMotionLi
                         "Algorithm not selected", JOptionPane.ERROR_MESSAGE);
                 return;
             }
-
-            ControlPanel.toggleRunBtn.setText("Stop");
         }
 
-        else {
+        else if(ControlPanel.toggleRunBtn.getText().equals("Clear")){
+            PathfinderUtils.barriers.removeAll(PathfinderUtils.barriers);
+            PathfinderUtils.openNodes.removeAll(PathfinderUtils.openNodes);
+            PathfinderUtils.closedNodes.removeAll(PathfinderUtils.closedNodes);
+            PathfinderUtils.startNode = null;
+            PathfinderUtils.endNode = null;
+
+            isFinished = false;
+
+            this.repaint();
             ControlPanel.toggleRunBtn.setText("Run");
         }
     }
diff --git a/src/main/java/Main/PathfinderUtils.java b/src/main/java/Main/PathfinderUtils.java
index 528a005..2b2744a 100644
--- a/src/main/java/Main/PathfinderUtils.java
+++ b/src/main/java/Main/PathfinderUtils.java
@@ -24,6 +24,12 @@ public class PathfinderUtils {
         barriers.remove(id);
     }
 
+    static boolean checkDuplicateNode(Node a, Node b) {
+        if(a.getX() == b.getX() && a.getY() == b.getY())
+            return true;
+        return false;
+    }
+
     static void sort() {
         Node tmp;
 
diff --git a/target/PathVisualizer-1.0-SNAPSHOT.jar b/target/PathVisualizer-1.0-SNAPSHOT.jar
index 39668b14f55524d269800ce1d9d903ab3692a8ff..674d0e13e92634711300b474eeb3d686799d6789 100644
GIT binary patch
delta 7774
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

delta 7576
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
IbN!S3e^|6o*Z=?k

diff --git a/target/classes/Main/AStar.class b/target/classes/Main/AStar.class
index e722d34d013d6539e90fc14e7062d48e62519e27..8676543f083443aff7a11be4c46d6808aca453a1 100644
GIT binary patch
delta 1606
zcmaKs*>@C06vltm(>*=iQy|7nV3>&{kRf4W5(qFrgeD7M0NK|7Duan60Rkiek*MRw
zA}Gi-iUCwa+y%)9Ljvm2SKoN>_($l`Cm&ekc&a<1PxixizN)(Q)mL@z?H`K{7iE6B
zcl~={D&N`Eu-2lQbr$Psv8iT*O)(oSHt~eXlfk*SO7E<mS2f1Q<S7N4)p}a7Eh_wJ
z1+8j#TbO6qs#v>X9ZI58!8QfkZPv3xt#)-<>||Gn-8S9y*leQLWRH^FtKeC+dtaCp
zJf~p4n(GVJ<A3Vl=M}u5=3i7Squ5IdURH;^qV~UP@|wwkf!`e=4!TvElc}XnGMOnR
zha`t-lsw98$?F_3IVyPrM=-K8y*FL6J>9jnW=XoYUGgT!B*%G6a)Kk0tQyW^zGNk<
zBrYdS-j=+>DapH>l=LfhnlqBKIFk1iyw3-ca~T><K9rp2BZ1Mhy)E5sazXMjpGZEX
zPGBubcXZV(-PzhEspT`t=gQv~d@1>gi;_!xExD|043Lw2qr6<<swB@f$)I9G3a+b*
z-r!q-?I|{_>P>eGcW2<%19nHxf{w0^p7yp@f!N@VGb-J7{e_U(-L@;;(belV8^;a3
zV&SB<?$1V3rkWZ+ps9BQ3<R}IMKBFmfQAOx$!myY<yEu+Kw~;Ek^m4y$HXE;3MlfU
znZZmimA0oU5X_=(STlu&07A(ef%-i9zmm4MJ&cL;<fI=sEGJYpeGy?0!T|c*UxM4>
z$t!4AC_GIlSvf2i@H|!%c2Aj!%pT(Gr`QvnhCzaI=HL)u9wFx9prf&zdK}L}-~Ai(
z(Lf`DCiMyg?xKm?EGtK-8u86&e|m-y*;tOqc?#k=ip~>`oxzNsMIVUi@j*tr8$)9^
z#&V3wW1J%q_n16KOu5&uQkWxJFgEXx^TY>kP}~xWU*q9AJ*rpb8JA<!5G8^-BWes$
zD(I(5vGIZ*D0VM|64C!#Epas~RyHAJMvQ(YMuPp6M$AIW{MQQ}Dx_?XiQ5J#cN?r|
zroy)x)$<swgG@?=e8*}+dJ|S86tOm^?5G~G^CTl?#NM0=NA*ZJPi2mRs6NDl8tYVo
z{d{C814<~Ol+lc*gb9>V#&i;-n8+f^SxE&On3N$+k}XuRgKB!1f=ewInaU-mF~AIN
zGLv7K#c$N{2eY}u9AV;!5!8#(G>GXmi3aA2W|~C{3q>c3#BLUgeJm9jmWhL`5GPpa
z6~!?|;u2#4jRd(#jEqka*?($5WO)onm88hh>{p7&di4=the)uHMs)6QibXgW!sIB6
zaR`bL9N=*rOwqzDmf#Q)om8+C2TSaxlw~;BBEv&0$01Bp21qcX2&=I2FUFb_o2;08
z8|^OEFuTWmAw(FVepSQWrRrC8*Qh}r$x#p(qDoWMaru7V`c1Zm0Bir#WTWmk*=jFx
F&EF!<3X=c;

delta 1674
zcmaKs>t9oK9LL|k?QFm8?DrxhhRz{^iXu3tqEkVc2xuCpiDFP1D+bOBnviLwQ;W0=
zyDTHTlvzf1WzIRYywtOv_y_pN$NdFfvR=P4)E;#ne9q^0`F_s#dX5y_EQtU4@X9ry
zlHW~cvB6D{=iRi@W)kEDlOkSpvyn}bmz?3dCHL3W2gaF5+BHP<`OBKUqOW&oh-&Lj
z4_$25ET-8O&9=JP#&#FoCOg=vMPD_EZ)BHA550Q*nugsbt-LPTqqX;HctcCP>0vEz
zY1pUt_B)r5ee~Dk8V>0FgPI-E>}?J2Xt6$R|E}b)<cPq&J+f0^Ha10K-NB~eyEBD&
zFHvTziC0psn9Ur?`--E~DHgF<@d5pkV~P(63v#wZc1MESBHdlVrbzE*#YcRs_=JSw
zQ~DLh^|FCwie}a+K4U=gxnhtLijxc|PHA?UI>{G`FF7NyH*|MMzEW|{^0nd{&MCg7
zS~8^gj_(ye5LW!C;U|6;xGl$5?dXUqD)~imUVC|gVMUUQiWHX=Y3<BqGKvxH(G{(8
zm0uOVX?9J+bsg>vZVF6GF|o=1Ph!B>S7pX}mc_bbJ)5H)0?{UryP`WIvF=_$?vwDF
z_xAKgw+oEuo>;HIC|fbTC9%z@NEA8x6G=y{KgcXVVADAT90)3zi(p<N$LWuUfE?_A
z69b7G7xRGvY=FrE7Fq>1Eqj5WifU~Qgs>q1S9ub98e<r+p%qQb+Ji({YASngR88oT
zW;IOFh6@LfN+g|I*H@%*B*{<XI73-Q8f7ii8T?7Sc?D_4mZz{8ml&ttX?(-_onqVx
zJmnQ>j3J~w!+7nA-Ew6aV-gExX}pg@`kBCSia5nYPBV!iCUc&tTx6Q%=3E?<GL0I-
z*r~_G62chRSVJvgE2z}tl%!Zn9fEo*g^mZ<#64EuXXO|>LbqQwL|aOyp%_G`KZ*Y=
zd4)*|&*Jf)L>8XH81@%tn2@+5#|N)c)aoz1%)~0gX9Us|C&?Y5L{R1MIYyWy7$l(C
zWWf!J5-qM$-~XK!CsHndd`d`q9fM5uItMB7%6v+*Npl{~r!>Q~tr^OWwTI*oPkH6&
zQF}=G46jTxJzEZ+k;c)Hp*-ZumPBtTYs2kzdEM<H(`R_iG!<UyHQPfTpW*eSnUN$f
z?lVRhV`IaUqU>iPP)-3AjAaJJ1Snx9^9T}RHnq%QIrHcu#6jkBhz0af%{dlvoyFXs
zhCf)sEo!;VQtnXCUo;3e%Y~N}qL4-rph?uQN;Je-EgD%XnrRkotQS#QtZE-4hc5gq
zrw%9Q9y3JeqZ*4&o*}H8S9G!>+X14}s=J+9QOZi{Fu274&l1MLZI04N7$<k=qlqw5
z!~-m36=7VWhB8(Y#w{8sVGUtS(ah64M;MRQNK;S+xby#Jyrf97cGf*?4{(pNhcpNw
wJP7?`8=b<M(J9Q$5J-||A7Q3VH^+rX(^xh-j;+{f`_DM$J|4&Q*437O0jk{~%K!iX

diff --git a/target/classes/Main/ControlPanel.class b/target/classes/Main/ControlPanel.class
index 920e67e59aa47f53584766312ba2b8e1fef391d6..865752d027b77df97fffc6001c651b2ae1adbce5 100644
GIT binary patch
delta 630
zcmYL^+fEZf9L9gMTeF8wyW0ZgB<18*vDTs>D4^mAL_tLnTF(nMF~rD4t6a8k;6;5A
zhGa=3@y0u!!AmcA3S(v=aV~!I&3u{pzW>+c&t&u0-|s(w32H8RE?Z1kOxj$rnX;L-
zx$0tY&0&BUt!6dmEUw$!aFN{9&b(H$7Pnk7+}4LX4tKey)q=*N#+=K2mh}4v8V@y=
zliFFfSh0At*D4D$pxjnsI~(v=GR%nN39FK)thUFD{7S$x$sj`lZ#(=Fmc!jfdFfNV
z)~HJY)+Enax7d(Ws7hY&Qu2z|7H=ePc_#_klx%6dXRZCsSWn4%t+BAP^|>Byeyr^u
z88c#ffIMJe>m<O|MG%a}w`VXA1QZaQ1^!@R0Iha4QEDn2Ga`A2tY%XOr1$X@ULwL*
zc!y-FrfHf7WFtD1wmKua6kahRr|`^(?xMnp=-DVLJiYJ5spo(xQb39XX$p9h@R=mb
zJRL03NrkQ^Avr$K%?`cn(nphi#(>;$NzPM5uND_5ArM@od@@RfQwX4-aD3Ny<0ic^
q`y%=kUWVVk>yP_A5vTtbOJf3gatsd=Fcb&M<F8Hv1>^A?m;M1+M_5?^

delta 559
zcmYL@%Tg0z5QV>gCe}Zh`7@aW2th);3<NcXpr|BXK|zfQf)_9->MUHy!YYB1C3`n6
z<`H}XhN_`TEI004_yj(SWp%X5UYtJNU472^?tSuhfBgRP4VWTwsW7QIr#bI1<#55_
zqQfN@i|H)Gw1l-ammRLScwCj`HDPVdb(eq}GR$O|<)*M(0&_0&+?Lln0(S*Ea_DI8
zY1I9_k4<HVG~%ynBNy_(aE#-I1s3C$Rb2>qXc(cY$Ztd+qGq(S-R!*Edb7P{2w5^L
z^GNg9@Pwy^6;=(;=xWvs&v{{3=cVD5z-yM`&(_MmW4F}wFcrYU5pBQ`R}?3D+ml!*
zLPk-H0YA}Lz-GLYY3v^2b&KYJ+&+GSpGnCl_=f~t+qUfk3Ms`zPJJo;34T3gpq`LT
zDXrEMeCc~VpBgZM2js}$QzK7<0&R-S(8n_UtT8~uAa5!2o*~9ZfzsbNoZ>W6o1CGJ
zLUERcgpSvblotnkrsb5O1i!$qzzrsYa>~*F?mjk9p~MJdR2c^h3aI@PS4{M>Hva%8
C*-7F6

diff --git a/target/classes/Main/Map.class b/target/classes/Main/Map.class
index 28b921daf45d913656448e9b0545604e806d7037..fc2bb22d2a4d39132b909bf67233f496852a688a 100644
GIT binary patch
delta 3464
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
IqJw4M1LY;M8UO$Q

delta 3321
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
F`Y-$8hOhtt

diff --git a/target/classes/Main/PathfinderUtils.class b/target/classes/Main/PathfinderUtils.class
index c3ec61a485a76e38401acec470836359f9e571ee..ccf6ade5e1be0f3d697031f89fd493bf70913077 100644
GIT binary patch
delta 425
zcmYj~%Su9F6otRv<ME^&%!KSzCJicY*-g#N?%73C1BcNCGeIe=fsPy08#rj%12_rc
z41#)q-lbQF_>U3o!D4@lz4m$@eAmmL-)|p4oD&xwl1_$L86?H3l(fd03zdwNb?I!#
zgH4HB61O#WT<HDWuEw55_O+Z4DQ~r2tKMYW_qUB|rBy54UDpI-p+d3JXf8;~{9D7P
z0#Ol&tIm@sB=>a=IMg{JCvg5Hbn?<YmJ%YTGlEyAAhAfPr`m>vaP&r%xOkXD;0G?T
zVFSh^CXT3y;{{K|M2nheFR1pe(ghSI0XGWZ$HycF0Rn)ppC*QZoN?wc5CpB1Fc@Hg
ziQlp>?AD96(mAs~rl)Z;gP&P82$CnnIbrI|&}5nxF{@z;g**Wktp*PlEOiVuDwaE0
KwV=fT8;Ku5m^~8!

delta 241
zcmXAg%Su8~7)ICD4jYe~GC^n{N2`HBn%dF4rCro6#|m+-5G3S8C%wr*e2#D?XmcOM
zkxvlv<7B~FeBaW{!oBtXVg<N#Y$D`C9C01Sr64G3Zfq<{g0hr~4633v(OXU3#_WF$
z&7J1{w^va9pYn<ihDVx)7Hvi7{c|+VeoVfGh9{}df(zP)7*WHE=quj55ja-Lns<Y)
z^0x=mio+oZ;v}haipLp!&iN+67>6HHI6#sh9u8?vfCvLJ{>r*kSN_I&(^()uZU_2y
BBLn~d

diff --git a/target/surefire-reports/Main.AppTest.txt b/target/surefire-reports/Main.AppTest.txt
index bdab1da..1952558 100644
--- a/target/surefire-reports/Main.AppTest.txt
+++ b/target/surefire-reports/Main.AppTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: Main.AppTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.02 s - in Main.AppTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.029 s - in Main.AppTest
diff --git a/target/surefire-reports/TEST-Main.AppTest.xml b/target/surefire-reports/TEST-Main.AppTest.xml
index 396d6b0..518b40f 100644
--- a/target/surefire-reports/TEST-Main.AppTest.xml
+++ b/target/surefire-reports/TEST-Main.AppTest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="Main.AppTest" time="0.02" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="Main.AppTest" time="0.029" tests="1" errors="0" skipped="0" failures="0">
   <properties>
     <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
     <property name="java.specification.version" value="11"/>
@@ -16,7 +16,7 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="GB"/>
     <property name="sun.boot.library.path" value="/opt/openjdk-bin-11.0.11_p9/lib"/>
-    <property name="sun.java.command" value="/home/leo/Docs/Proj/PathVisualizer/target/surefire/surefirebooter12422851706423362175.jar /home/leo/Docs/Proj/PathVisualizer/target/surefire 2021-06-19T13-00-08_471-jvmRun1 surefire10461286948834527749tmp surefire_05278180969358337674tmp"/>
+    <property name="sun.java.command" value="/home/leo/Docs/Proj/PathVisualizer/target/surefire/surefirebooter8510599142121748610.jar /home/leo/Docs/Proj/PathVisualizer/target/surefire 2021-06-27T09-11-09_330-jvmRun1 surefire6120348368433176072tmp surefire_01333341478733871355tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/home/leo/Docs/Proj/PathVisualizer/target/test-classes:/home/leo/Docs/Proj/PathVisualizer/target/classes:/home/leo/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/leo/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -32,12 +32,12 @@
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/home/leo/Docs/Proj/PathVisualizer/target/surefire/surefirebooter12422851706423362175.jar"/>
+    <property name="surefire.real.class.path" value="/home/leo/Docs/Proj/PathVisualizer/target/surefire/surefirebooter8510599142121748610.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="11.0.11+9"/>
     <property name="user.name" value="leo"/>
     <property name="path.separator" value=":"/>
-    <property name="os.version" value="5.12.10-gentoo-LeoKernel"/>
+    <property name="os.version" value="5.12.12-gentoo-LeoKernel"/>
     <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
     <property name="file.encoding" value="UTF-8"/>
     <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-- 
2.52.0