cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd Slide.java

[jericho]

jericho     01/03/06 19:04:05

  Modified:    src/webdav/client/src/org/apache/webdav/cmd Slide.java
  Log:
  - Read input string robust
  - Correct the display message correctly in case of no username.
  
  Revision  Changes    Path
  1.6       +17 -12    
jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java
  
  Index: Slide.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Slide.java        2001/03/07 02:34:25     1.5
  +++ Slide.java        2001/03/07 03:04:04     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.5 
2001/03/07 02:34:25 jericho Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/03/07 02:34:25 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/cmd/Slide.java,v 1.6 
2001/03/07 03:04:04 jericho Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/03/07 03:04:04 $
    *
    * ====================================================================
    *
  @@ -205,10 +205,10 @@
                           WebdavStatus.SC_UNAUTHORIZED) {
   
                           System.out.print("UserName: ");
  -                        String userName = in.readLine();
  +                        String userName = in.readLine().trim();
                           if (userName != null && userName.length() > 0) {
                               System.out.print("Password: ");
  -                            String password = in.readLine();
  +                            String password = in.readLine().trim();
                               try {
                                   httpUrl.setUserInfo(userName, password);
                                   if (webdavResource != null) {
  @@ -227,6 +227,9 @@
                                       + e.getMessage());
                                   httpUrl = null;
                               }
  +                        } else {
  +                            // Make the prompt display by default.
  +                            httpUrl = null;
                           }
                       } else {
                           System.err.println("Warning: " + we.getMessage());
  @@ -242,7 +245,7 @@
               String command = null;
               do {
                   System.out.print(getPrompt());
  -                command = in.readLine();
  +                command = in.readLine().trim();
                   if (command == null || command.length() == 0)
                       continue;
   
  @@ -260,7 +263,7 @@
                           inputUrl =  (String) params.pop();
                       } else {
                           System.out.print("Enter http URL: ");
  -                        inputUrl = in.readLine();
  +                        inputUrl = in.readLine().trim();
                           if (inputUrl != null && inputUrl.length() == 0)
                               continue;
                       }
  @@ -280,10 +283,10 @@
                               WebdavStatus.SC_UNAUTHORIZED) {
   
                               System.out.print("UserName: ");
  -                            String userName = in.readLine();
  +                            String userName = in.readLine().trim();
                               if (userName != null && userName.length() > 0) {
                                   System.out.print("Password: ");
  -                                String password = in.readLine();
  +                                String password = in.readLine().trim();
                                   try {
                                       try {
                                           if (webdavResource != null)
  @@ -311,7 +314,9 @@
                                           + e.getMessage());
                                       httpUrl = null;
                                   }
  -                                updatePrompt(getPath());
  +                            } else {
  +                                // make the prompt display by default.
  +                                httpUrl = null;
                               }
                           } else {
                               System.err.println("Error: " + we.getMessage());
  @@ -442,12 +447,12 @@
                                   WebdavStatus.SC_UNAUTHORIZED) {
   
                                   System.out.print("UserName: ");
  -                                String userName = in.readLine();
  +                                String userName = in.readLine().trim();
                                   if (userName != null &&
                                       userName.length() > 0) {
   
                                       System.out.print("Password: ");
  -                                    String password = in.readLine();
  +                                    String password = in.readLine().trim();
                                       try {
                                           httpUrl.setUserInfo(userName,
                                               password);