[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/profile/sasl/otp OTPAuthenticator.java,1.13,1.14 SASLOTPProfile.java,1.10,1.11

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp
In directory sc8-pr-cvs1:/tmp/cvs-serv21972/src/org/beepcore/beep/profile/sasl/otp

Modified Files:
	OTPAuthenticator.java SASLOTPProfile.java 
Log Message:
More interface cleanup, added RequestHandler to replace MessageListener.

Index: OTPAuthenticator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** OTPAuthenticator.java	23 Apr 2003 15:23:03 -0000	1.13
--- OTPAuthenticator.java	10 Jun 2003 18:59:22 -0000	1.14
***************
*** 44,48 ****
   *
   */
! class OTPAuthenticator implements MessageListener, ReplyListener {
  
      // Constants
--- 44,48 ----
   *
   */
! class OTPAuthenticator implements RequestHandler, ReplyListener {
  
      // Constants
***************
*** 140,144 ****
          state = STATE_STARTED;
          channel = ch;
!         channel.setMessageListener(this);
      }
  
--- 140,144 ----
          state = STATE_STARTED;
          channel = ch;
!         channel.setRequestHandler(this);
      }
  
***************
*** 687,691 ****
       * that's relative to the BEEP protocol is encountered.
       */
!     public void receiveMSG(Message message) throws BEEPError
      {
          try
--- 687,691 ----
       * that's relative to the BEEP protocol is encountered.
       */
!     public void receiveMSG(MessageMSG message)
      {
          try
***************
*** 751,755 ****
                  {
                      message.sendRPY(new StringOutputDataStream(new Blob(Blob.STATUS_COMPLETE).toString()));
!                     channel.setMessageListener(null);
                  }
                  catch(BEEPException x)
--- 751,755 ----
                  {
                      message.sendRPY(new StringOutputDataStream(new Blob(Blob.STATUS_COMPLETE).toString()));
!                     channel.setRequestHandler(null);
                  }
                  catch(BEEPException x)

Index: SASLOTPProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** SASLOTPProfile.java	23 Apr 2003 15:23:03 -0000	1.10
--- SASLOTPProfile.java	10 Jun 2003 18:59:24 -0000	1.11
***************
*** 165,169 ****
                  }
              }
!             channel.setMessageListener(temp);
              if(blob != null)
                  sendProfile(channel.getSession(), URI, blob.toString(),
--- 165,169 ----
                  }
              }
!             channel.setRequestHandler(temp);
              if(blob != null)
                  sendProfile(channel.getSession(), URI, blob.toString(),
***************
*** 322,327 ****
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, false, null,
!                                               auth);
              startData = ch.getStartData();
          }
--- 322,326 ----
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, auth);
              startData = ch.getStartData();
          }
***************
*** 415,420 ****
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, false, null,
!                                               auth);
              startData = ch.getStartData();
          }
--- 414,418 ----
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, auth);
              startData = ch.getStartData();
          }
***************
*** 529,534 ****
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, false, null,
!                                               auth);
              startData = ch.getStartData();
          }
--- 527,531 ----
          try
          {
!             ch = session.startChannel(SASLOTPProfile.URI, auth);
              startData = ch.getStartData();
          }