[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultManagerConnection.java,1.24,1.25

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24230/src/java/net/sf/asterisk/manager

Modified Files:
	DefaultManagerConnection.java 
Log Message:
Added convenience constructors to some manager actions

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- DefaultManagerConnection.java	2 Aug 2005 10:14:21 -0000	1.24
+++ DefaultManagerConnection.java	7 Aug 2005 00:09:42 -0000	1.25
@@ -384,6 +384,7 @@ public class DefaultManagerConnection im
         ChallengeAction challengeAction;
         ChallengeResponse challengeResponse;
         String challenge;
+        String key;
         LoginAction loginAction;
         ManagerResponse loginResponse;
 
@@ -412,16 +413,11 @@ public class DefaultManagerConnection im
             }
         }
 
-        challengeAction = new ChallengeAction();
-        challengeAction.setAuthType("MD5");
-
+        challengeAction = new ChallengeAction("MD5");
         challengeResponse = (ChallengeResponse) sendAction(challengeAction);
 
         challenge = challengeResponse.getChallenge();
 
-        loginAction = new LoginAction();
-        loginAction.setAuthType("MD5");
-        loginAction.setUsername(username);
         try
         {
             MessageDigest md;
@@ -435,7 +431,7 @@ public class DefaultManagerConnection im
             {
                 md.update(password.getBytes());
             }
-            loginAction.setKey(Util.toHexString(md.digest()));
+            key = Util.toHexString(md.digest());
         }
         catch (NoSuchAlgorithmException ex)
         {
@@ -444,6 +440,7 @@ public class DefaultManagerConnection im
                     "Unable to create login key using MD5 Message Digest", ex);
         }
 
+        loginAction = new LoginAction(username, "MD5", key);
         loginResponse = sendAction(loginAction);
         if (loginResponse instanceof ManagerError)
         {