From a7a05d055c1f03cfff049c4a2cb0cb65c1c85cb0 Mon Sep 17 00:00:00 2001 From: Sarah Grebing Date: Mon, 29 Jan 2018 08:38:10 +0100 Subject: [PATCH] changed Welcomepane and added sysouts to interactiveModecontroller --- .../iti/formal/psdbg/gui/controller/DebuggerMain.java | 2 +- .../gui/controller/InteractiveModeController.java | 6 +++--- .../services/edu.kit.iti.formal.psdbg.examples.Example | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 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 2b07c49e..0a3a0a64 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 @@ -136,7 +136,7 @@ public class DebuggerMain implements Initializable { //----------------------------------------------------------------------------------------------------------------- private ProofTree proofTree = new ProofTree(); private DockNode proofTreeDock = new DockNode(proofTree, "Proof Tree"); - private WelcomePaneFMEdition welcomePane = new WelcomePaneFMEdition(this); + private WelcomePane welcomePane = new WelcomePane(this); private DockNode welcomePaneDock = new DockNode(welcomePane, "Welcome", new MaterialDesignIconView(MaterialDesignIcon.ACCOUNT)); private DockNode activeInspectorDock; private CommandHelp commandHelp = new CommandHelp(); 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 53d816b2..e98bc8a4 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 @@ -289,9 +289,9 @@ public class InteractiveModeController { map.put("#2", call.getCommand()); EngineState estate = new EngineState(g.proof()); estate.setGoal(g); - // System.out.println("on = " + map.get("on")); - // System.out.println("formula = " +map.get("formula")); - // System.out.println("occ = " + map.get("occ")); + System.out.println("on = " + map.get("on")); + System.out.println("formula = " + map.get("formula")); + System.out.println("occ = " + map.get("occ")); RuleCommand.Parameters cc = c.evaluateArguments(estate, map); //reflection exception AbstractUserInterfaceControl uiControl = new DefaultUserInterfaceControl(); diff --git a/ui/src/main/resources/META-INF/services/edu.kit.iti.formal.psdbg.examples.Example b/ui/src/main/resources/META-INF/services/edu.kit.iti.formal.psdbg.examples.Example index 8d2d49e1..3c068a80 100644 --- a/ui/src/main/resources/META-INF/services/edu.kit.iti.formal.psdbg.examples.Example +++ b/ui/src/main/resources/META-INF/services/edu.kit.iti.formal.psdbg.examples.Example @@ -1,6 +1,12 @@ edu.kit.iti.formal.psdbg.examples.contraposition.ContrapositionExample edu.kit.iti.formal.psdbg.examples.fol.FirstOrderLogicExample +edu.kit.iti.formal.psdbg.examples.java.simple.JavaSimpleExample +edu.kit.iti.formal.psdbg.examples.java.transitive.PaperExample +edu.kit.iti.formal.psdbg.examples.java.dpqs.DualPivotExample edu.kit.iti.formal.psdbg.examples.java.quicksort.QuickSort edu.kit.iti.formal.psdbg.examples.agatha.AgathaExample -edu.kit.iti.formal.psdbg.examples.java.simple.JavaSimpleExample - +edu.kit.iti.formal.psdbg.examples.java.bubbleSort.BubbleSortExample +edu.kit.iti.formal.psdbg.examples.java.sumAndMax.SumAndMaxExample +edu.kit.iti.formal.psdbg.examples.lulu.LuLuDoubleLinkedList +edu.kit.iti.formal.psdbg.examples.lulu.LuLuQuickSort +edu.kit.iti.formal.psdbg.examples.lulu.LuLuSumAndMax \ No newline at end of file -- GitLab