repair merge errors

src/main/java/edu/kit/formal/gui/controller/DebuggerMainWindowController.java

@@ -12,7 +12,6 @@ import edu.kit.formal.interpreter.KeYProofFacade;
 import edu.kit.formal.interpreter.data.KeyData;
 import edu.kit.formal.interpreter.graphs.PTreeNode;
 import edu.kit.formal.interpreter.graphs.ProofTreeController;
-import edu.kit.formal.proofscriptparser.Facade;
 import edu.kit.formal.proofscriptparser.ast.ProofScript;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
@@ -65,13 +64,6 @@ public class DebuggerMainWindowController implements Initializable {
     @FXML
     private DockPane dockStation;
 
-    //@FXML
-    //private SplitPane splitPane;
-    /***********************************************************************************************************
-     *      Code Area
-     * **********************************************************************************************************/
-
-    //@FXML
     private ScriptController scriptController;
 
     /***********************************************************************************************************
@@ -205,12 +197,7 @@ public class DebuggerMainWindowController implements Initializable {
 
     //region Actions: Execution
     @FXML
-    public void executeScript() {.
-
-Bitte ändere nichts am Stepping (also die beiden Graphenerstellungen
-etc.) und an der Labelsache, da ich hier das selber machen möchte.
-
-
+    public void executeScript() {
         executeScript(facade.buildInterpreter(), false);
     }
 
@@ -267,7 +254,7 @@ etc.) und an der Labelsache, da ich hier das selber machen möchte.
             });
 
             pc.currentHighlightNodeProperty().addListener((observable, oldValue, newValue) -> {
-                scriptController.getPostMortemHighlighter().highlight(newValue);
+                scriptController.getDebugPositionHighlighter().highlight(newValue);
             });
             //highlight signature of main script
             //scriptController.setDebugMark(scripts.get(0).getStartPosition().getLineNumber());
@@ -462,7 +449,7 @@ etc.) und an der Labelsache, da ich hier das selber machen möchte.
     }
 
     public void stopDebugMode(ActionEvent actionEvent) {
-        tabPane.getSelectedScriptArea().removeDebugHighlight();
+        scriptController.getDebugPositionHighlighter().remove();
         //linenumberMainscript from model?
         //scriptController.getActiveScriptAreaTab().getScriptArea().removeHighlightStmt(lineNumberMainScript);
         //inspectionViewsController.getInspectionViewTab.clear();

src/main/java/edu/kit/formal/gui/controls/InspectionViewTab.java

@@ -12,7 +12,6 @@ import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
-import javafx.scene.control.SplitPane;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 
@@ -24,9 +23,6 @@ import javafx.scene.layout.BorderPane;
 public class InspectionViewTab extends BorderPane {
     public GoalOptionsMenu goalOptionsMenu = new GoalOptionsMenu();
 
-    @FXML
-    private SplitPane lowerSplitPane;
-
     @FXML
     private SequentView sequentView;
 

src/main/java/edu/kit/formal/gui/controls/InspectionViewTabPane.java

-package edu.kit.formal.gui.controls;
-
-import edu.kit.formal.gui.model.RootModel;
-import javafx.fxml.FXML;
-import javafx.scene.control.TabPane;
-
-/**
- * TabPane on the right side of the GUI containing the inspection view as tabs
- */
-public class InspectionViewTabPane extends TabPane {
-
-    /**
-     * active tab in which the interpreter resp. Debugger state is shown.
-     * This tab can be changed and later on in this tab it should be possible to select proof commands
-     * All other tabs are only post morten tabs which cannot be shown
-     */
-    private InspectionViewTab activeInterpreterTab;
-
-
-    @FXML
-    private InspectionViewTab inspectionViewTab;
-
-    public InspectionViewTabPane() {
-        super();
-        Utils.createWithFXML(this);
-    }
-
-
-    public void setActiveInterpreterTab(InspectionViewTab activeInterpreterTab) {
-        this.activeInterpreterTab = activeInterpreterTab;
-    }
-
-    public InspectionViewTab getActiveInspectionViewTab() {
-        return this.activeInterpreterTab;
-    }
-
-    public void createNewInspectionViewTab(RootModel model, boolean activeTab) {
-        InspectionViewTab tab = new InspectionViewTab();
-        if (activeTab) {
-            System.out.println(this.getActiveInspectionViewTab() == null);
-            this.setActiveInterpreterTab(tab);
-            tab.setText("Active Tab");
-            tab.setClosable(false);
-            this.setActiveInterpreterTab(tab);
-        }
-
-        model.chosenContractProperty().addListener(o -> {
-            tab.refresh(model);
-        });
-        bindGoalNodesWithCurrentTab(model);
-        model.javaFileProperty().addListener((observable, oldValue, newValue) -> {
-            tab.setShowCode(true);
-        });
-
-        this.getTabs().add(tab);
-    }
-
-
-    //TODO schauen wie Goallist ins model kommt
-    public void bindGoalNodesWithCurrentTab(RootModel model) {
-
-        getActiveInspectionViewTab().getGoalView().itemsProperty().bind(model.currentGoalNodesProperty());
-        model.currentSelectedGoalNodeProperty().addListener((p, old, fresh) -> {
-            getActiveInspectionViewTab().getGoalView().getSelectionModel().select(fresh);
-
-            /* TODO get lines of active statements marked lines
-            javaSourceCode.getMarkedLines().clear();
-            javaSourceCode.getMarkedLines().addAll(
-            );*/
-        });
-
-    }
-}

src/main/java/edu/kit/formal/gui/controls/ScriptArea.java

@@ -39,9 +39,7 @@ import org.fxmisc.richtext.CharacterHit;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.MouseOverTextEvent;
 import org.fxmisc.richtext.model.NavigationActions;
-import org.fxmisc.richtext.model.Paragraph;
 import org.fxmisc.richtext.model.StyleSpans;
-import org.fxmisc.richtext.model.StyledText;
 import org.reactfx.collection.LiveList;
 import org.reactfx.value.Val;
 
@@ -93,7 +91,7 @@ public class ScriptArea extends CodeArea {
             updateMainScriptMarker();
             updateHighlight();
             highlightProblems();
-
+        });
         markedRegions.addListener((InvalidationListener) o -> updateHighlight());
 
                /* .successionEnds(Duration.ofMillis(100))
@@ -543,7 +541,7 @@ public class ScriptArea extends CodeArea {
             }*/
         }
     }
-}
+
     public ObservableSet<RegionStyle> getMarkedRegions() {
         return markedRegions.get();
     }

src/main/java/edu/kit/formal/gui/controls/ScriptController.java

@@ -238,7 +238,7 @@ public class ScriptController {
         return area;
     }
 
-    public ASTNodeHighlighter getPostMortemHighlighter() {
+    public ASTNodeHighlighter getDebugPositionHighlighter() {
         return postMortemHighlighter;
     }