[sikuli] 194/385: minor

[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 bb47d896d53239b7ecf67d9e1ecc5cccf460d238
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Fri Feb 7 13:50:31 2014 +0100

    minor
---
 Basics/src/main/java/org/sikuli/basics/RunSetup.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
index df05e05..66600a4 100644
--- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java
+++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
@@ -1041,36 +1041,31 @@ public class RunSetup {
   }
 
   protected static void restore() {
-    log1(lvl, "restoring from backup");
     String backup = new File(workDir, "Backup").getAbsolutePath();
     if (new File(backup, localIDE).exists() && !new File(workDir, localIDE).exists()) {
-      log1(lvl, "restoring " + localIDE);
+      log1(lvl, "restoring from backup " + localIDE);
       new File(backup, localIDE).renameTo(new File(workDir, localIDE));
     }
-//    if (new File(backup, localScript).exists() && !new File(workDir, localScript).exists()) {
-//      log1(lvl, "restoring " + localScript);
-//      new File(backup, localScript).renameTo(new File(workDir, localScript));
-//    }
     if (new File(backup, localJava).exists() && !new File(workDir, localJava).exists()) {
-      log1(lvl, "restoring " + localJava);
+      log1(lvl, "restoring from backup " + localJava);
       new File(backup, localJava).renameTo(new File(workDir, localJava));
     }
     if (new File(backup, localTess).exists() && !new File(workDir, localTess).exists()) {
-      log1(lvl, "restoring " + localTess);
+      log1(lvl, "restoring from backup " + localTess);
       new File(backup, localTess).renameTo(new File(workDir, localTess));
     }
     if (new File(backup, localRServer).exists() && !new File(workDir, localRServer).exists()) {
-      log1(lvl, "restoring " + localRServer);
+      log1(lvl, "restoring from backup " + localRServer);
       new File(backup, localRServer).renameTo(new File(workDir, localRServer));
     }
     String folder = "Lib";
     if (new File(backup, folder).exists() && !new File(workDir, folder).exists()) {
-      log1(lvl, "restoring " + "folder " + folder);
+      log1(lvl, "restoring from backup " + "folder " + folder);
       new File(backup, folder).renameTo(new File(workDir, folder));
     }
     folder = "libs";
     if (new File(backup, folder).exists() && !new File(workDir, folder).exists()) {
-      log1(lvl, "restoring " + "folder " + folder);
+      log1(lvl, "restoring from backup " + "folder " + folder);
       new File(backup, folder).renameTo(new File(workDir, folder));
     }
   }
@@ -1178,7 +1173,7 @@ public class RunSetup {
         break;
       case (2):
         om = "Package 2: To support developement in Java or any Java aware scripting language. you get sikulixapi.jar."
-                + "\nYou might want Pachkage 1 (SikuliX) additionally to use the IDE for managing the images or some trials.";
+                + "\nYou might want Package 1 (SikuliX) additionally to use the IDE for managing the images or some trials.";
 //              -------------------------------------------------------------
         m += "\nThe content of this package is stripped down to what is needed to develop in Java"
                 + " or any Java aware scripting language \n(no IDE, no bundled script run support for Jython)";

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