Commit 02365c55 authored by Sarah Grebing's avatar Sarah Grebing
Browse files

Commented statestack modification after cases. Needs to be reimplemented afterwards

parent 359117a7
Pipeline #10801 failed with stage
in 1 minute and 16 seconds
...@@ -115,11 +115,6 @@ ...@@ -115,11 +115,6 @@
<visitor>true</visitor> <visitor>true</visitor>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>2.0</version>
</plugin>
<plugin> <plugin>
<groupId>com.zenjava</groupId> <groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
......
...@@ -2,7 +2,7 @@ package edu.kit.formal.gui;/** ...@@ -2,7 +2,7 @@ package edu.kit.formal.gui;/**
* Created by sarah on 5/26/17. * Created by sarah on 5/26/17.
*/ */
import edu.kit.formal.gui.controller.RootController; import edu.kit.formal.gui.controller.DebuggerMainWindowController;
import edu.kit.formal.gui.model.RootModel; import edu.kit.formal.gui.model.RootModel;
import javafx.application.Application; import javafx.application.Application;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
...@@ -26,7 +26,7 @@ public class ProofScriptDebugger extends Application { ...@@ -26,7 +26,7 @@ public class ProofScriptDebugger extends Application {
Parent root = null; Parent root = null;
try { try {
root = (Parent) fxmlLoader.load(); root = (Parent) fxmlLoader.load();
RootController controller = fxmlLoader.<RootController>getController(); DebuggerMainWindowController controller = fxmlLoader.<DebuggerMainWindowController>getController();
controller.setStage(primaryStage); controller.setStage(primaryStage);
controller.setModel(rm); controller.setModel(rm);
controller.init(); controller.init();
......
...@@ -22,9 +22,10 @@ import java.util.List; ...@@ -22,9 +22,10 @@ import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
/** /**
* Created by sarah on 5/26/17. * Controller for the Debugger MainWindow
* @author S.Grebing
*/ */
public class RootController implements Initializable { public class DebuggerMainWindowController implements Initializable {
@FXML @FXML
Pane rootPane; Pane rootPane;
......
...@@ -205,7 +205,8 @@ public class Interpreter<T> extends DefaultASTVisitor<Void> ...@@ -205,7 +205,8 @@ public class Interpreter<T> extends DefaultASTVisitor<Void>
} }
stateStack.push(newStateAfterCases); stateStack.push(newStateAfterCases);
} }
stateStack.peek().getGoals().removeAll(beforeCases.getGoals());
//stateStack.peek().getGoals().removeAll(beforeCases.getGoals());
exitScope(casesStatement); exitScope(casesStatement);
return null; return null;
} }
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
<Pane xmlns:fx="http://javafx.com/fxml/1" fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" <Pane xmlns:fx="http://javafx.com/fxml/1" fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minHeight="-Infinity"
minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0"
xmlns="http://javafx.com/javafx/8.0.102-ea" fx:controller="edu.kit.formal.gui.controller.RootController"> xmlns="http://javafx.com/javafx/8.0.102-ea"
fx:controller="edu.kit.formal.gui.controller.DebuggerMainWindowController">
<children> <children>
<SplitPane fx:id="splitPane" dividerPositions="0.5" layoutY="29.0" prefHeight="371.0" prefWidth="600.0"> <SplitPane fx:id="splitPane" dividerPositions="0.5" layoutY="29.0" prefHeight="371.0" prefWidth="600.0">
<items> <items>
......
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