[sikuli] 307/385: minor fixes

[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 e953e7d939c5a4e4b393cf5fd60871eacf23cc37
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Fri Feb 28 18:55:17 2014 +0100

    minor fixes
---
 .../main/java/org/sikuli/basics/FileManager.java    |   9 ++++++---
 .../java/org/sikuli/basics/PreferencesUser.java     |   4 +++-
 .../org/sikuli/basics/WindowsHotkeyManager.java     |  10 +++++++++-
 .../META-INF/libs/windows/libs32/.gitignore         |   1 -
 .../META-INF/libs/windows/libs32/WinUtil.dll        | Bin 70656 -> 15872 bytes
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Basics/src/main/java/org/sikuli/basics/FileManager.java b/Basics/src/main/java/org/sikuli/basics/FileManager.java
index 39d3293..dbd131c 100644
--- a/Basics/src/main/java/org/sikuli/basics/FileManager.java
+++ b/Basics/src/main/java/org/sikuli/basics/FileManager.java
@@ -447,7 +447,7 @@ public class FileManager {
     zis.close();
   }
 
-  public static void xcopy(String src, String dest, String current) throws IOException {
+  public static void xcopy(String src, String dest, String saveAsCurrent) throws IOException {
     File fSrc = new File(src);
     File fDest = new File(dest);
     if (fSrc.getAbsolutePath().equals(fDest.getAbsolutePath())) {
@@ -459,8 +459,8 @@ public class FileManager {
       }
       String[] children = fSrc.list();
       for (String child : children) {
-        if (current != null && (child.endsWith(".py") || child.endsWith(".html"))
-                && child.startsWith(current + ".")) {
+        if (saveAsCurrent != null && (child.endsWith(".py") || child.endsWith(".html"))
+                && child.startsWith(saveAsCurrent + ".")) {
           log0(lvl, "xcopy: SaveAs: deleting %s", child);
           continue;
         } else if (child.endsWith("$py.class")) {
@@ -687,6 +687,9 @@ public class FileManager {
           }
         }
         runner = SikuliX.getScriptRunner(null, runType, args);
+        if (runner == null) {
+          scriptFile = null;
+        }
       }
       if (scriptFile == null && runner != null) {
         // try with fileending
diff --git a/Basics/src/main/java/org/sikuli/basics/PreferencesUser.java b/Basics/src/main/java/org/sikuli/basics/PreferencesUser.java
index 6ce3cb9..11e2d53 100644
--- a/Basics/src/main/java/org/sikuli/basics/PreferencesUser.java
+++ b/Basics/src/main/java/org/sikuli/basics/PreferencesUser.java
@@ -55,7 +55,9 @@ public class PreferencesUser {
   
   public boolean exportPrefs(String path) {
     try {
-      pref.exportSubtree(new FileOutputStream(new File(path))); 
+      FileOutputStream pout = new FileOutputStream(new File(path));              ;
+      pref.exportSubtree(pout); 
+      pout.close();
     } catch (Exception ex) {
       Debug.error("UserPrefs: export: did not work\n" + ex.getMessage());
       return false;
diff --git a/Basics/src/main/java/org/sikuli/basics/WindowsHotkeyManager.java b/Basics/src/main/java/org/sikuli/basics/WindowsHotkeyManager.java
index 9cc9a3a..cfa1487 100644
--- a/Basics/src/main/java/org/sikuli/basics/WindowsHotkeyManager.java
+++ b/Basics/src/main/java/org/sikuli/basics/WindowsHotkeyManager.java
@@ -35,7 +35,15 @@ public class WindowsHotkeyManager extends HotkeyManager {
 
   @Override
   public boolean _addHotkey(int keyCode, int modifiers, HotkeyListener listener) {
-    JIntellitype itype = JIntellitype.getInstance();
+    JIntellitype itype = null;
+    try {
+      itype = JIntellitype.getInstance();
+    } catch (Exception ex) {
+      Debug.error("WindowsHotkeyManager: JIntellitype problem: %s", ex.getMessage());
+    }
+    if (itype == null) {
+      System.exit(1);
+    }
     if (_gHotkeyId == 1) {
       itype.addHotKeyListener(new JIntellitypeHandler());
     }
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/.gitignore b/Libs/src/main/resources/META-INF/libs/windows/libs32/.gitignore
deleted file mode 100644
index 2251a41..0000000
--- a/Libs/src/main/resources/META-INF/libs/windows/libs32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-WinUtil.ilk
diff --git a/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll b/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll
index dcec4e2..3cdb8bb 100644
Binary files a/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll and b/Libs/src/main/resources/META-INF/libs/windows/libs32/WinUtil.dll differ

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