[sikuli] 291/385: minor in setup

[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 6af1a8b7a8917664314216dfd0bdbcc91ae08307
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Feb 24 15:04:51 2014 +0100

    minor in setup
---
 Basics/src/main/java/org/sikuli/basics/RunSetup.java   | 18 +++++++++---------
 .../src/main/java/org/sikuli/basics/SetUpSelect.form   |  8 ++++----
 .../src/main/java/org/sikuli/basics/SetUpSelect.java   |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
index 2abd541..6635bb7 100644
--- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java
+++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
@@ -324,9 +324,16 @@ public class RunSetup {
       runningfromJar = false;
     }
     workDir = workDir.substring(1);
-
+    Settings.LogTime = true;
+    Debug.setDebugLevel(3);
+    
     if (runningfromJar) {
       logfile = (new File(workDir, localLogfile)).getAbsolutePath();
+      if (!Debug.setLogFile(logfile)) {
+        popError(workDir + "\n... folder we are running in must be user writeable! \n"
+                + "please correct the problem and start again.");
+        System.exit(0);
+      }
       String projectDir;
       if (runningJar.endsWith("-plain.jar")) {
         localSetup = runningJar;
@@ -419,17 +426,10 @@ public class RunSetup {
       workDir = (new File(uhome, "SikuliX/Setup")).getAbsolutePath();
       (new File(workDir)).mkdirs();
       logfile = (new File(workDir, localLogfile)).getAbsolutePath();
+      Debug.setLogFile(logfile);
       popInfo("\n... not running from sikuli-setup.jar - using as download folder\n" + workDir);
     }
 
-    if (!Debug.setLogFile(logfile)) {
-      popError(workDir + "\n... folder we are running in must be user writeable! \n"
-              + "please correct the problem and start again.");
-      System.exit(0);
-    }
-
-    Settings.LogTime = true;
-    Debug.setDebugLevel(3);
     log0(lvl, "running from: " + runningJar);
     log1(lvl, "SikuliX Setup Build: %s %s", Settings.getVersionShort(), RunSetup.timestampBuilt);
 
diff --git a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
index 64bc9fa..21cb4f1 100644
--- a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
+++ b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.form
@@ -112,7 +112,7 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Component id="pPort" min="-2" pref="69" max="-2" attributes="0"/>
-                                  <Component id="ask7" min="-2" max="-2" attributes="0"/>
+                                  <Component id="ask7" alignment="1" min="-2" max="-2" attributes="0"/>
                               </Group>
                           </Group>
                           <Group type="102" alignment="0" attributes="0">
@@ -185,9 +185,9 @@
                   <Component id="ask6" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="ask7" min="-2" max="-2" attributes="0"/>
-                  <Component id="option7" min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="option7" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="ask7" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
diff --git a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
index 342aec8..8890713 100644
--- a/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
+++ b/Basics/src/main/java/org/sikuli/basics/SetUpSelect.java
@@ -266,7 +266,7 @@ public class SetUpSelect extends javax.swing.JPanel {
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                   .add(pPort, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 69, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                  .add(ask7)))
+                  .add(org.jdesktop.layout.GroupLayout.TRAILING, ask7)))
               .add(layout.createSequentialGroup()
                 .add(option6)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -322,9 +322,9 @@ public class SetUpSelect extends javax.swing.JPanel {
           .add(option6)
           .add(ask6))
         .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-          .add(ask7)
-          .add(option7))
+        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+          .add(option7)
+          .add(ask7))
         .add(28, 28, 28)
         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
           .add(jLabel6)

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