From 5aa118acdecfeb5c88073199ad18e034117e6e16 Mon Sep 17 00:00:00 2001
From: Alexander Weigl <weigl@kit.edu>
Date: Fri, 10 Nov 2017 13:11:33 +0100
Subject: [PATCH] repair

---
 .../psdbg/gui/controller/DebuggerMain.java    |  6 +--
 .../controller/InteractiveModeController.java |  2 +-
 .../psdbg/gui/controls/ScriptController.java  | 45 +------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
index d50a2a2a..dca55b08 100644
--- a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
+++ b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
@@ -502,9 +502,9 @@ public class DebuggerMain implements Initializable {
         Platform.runLater(() -> {
             scriptController.getDebugPositionHighlighter().remove();
             statusBar.publishSuccessMessage("Interpreter finished.");
-            btnIM.setDisable(false);
+            btnInteractiveMode.setDisable(false);
             assert model.getDebuggerFramework() != null;
-            btnIM.setSelected(true);
+            btnInteractiveMode.setSelected(true);
             /*PTreeNode<KeyData> statePointer = model.getDebuggerFramework().getStatePointer();
             assert statePointer!=null;
             State<KeyData> lastState = statePointer.getStateAfterStmt();
@@ -871,8 +871,6 @@ public class DebuggerMain implements Initializable {
         } 
     }
 
-
-    }
     @FXML
     public void showWelcomeDock(ActionEvent actionEvent) {
         if (!welcomePaneDock.isDocked() && !welcomePaneDock.isFloating()) {
diff --git a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
index 537368bd..371ea14d 100644
--- a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
+++ b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/InteractiveModeController.java
@@ -67,7 +67,7 @@ public class InteractiveModeController {
     public void stop() {
         Events.unregister(this);
         String c = getCasesAsString();
-        scriptController.getDockNode(scripundocktArea).undock();
+        scriptController.getDockNode(scriptArea).undock();
         Events.fire(new Events.InsertAtTheEndOfMainScript(c));
     }
 
diff --git a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java
index 29a8da0e..06f414f9 100644
--- a/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java
+++ b/ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptController.java
@@ -120,14 +120,6 @@ public class ScriptController {
         return getDockNode(findEditor(filepath));
     }
 
-<<<<<<< HEAD
-    public DockNode getDockNode(ScriptArea editor) {
-        if (editor == null) {
-            return null;
-        }
-        return openScripts.get(editor);
-    }
-
     /**
      * Create a new Tab in the ScriptTabPane containing the contents of the file given as argument
      *
@@ -161,10 +153,7 @@ public class ScriptController {
         }
     }
 
-=======
->>>>>>> fe78f6e478dd00993310329ee09e52cb3af7a516
-    /**
-     * Create new DockNode for ScriptArea Tab
+     /* Create new DockNode for ScriptArea Tab
      *
      * @param area ScriptAreaTab
      * @return
@@ -201,38 +190,6 @@ public class ScriptController {
         return dockNode;
     }
 
-    /**
-     * Create a new Tab in the ScriptTabPane containing the contents of the file given as argument
-     *
-     * @param filePath to file that should be loaded to new tab
-     * @return refernce to new scriptArea in new tab
-     * @throws IOException if an Exception occurs while loading file
-     */
-    public ScriptArea createNewTab(File filePath) throws IOException {
-        filePath = filePath.getAbsoluteFile();
-        if (findEditor(filePath) == null) {
-            ScriptArea area = new ScriptArea();
-            area.mainScriptProperty().bindBidirectional(mainScript);
-            area.setFilePath(filePath);
-            DockNode dockNode = createDockNode(area);
-            openScripts.put(area, dockNode);
-
-            if (filePath.exists()) {
-                String code = FileUtils.readFileToString(filePath, "utf-8");
-                if (!area.textProperty().getValue().isEmpty()) {
-                    area.deleteText(0, area.textProperty().getValue().length());
-                }
-                area.setText(code);
-            }
-
-
-            return area;
-        } else {
-            logger.info("File already exists. Will not load it again");
-            ScriptArea area = findEditor(filePath);
-            return area;
-        }
-    }
 
     public DockNode getDockNode(ScriptArea editor) {
         if (editor == null) {
-- 
GitLab