Merge remote-tracking branch 'remotes/origin/master' into luongSavepointTemp

# Conflicts:
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java

rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/data/SavePoint.java

@@ -4,6 +4,7 @@ import edu.kit.iti.formal.psdbg.parser.DefaultASTVisitor;
 import edu.kit.iti.formal.psdbg.parser.ast.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 import java.io.File;
@@ -12,9 +13,11 @@ import java.io.File;
 @RequiredArgsConstructor
 @AllArgsConstructor
 public class SavePoint {
+    @Getter
     private final String name;
     private int startOffset = -1;
     private int endOffset = -1;
+    @Getter
     private int lineNumber = -1;
     private ForceOption force = ForceOption.YES;
 

ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/SavePointController.java

@@ -46,7 +46,7 @@ public class SavePointController {
             public String toString(SavePoint object) {
                 if(object != null) {
                     return String.format("%s (in line %d)",
-                            object.getName(), object.getLineNumer());
+                            object.getName(), object.getLineNumber());
                 } else {
                     return "";
                 }
@@ -93,10 +93,10 @@ public class SavePointController {
         };
 
         for (SavePoint sp : savePoints) {
-            MenuItem mi = new MenuItem(String.format("%s (from line %d)", sp.getName(), sp.getLineNumer()));
+            MenuItem mi = new MenuItem(String.format("%s (from line %d)", sp.getName(), sp.getLineNumber()));
             menuItemsExecuteFrom.add(mi);
 
-            MenuItem mirollback = new MenuItem(String.format("%s (from line %d)", sp.getName(), sp.getLineNumer()));
+            MenuItem mirollback = new MenuItem(String.format("%s (from line %d)", sp.getName(), sp.getLineNumber()));
             menuItemsRollbackTo.add(mirollback);
 
             if (i < 10) {