fix: DiffLineNumber::toString

Author: pmbittner

src/main/java/org/variantsync/diffdetective/diff/text/DiffLineNumber.java

@@ -108,7 +108,7 @@ public int atTime(Time time) {
 
     @Override
     public String toString() {
-        return "(old: " + beforeEdit + ", diff: " + inDiff + ", new:" + afterEdit + ")";
+        return "(old: " + beforeEdit + ", diff: " + inDiff + ", new: " + afterEdit + ")";
     }
 
     @Override

src/test/resources/diffs/differ/4a4c1db1b192e221d8e25460d6d1128d1bdd0c0d.lg

@@ -1,8 +1,8 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);;Hello world
-v 203 REM;ARTIFACT;(old: 2, diff: 2, new:-1);(old: 3, diff: 3, new:-1);;
-v 259 ADD;ARTIFACT;(old: -1, diff: 3, new:2);(old: -1, diff: 4, new:3);;Hallo
-v 339 NON;ARTIFACT;(old: 3, diff: 4, new:3);(old: 4, diff: 5, new:4);;Another line
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 147 NON;ARTIFACT;(old: 1, diff: 1, new: 1);(old: 2, diff: 2, new: 2);;Hello world
+v 203 REM;ARTIFACT;(old: 2, diff: 2, new: -1);(old: 3, diff: 3, new: -1);;
+v 259 ADD;ARTIFACT;(old: -1, diff: 3, new: 2);(old: -1, diff: 4, new: 3);;Hallo
+v 339 NON;ARTIFACT;(old: 3, diff: 4, new: 3);(old: 4, diff: 5, new: 4);;Another line
 e 147 16 ba;0
 e 203 16 b;1
 e 259 16 a;2

src/test/resources/diffs/differ/a032346092e47048becb36a7cb183b4739547370.lg

@@ -1,27 +1,27 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);;
-v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;
-v 275 NON;ARTIFACT;(old: 3, diff: 3, new:3);(old: 4, diff: 4, new:4);;
-v 336 NON;IF;(old: 4, diff: 4, new:4);(old: 33, diff: 33, new:33);-_DB_STL_RESOURCE_MANAGER_H__;#ifndef _DB_STL_RESOURCE_MANAGER_H__
-v 403 NON;ARTIFACT;(old: 5, diff: 5, new:5);(old: 6, diff: 6, new:6);;#include <stdio.h>
-v 467 NON;ARTIFACT;(old: 6, diff: 6, new:6);(old: 7, diff: 7, new:7);;
-v 528 NON;IF;(old: 7, diff: 7, new:7);(old: 9, diff: 9, new:9);-DEFINED_MESSAGE;#if !defined (MESSAGE)
-v 595 NON;ARTIFACT;(old: 8, diff: 8, new:8);(old: 9, diff: 9, new:9);;   #define MESSAGE "You wish!"
-v 657 NON;ELSE;(old: 9, diff: 9, new:9);(old: 11, diff: 11, new:11);;#else
-v 723 NON;ARTIFACT;(old: 10, diff: 10, new:10);(old: 11, diff: 11, new:11);;   // do nothing
-v 851 NON;ARTIFACT;(old: 12, diff: 12, new:12);(old: 13, diff: 13, new:13);;
-v 915 NON;ARTIFACT;(old: 13, diff: 13, new:13);(old: 14, diff: 14, new:14);;int main(void) {
-v 979 NON;ARTIFACT;(old: 14, diff: 14, new:14);(old: 15, diff: 15, new:15);;   printf("Here is the message: %s\n", MESSAGE);
-v 1043 NON;ARTIFACT;(old: 15, diff: 15, new:15);(old: 16, diff: 16, new:16);;
-v 1104 NON;IF;(old: 16, diff: 16, new:16);(old: 21, diff: 21, new:21);(-DEFINED_HAVE_GETHOSTBYNAME_R | -DEFINED_HAVE_GETHOSTBYADDR_R | -DEFINED_HAVE_GETPWUID_R | -DEFINED_HAVE_GETGRGID_R) & (-DEFINED_HAVE_MTSAFE_GETHOSTBYNAME | -DEFINED_HAVE_MTSAFE_GETHOSTBYADDR);#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R) || \;           !defined(HAVE_GETPWUID_R)      || !defined(HAVE_GETGRGID_R)) && \;          (!defined(HAVE_MTSAFE_GETHOSTBYNAME) || !defined(HAVE_MTSAFE_GETHOSTBYADDR))
-v 1299 NON;ARTIFACT;(old: 19, diff: 19, new:19);(old: 20, diff: 20, new:20);;          blabla
-v 1363 NON;ARTIFACT;(old: 20, diff: 20, new:20);(old: 21, diff: 21, new:21);;          blabla
-v 1619 NON;ARTIFACT;(old: 24, diff: 24, new:24);(old: 25, diff: 25, new:25);;
-v 1680 NON;IF;(old: 25, diff: 25, new:25);(old: 28, diff: 28, new:28);(-DEFINED_HAVE_GETHOSTBYNAME_R | -DEFINED_HAVE_GETHOSTBYADDR_R) & (-DEFINED_HAVE_MTSAFE_GETHOSTBYNAME | -DEFINED_HAVE_MTSAFE_GETHOSTBYADDR);#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R)) && \;    (!defined(HAVE_MTSAFE_GETHOSTBYNAME) || !defined(HAVE_MTSAFE_GETHOSTBYADDR))
-v 1811 NON;ARTIFACT;(old: 27, diff: 27, new:27);(old: 28, diff: 28, new:28);;hello
-v 1939 NON;ARTIFACT;(old: 29, diff: 29, new:29);(old: 30, diff: 30, new:30);;}
-v 2000 NON;IF;(old: 30, diff: 30, new:30);(old: 32, diff: 32, new:32);DEFINED_MESSAGE;#if defined (MESSAGE)
-v 2067 NON;ARTIFACT;(old: 31, diff: 31, new:31);(old: 32, diff: 32, new:32);;   #define MESSAGE "You wish!"
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 147 NON;ARTIFACT;(old: 1, diff: 1, new: 1);(old: 2, diff: 2, new: 2);;
+v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;
+v 275 NON;ARTIFACT;(old: 3, diff: 3, new: 3);(old: 4, diff: 4, new: 4);;
+v 336 NON;IF;(old: 4, diff: 4, new: 4);(old: 33, diff: 33, new: 33);-_DB_STL_RESOURCE_MANAGER_H__;#ifndef _DB_STL_RESOURCE_MANAGER_H__
+v 403 NON;ARTIFACT;(old: 5, diff: 5, new: 5);(old: 6, diff: 6, new: 6);;#include <stdio.h>
+v 467 NON;ARTIFACT;(old: 6, diff: 6, new: 6);(old: 7, diff: 7, new: 7);;
+v 528 NON;IF;(old: 7, diff: 7, new: 7);(old: 9, diff: 9, new: 9);-DEFINED_MESSAGE;#if !defined (MESSAGE)
+v 595 NON;ARTIFACT;(old: 8, diff: 8, new: 8);(old: 9, diff: 9, new: 9);;   #define MESSAGE "You wish!"
+v 657 NON;ELSE;(old: 9, diff: 9, new: 9);(old: 11, diff: 11, new: 11);;#else
+v 723 NON;ARTIFACT;(old: 10, diff: 10, new: 10);(old: 11, diff: 11, new: 11);;   // do nothing
+v 851 NON;ARTIFACT;(old: 12, diff: 12, new: 12);(old: 13, diff: 13, new: 13);;
+v 915 NON;ARTIFACT;(old: 13, diff: 13, new: 13);(old: 14, diff: 14, new: 14);;int main(void) {
+v 979 NON;ARTIFACT;(old: 14, diff: 14, new: 14);(old: 15, diff: 15, new: 15);;   printf("Here is the message: %s\n", MESSAGE);
+v 1043 NON;ARTIFACT;(old: 15, diff: 15, new: 15);(old: 16, diff: 16, new: 16);;
+v 1104 NON;IF;(old: 16, diff: 16, new: 16);(old: 21, diff: 21, new: 21);(-DEFINED_HAVE_GETHOSTBYNAME_R | -DEFINED_HAVE_GETHOSTBYADDR_R | -DEFINED_HAVE_GETPWUID_R | -DEFINED_HAVE_GETGRGID_R) & (-DEFINED_HAVE_MTSAFE_GETHOSTBYNAME | -DEFINED_HAVE_MTSAFE_GETHOSTBYADDR);#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R) || \;           !defined(HAVE_GETPWUID_R)      || !defined(HAVE_GETGRGID_R)) && \;          (!defined(HAVE_MTSAFE_GETHOSTBYNAME) || !defined(HAVE_MTSAFE_GETHOSTBYADDR))
+v 1299 NON;ARTIFACT;(old: 19, diff: 19, new: 19);(old: 20, diff: 20, new: 20);;          blabla
+v 1363 NON;ARTIFACT;(old: 20, diff: 20, new: 20);(old: 21, diff: 21, new: 21);;          blabla
+v 1619 NON;ARTIFACT;(old: 24, diff: 24, new: 24);(old: 25, diff: 25, new: 25);;
+v 1680 NON;IF;(old: 25, diff: 25, new: 25);(old: 28, diff: 28, new: 28);(-DEFINED_HAVE_GETHOSTBYNAME_R | -DEFINED_HAVE_GETHOSTBYADDR_R) & (-DEFINED_HAVE_MTSAFE_GETHOSTBYNAME | -DEFINED_HAVE_MTSAFE_GETHOSTBYADDR);#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R)) && \;    (!defined(HAVE_MTSAFE_GETHOSTBYNAME) || !defined(HAVE_MTSAFE_GETHOSTBYADDR))
+v 1811 NON;ARTIFACT;(old: 27, diff: 27, new: 27);(old: 28, diff: 28, new: 28);;hello
+v 1939 NON;ARTIFACT;(old: 29, diff: 29, new: 29);(old: 30, diff: 30, new: 30);;}
+v 2000 NON;IF;(old: 30, diff: 30, new: 30);(old: 32, diff: 32, new: 32);DEFINED_MESSAGE;#if defined (MESSAGE)
+v 2067 NON;ARTIFACT;(old: 31, diff: 31, new: 31);(old: 32, diff: 32, new: 32);;   #define MESSAGE "You wish!"
 e 147 16 ba;0
 e 211 16 ba;1
 e 275 16 ba;2

src/test/resources/diffs/differ/d7eeba1b94f3d0c0ebed3457eea8fa8537143348.lg

@@ -1,7 +1,7 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 2, diff: 2, new:2);;Hello world
-v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 3, diff: 3, new:3);;
-v 275 NON;ARTIFACT;(old: 3, diff: 3, new:3);(old: 4, diff: 4, new:4);;Another line
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 147 NON;ARTIFACT;(old: 1, diff: 1, new: 1);(old: 2, diff: 2, new: 2);;Hello world
+v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 3, diff: 3, new: 3);;
+v 275 NON;ARTIFACT;(old: 3, diff: 3, new: 3);(old: 4, diff: 4, new: 4);;Another line
 e 147 16 ba;0
 e 211 16 ba;1
 e 275 16 ba;2

src/test/resources/diffs/parser/01_expected.lg

@@ -1,5 +1,5 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 136 REM;IF;(old: 1, diff: 1, new:-1);(old: 3, diff: 3, new:-1);A;#ifdef \;  A
-v 195 ADD;ARTIFACT;(old: -1, diff: 2, new:1);(old: -1, diff: 3, new:2);;  A
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 3, diff: 3, new: -1);A;#ifdef \;  A
+v 195 ADD;ARTIFACT;(old: -1, diff: 2, new: 1);(old: -1, diff: 3, new: 2);;  A
 e 136 16 b;0
 e 195 16 a;1

src/test/resources/diffs/parser/02_expected.lg

@@ -1,7 +1,7 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 136 REM;IF;(old: 1, diff: 1, new:-1);(old: 3, diff: 3, new:-1);A;#if A
-v 211 NON;ARTIFACT;(old: 2, diff: 2, new:1);(old: 3, diff: 3, new:2);;  Code
-v 323 ADD;ARTIFACT;(old: -1, diff: 4, new:2);(old: -1, diff: 5, new:3);;  // Hehe
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 3, diff: 3, new: -1);A;#if A
+v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 1);(old: 3, diff: 3, new: 2);;  Code
+v 323 ADD;ARTIFACT;(old: -1, diff: 4, new: 2);(old: -1, diff: 5, new: 3);;  // Hehe
 e 136 16 b;0
 e 211 136 b;0
 e 211 16 a;1

src/test/resources/diffs/parser/03_expected.lg

@@ -1,9 +1,9 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 136 REM;IF;(old: 1, diff: 1, new:-1);(old: 7, diff: 9, new:-1);A & B & C & D;#if A \;  && B \;  && C \;  && D
-v 523 REM;ARTIFACT;(old: 5, diff: 7, new:-1);(old: 6, diff: 8, new:-1);;  // Foo
-v 595 NON;ARTIFACT;(old: 6, diff: 8, new:5);(old: 7, diff: 9, new:6);;Code
-v 128 ADD;IF;(old: -1, diff: 1, new:1);(old: -1, diff: 10, new:6);A | B | C;#if A \;  || B \;  || C \;  // Foo
-v 771 ADD;ARTIFACT;(old: -1, diff: 11, new:7);(old: -1, diff: 12, new:8);;  // Bar
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 136 REM;IF;(old: 1, diff: 1, new: -1);(old: 7, diff: 9, new: -1);A & B & C & D;#if A \;  && B \;  && C \;  && D
+v 523 REM;ARTIFACT;(old: 5, diff: 7, new: -1);(old: 6, diff: 8, new: -1);;  // Foo
+v 595 NON;ARTIFACT;(old: 6, diff: 8, new: 5);(old: 7, diff: 9, new: 6);;Code
+v 128 ADD;IF;(old: -1, diff: 1, new: 1);(old: -1, diff: 10, new: 6);A | B | C;#if A \;  || B \;  || C \;  // Foo
+v 771 ADD;ARTIFACT;(old: -1, diff: 11, new: 7);(old: -1, diff: 12, new: 8);;  // Bar
 e 136 16 b;0
 e 523 136 b;0
 e 595 136 b;1

src/test/resources/diffs/parser/04_expected.lg

@@ -1,5 +1,5 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 4, diff: 4, new:4);A;#ifdef A
-v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 4, diff: 4, new:4);;  a \;  b
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 144 NON;IF;(old: 1, diff: 1, new: 1);(old: 4, diff: 4, new: 4);A;#ifdef A
+v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 4, diff: 4, new: 4);;  a \;  b
 e 144 16 ba;0
 e 211 144 ba;0

src/test/resources/diffs/parser/05_expected.lg

@@ -1,5 +1,5 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 144 NON;IF;(old: 1, diff: 1, new:1);(old: 4, diff: 4, new:4);A;#ifdef A
-v 211 NON;ARTIFACT;(old: 2, diff: 2, new:2);(old: 4, diff: 4, new:4);;  a \;  b
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 144 NON;IF;(old: 1, diff: 1, new: 1);(old: 4, diff: 4, new: 4);A;#ifdef A
+v 211 NON;ARTIFACT;(old: 2, diff: 2, new: 2);(old: 4, diff: 4, new: 4);;  a \;  b
 e 144 16 ba;0
 e 211 144 ba;0

src/test/resources/diffs/parser/06_expected.lg

@@ -1,5 +1,5 @@
-v 16 NON;IF;(old: -1, diff: -1, new:-1);(old: -1, diff: -1, new:-1);True
-v 147 NON;ARTIFACT;(old: 1, diff: 1, new:1);(old: 3, diff: 3, new:3);;// hehe \;#ifdef A
-v 275 NON;ARTIFACT;(old: 3, diff: 3, new:3);(old: 5, diff: 5, new:5);;Code \;#endif
+v 16 NON;IF;(old: -1, diff: -1, new: -1);(old: -1, diff: -1, new: -1);True
+v 147 NON;ARTIFACT;(old: 1, diff: 1, new: 1);(old: 3, diff: 3, new: 3);;// hehe \;#ifdef A
+v 275 NON;ARTIFACT;(old: 3, diff: 3, new: 3);(old: 5, diff: 5, new: 5);;Code \;#endif
 e 147 16 ba;0
 e 275 16 ba;1