[sikuli] 372/385: fixed a problem in IDE: the temp script file (running code) had ending .null instead of ending .py, which led to problem in findErrorSource. The script name in error trace back does not have a leading * any more, if it was run without saving.

[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 d772bbf75b162c51503324e62e9ddbdafa6ee60b
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Sun Apr 27 18:24:11 2014 +0200

    fixed a problem in IDE: the temp script file (running code) had ending .null instead of ending .py, which led to problem in findErrorSource. The script name in error trace back does not have a leading * any more, if it was run without saving.
---
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
index a277800..fd1e253 100755
--- a/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
+++ b/IDE/src/main/java/org/sikuli/ide/SikuliIDE.java
@@ -1973,7 +1973,7 @@ public class SikuliIDE extends JFrame {
         public void run() {
           EditorPane codePane = SikuliIDE.getInstance().getCurrentCodePane();
           File tmpFile;
-          tmpFile = FileManager.createTempFile(Settings.EndingTypes.get(codePane.getSikuliContentType()));
+          tmpFile = FileManager.createTempFile(Settings.TypeEndings.get(codePane.getSikuliContentType()));
           if (tmpFile == null) {
             return;
           }
@@ -2014,10 +2014,10 @@ public class SikuliIDE extends JFrame {
       addScriptCode(srunner);
       try {
         ImagePath.resetBundlePath(path.getAbsolutePath());
-        int ret = srunner.runScript(sfile, path,
-                Settings.getArgs(),
-                new String[]{parent.getAbsolutePath(),
-                  _mainPane.getTitleAt(_mainPane.getSelectedIndex())});
+				String tabtitle = _mainPane.getTitleAt(_mainPane.getSelectedIndex());
+				if (tabtitle.startsWith("*")) tabtitle = tabtitle.substring(1);
+        int ret = srunner.runScript(sfile, path, Settings.getArgs(),
+								new String[]{parent.getAbsolutePath(), tabtitle});
         addErrorMark(ret);
         srunner.close();
       } catch (Exception e) {

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