[sikuli] 359/385: added cleanUp to abort handling in IDE, added Mouse and Key reset to cleanUp

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit f4d40366ae516debc2269fe0b68264223121ce76
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Apr 15 18:27:33 2014 +0200

    added cleanUp  to abort handling in IDE, added Mouse and Key reset to cleanUp
---
 API/src/main/java/org/sikuli/script/SikuliX.java | 4 ++++
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/API/src/main/java/org/sikuli/script/SikuliX.java b/API/src/main/java/org/sikuli/script/SikuliX.java
index 640b41a..c2dfb65 100644
--- a/API/src/main/java/org/sikuli/script/SikuliX.java
+++ b/API/src/main/java/org/sikuli/script/SikuliX.java
@@ -50,6 +50,10 @@ public class SikuliX {
     Debug.log(3, me + "cleanUp: %d", n);
     ScreenHighlighter.closeAll();
     Observing.cleanUp();
+    Mouse.reset();
+    //TODO move to class Keys after implementation
+    Screen.getPrimaryScreen().getRobot().keyUp();
+    //TODO what about remote screen sessions????
     if (CommandArgs.isIDE()) {
       //TODO reset selected options to defaults
     }
diff --git a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
index 3978d70..a277800 100755
--- a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
+++ b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
@@ -2376,9 +2376,10 @@ public class SikuliIDE extends JFrame {
   }
 
   public void onStopRunning() {
-    Debug.log(3, "StopRunning");
+    Debug.log(3, "StopRunning after AbortKey");
     _btnRun.stopRunning();
     _btnRunViz.stopRunning();
+    org.sikuli.script.SikuliX.cleanUp(-1);
     this.setVisible(true);
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git