Changeset 1896 for trunk/digitalme/launchers/java

Timestamp:

06/03/08 15:01:06 (2 years ago)

Author:

jnorman

Message:

cleanup on java launcher

Files:

• trunk/digitalme/launchers/java/src/com/novell/identityselector/CardSelector.java (modified) (6 diffs)

trunk/digitalme/launchers/java/src/com/novell/identityselector/CardSelector.java

@@ -82 +82 @@
                  
                 StringBuffer sbArgs = new StringBuffer();
-                String sExepath = GetExePath();
+                String sExepath = getExePath();
                 
                 String[] saArgs = new String[NUM_ARGS];
@@ -174 +174 @@
                 
 
-                for (int i=0; i<saArgs.length; i++)
-                {
-                        System.out.println(saArgs[i]);
-                }
-                
                 // launch selector
                 
@@ -185 +180 @@
                                 Process p = Runtime.getRuntime().exec(saArgs);
                                 int rcode = p.waitFor();
-                                System.out.println("Process return code: " + rcode);
-                        
                         }
                         catch (Exception e)
@@ -227 +220 @@
         {
                 
-                String sExepath = GetExePath();
+                String sExepath = getExePath();
         
                 if (sExepath != null)
@@ -248 +241 @@
         public static void importCard(String sFile) throws Exception
         {
-                String sExepath = GetExePath();
+                String sExepath = getExePath();
                 
                 if (sFile == null)
@@ -283 +276 @@
         Desc:
         ****************************************************************************/
-    private static String GetExePath()
-    {
-
-        String sUserhome = System.getProperty("user.home");
-
-        String[] paths = { "/Users/jimnorman//dev/digitalme/ui/cocoa/xcode/selector/build/Release/DigitalMe.app/Contents/MacOS/DigitalMe",
-                                                "/usr/local/lib/digitalme/bin/digitalme",
-                            "/usr/lib/digitalme/bin/digitalme",
-                            sUserhome + "/Desktop/DigitalMe.app.Contents/MacOS/DigitalMe",
-                            "/Applications/DigitalMe.app/Contents/MacOS/DigitalMe",
-                            "/Applications/Utilities/DigitalMe.app/Contents/MacOS",
-                            sUserhome + "/dev/digitalme/ui/cocoa/xcode/selector/build/Release/DigitalMe.app/Contents/MacOS/DigitalMe" };
-
-        for (int i=0; i<paths.length; i++)
-        {
-                java.io.File fFile = new java.io.File(paths[i]);        
-            if (fFile.exists())
-            {
-                return paths[i];
-            }
-        }
-
-        return null;
-    }   
+        private static String getExePath()
+        {
+
+                String sUserhome = System.getProperty("user.home");
+
+                String[] paths = {"/usr/local/lib/digitalme/bin/digitalme",
+                                  "/usr/lib/digitalme/bin/digitalme",
+                                  sUserhome + "/Desktop/DigitalMe.app/Contents/MacOS/DigitalMe",
+                                  "/Applications/DigitalMe.app/Contents/MacOS/DigitalMe",
+                                  "/Applications/Utilities/DigitalMe.app/Contents/MacOS"};
+
+                for (int i=0; i<paths.length; i++)
+                {
+                    java.io.File fFile = new java.io.File(paths[i]);        
+                    if (fFile.exists())
+                    {
+                        return paths[i];
+                    }
+                }
+
+                return null;
+        }       
 }