Commit 1465934b authored by Sarah Grebing's avatar Sarah Grebing

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

# Conflicts:
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
parent 6dbcf7e6
Pipeline #21935 passed with stages
in 5 minutes and 18 seconds
...@@ -4,6 +4,7 @@ import edu.kit.iti.formal.psdbg.parser.DefaultASTVisitor; ...@@ -4,6 +4,7 @@ import edu.kit.iti.formal.psdbg.parser.DefaultASTVisitor;
import edu.kit.iti.formal.psdbg.parser.ast.*; import edu.kit.iti.formal.psdbg.parser.ast.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.io.File; import java.io.File;
...@@ -12,9 +13,11 @@ import java.io.File; ...@@ -12,9 +13,11 @@ import java.io.File;
@RequiredArgsConstructor @RequiredArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class SavePoint { public class SavePoint {
@Getter
private final String name; private final String name;
private int startOffset = -1; private int startOffset = -1;
private int endOffset = -1; private int endOffset = -1;
@Getter
private int lineNumber = -1; private int lineNumber = -1;
private ForceOption force = ForceOption.YES; private ForceOption force = ForceOption.YES;
......
...@@ -46,7 +46,7 @@ public class SavePointController { ...@@ -46,7 +46,7 @@ public class SavePointController {
public String toString(SavePoint object) { public String toString(SavePoint object) {
if(object != null) { if(object != null) {
return String.format("%s (in line %d)", return String.format("%s (in line %d)",
object.getName(), object.getLineNumer()); object.getName(), object.getLineNumber());
} else { } else {
return ""; return "";
} }
...@@ -93,10 +93,10 @@ public class SavePointController { ...@@ -93,10 +93,10 @@ public class SavePointController {
}; };
for (SavePoint sp : savePoints) { 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); 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); menuItemsRollbackTo.add(mirollback);
if (i < 10) { if (i < 10) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment