Commit 73402239 authored by Lulu Luong's avatar Lulu Luong

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/SaveCommand.java
parents b4036098 83df2985
......@@ -112,6 +112,8 @@ public class KeYProofFacade {
protected void succeeded() {
System.out.println("KeYProofFacade.succeeded");
environment.set(getValue().getEnv());
//SaG: this needs to be set to filter inapplicable rules
getEnvironment().getProofControl().setMinimizeInteraction(true);
proof.set(getValue().getProof());
contract.set(null);
setLoading(false);
......
......@@ -76,14 +76,13 @@ public class SaveCommand implements CommandHandler<KeyData> {
if(execute.get())
interpreter.getSelectedNode().getData().getProof().saveToFile(newFile);
//TODO: KeyPersistentFacade.write(interpreter.getCurrentState(), new StringWriter());
KeyPersistentFacade.write(interpreter.getCurrentState(), new StringWriter());
} catch (IOException e) {
e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
} catch (JAXBException e) {
e.printStackTrace();
}
}
......
......@@ -1178,8 +1178,7 @@ public class DebuggerMain implements Initializable {
interactiveModeController.setDebuggerFramework(model.getDebuggerFramework());
interactiveModeController.setKeYServices(this.getFacade().getService());
interactiveModeController.setActivated(true);
//SaG: this needs to be set to filter inapplicable rules
this.getFacade().getEnvironment().getProofControl().setMinimizeInteraction(true);
interactiveModeController.start(getFacade().getProof(), getInspectionViewsController().getActiveInspectionViewTab().getModel());
interactive_undo.setDisable(false);
......
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