Changeset 1900 for trunk/digitalme/launchers/csharp/Novell.IdentityModel.Selectors

Timestamp:

06/03/08 15:50:30 (2 years ago)

Author:

jnorman

Message:

Code cleanup on c# launcher

Files:

• trunk/digitalme/launchers/csharp/Novell.IdentityModel.Selectors/DigitalMeSelector.cs (modified) (7 diffs)

trunk/digitalme/launchers/csharp/Novell.IdentityModel.Selectors/DigitalMeSelector.cs

@@ -10 +10 @@
     public class DigitalMeSelector
     {
-
         private static string DM_TEST_ARG_STR = "--test";
         private static string DM_GET_TOKEN_ARG_STR = "--gettoken ";
@@ -59 +58 @@
         }
 
-        public static void GetToken(String sRelyingParty,
+        public static byte[] GetToken(String sRelyingParty,
                                     String[] saRequiredClaims,
                                     String[] saOptionalClaims,
                                     String sTokenType)
         {
-            Console.WriteLine("Looking for DigitalMe");
             String sExePath = GetExePath();
             if (null != sExePath)
@@ -116 +114 @@
                 File.Delete(sTempFileName);
 
-                Console.WriteLine("Token: " + System.Text.Encoding.ASCII.GetString(baToken));
+                DbgLog("Token: " + System.Text.Encoding.ASCII.GetString(baToken));
+                return baToken;
             }
             else
             {
-                Console.WriteLine("DigitalMe application not found");
-            }
+                DbgLog("DigitalMe application not found");
+            }
+            return null;
         }
 
         private static void LaunchSelector(String sExePath, StringBuilder sbArgs)
         {
-
             try
             {
@@ -133 +132 @@
                 StreamReader myStreamReader = null;
 
-
                 myProcess = new Process();
                 ProcessStartInfo myProcessStartInfo = new ProcessStartInfo(sExePath);
@@ -140 +138 @@
                 {
                     myProcessStartInfo.Arguments = sbArgs.ToString();
-                    Console.WriteLine("Args: {0}", myProcessStartInfo.Arguments);
+                    DbgLog("Args:" + myProcessStartInfo.Arguments);
                 }
 
@@ -173 +171 @@
 
 
-            Console.WriteLine("Platform: {0}", platform);
-            Console.WriteLine("OSVersion: {0}", Environment.OSVersion.Version.ToString());
+            DbgLog("Platform: " + platform.ToString());
+            DbgLog("OSVersion: " + Environment.OSVersion.Version.ToString());
 
             foreach (string path in paths)
             {
-                Console.WriteLine("Checking: {0}", path);
                 if (File.Exists(path))
                 {
+                    DbgLog(path);
                     return path;
                 }
@@ -192 +190 @@
             else
             {
-                Console.WriteLine("Platform: {0}" + platform);
+                DbgLog("Platform: " + platform.ToString());
             }
 
             return null;
+        }
+
+        private static void DbgLog(String sMessage)
+        {
+#if DEBUG
+            Console.WriteLine(sMessage);
+#endif
         }
     }