Merge remote-tracking branch 'origin/master'

# Conflicts:
#	rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/SaveCommand.java

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/KeYProofFacade.java

@@ -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);

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/funchdl/SaveCommand.java

@@ -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();
         }
     }
 

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

@@ -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);