[sikuli] 93/385: need not be in Settings

[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 943f59a3df9391d7fd9ab18044cf97709ad34399
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Dec 31 16:45:23 2013 +0100

    need not be in Settings
---
 Basics/src/main/java/org/sikuli/basics/ResourceLoader.java | 11 ++++-------
 Basics/src/main/java/org/sikuli/basics/Settings.java       |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
index 713fcc4..20e0024 100755
--- a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
+++ b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
@@ -39,6 +39,7 @@ public class ResourceLoader implements IResourceLoader {
     Debug.logx(level, "", me + ": " + message, args);
   }
   //</editor-fold>
+  
   private String loaderName = "basic";
   private static final String NL = String.format("%n");
   private static final String cmdRegCheck = "reg QUERY HKCU";
@@ -80,21 +81,17 @@ public class ResourceLoader implements IResourceLoader {
    */
   private static String libPathMac = Settings.appPathMac + "/libs";
   /**
-   * Win: standard place for native libs
-   */
-  private static final String libPathWin = FileManager.slashify(System.getenv("ProgramFiles"), true) + libSub;
-  private static final String libPathWin32 = FileManager.slashify(System.getenv("ProgramFiles(x86)"), true) + libSub;
-  /**
    * in-jar folder to load other ressources from
    */
   private static String jarResources = "META-INF/res/";
   /**
    * in-jar folder to load native libs from
    */
-  private static String libSourcebase = Settings.libSourcebase;
+  private static final String libSourcebase = "META-INF/libs/";
   private static String libSource32 = libSourcebase + "%s/libs32/";
   private static String libSource64 = libSourcebase + "%s/libs64/";
   private String libSource;
+  
   private String osarch;
   private String javahome;
 
@@ -139,7 +136,7 @@ public class ResourceLoader implements IResourceLoader {
         ZipEntry ze;
         while ((ze = zip.getNextEntry()) != null) {
           String entryName = ze.getName();
-          if (entryName.startsWith(Settings.libSourcebase)) {
+          if (entryName.startsWith(libSourcebase)) {
             return true;
           }
         }
diff --git a/Basics/src/main/java/org/sikuli/basics/Settings.java b/Basics/src/main/java/org/sikuli/basics/Settings.java
index 3b76819..711a21d 100644
--- a/Basics/src/main/java/org/sikuli/basics/Settings.java
+++ b/Basics/src/main/java/org/sikuli/basics/Settings.java
@@ -26,7 +26,6 @@ public class Settings {
   public static int breakPoint = 0;
   public static boolean handlesMacBundles = true;
   public static boolean runningSetup = false;
-  public static String libSourcebase = "META-INF/libs/";  
   private static final PreferencesUser prefs = PreferencesUser.getInstance();
   
   /**

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