/**
 * @copyright
 * ====================================================================
 *    Licensed to the Apache Software Foundation (ASF) under one
 *    or more contributor license agreements.  See the NOTICE file
 *    distributed with this work for additional information
 *    regarding copyright ownership.  The ASF licenses this file
 *    to you under the Apache License, Version 2.0 (the
 *    "License"); you may not use this file except in compliance
 *    with the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing,
 *    software distributed under the License is distributed on an
 *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 *    KIND, either express or implied.  See the License for the
 *    specific language governing permissions and limitations
 *    under the License.
 * ====================================================================
 * @endcopyright
 */

package org.apache.subversion.javahl.callback;

/**
 * The original interface for receiving callbacks for authentication.
 * Consider this code deprecated -- new applications should use
 * PromptUserPassword3 instead.
 */
public interface UserPasswordCallback
{
    /**
     * Reject the connection to the server.
     */
    public static final int Reject = 0;

    /**
     * Accept the connection to the server <i>once</i>.
     */
    public static final int AcceptTemporary = 1;

    /**
     * @deprecated Use the correctly spelled "AcceptTemporary"
     * constant instead.
     */
    public static final int AccecptTemporary = AcceptTemporary;

    /**
     * Accept the connection to the server <i>forever</i>.
     */
    public static final int AcceptPermanently = 2;

    /**
     * If there are problems with the certifcate of the SSL-server, this
     * callback will be used to deside if the connection will be used.
     * @param info              the probblems with the certificate.
     * @param allowPermanently  if AcceptPermantly is a legal answer
     * @return                  one of Reject/AcceptTemporary/AcceptPermanently
     */
    public int askTrustSSLServer(String info, boolean allowPermanently);

    /**
     * Ask the user for username and password
     * The entered username/password is retrieved by the getUsername
     * getPasswort methods.
     *
     * @param realm     for which server realm this information is requested.
     * @param username  the default username
     * @return Whether the prompt for authentication credentials was
     * successful (e.g. in a GUI application whether the dialog box
     * was canceled).
     */
    public boolean prompt(String realm, String username);

    /**
     * ask the user a yes/no question
     * @param realm         for which server realm this information is
     *                      requested.
     * @param question      question to be asked
     * @param yesIsDefault  if yes should be the default
     * @return              the answer
     */
    public boolean askYesNo(String realm, String question,
                            boolean yesIsDefault);

    /**
     * ask the user a question where she answers with a text.
     * @param realm         for which server realm this information is
     *                      requested.
     * @param question      question to be asked
     * @param showAnswer    if the answer is shown or hidden
     * @return              the entered text or null if canceled
     */
    public String askQuestion(String realm, String question,
                              boolean showAnswer);

    /**
     * retrieve the username entered during the prompt call
     * @return the username
     */
    public String getUsername();

    /**
     * retrieve the password entered during the prompt call
     * @return the password
     */
    public String getPassword();
}

@@ -1079,21 +1079,15 @@
 %0A * 
+%3Cp%3E
 The 
-original 
 inte
@@ -1102,141 +1102,352 @@
 r re
-ceiving callbacks for authentic
+questing authentication credentials from the%0A * user.  Should the javahl bindings need the matching inform
 ation
-.
+,
 %0A * 
-Consider this code deprecated -- new applications should use%0A * PromptUserPassword3 instead.
+these methodes will be called.%3C/p%3E%0A *%0A * %3Cp%3EThis callback can also be used to provide the equivalent of the%0A * %3Ccode%3E--no-auth-cache%3C/code%3E and %3Ccode%3E--non-interactive%3C/code%3E%0A * arguments accepted by the command-line client.%3C/p%3E
 %0A */
@@ -1652,32 +1652,32 @@
 ce%3C/i%3E.%0A     */%0A
+
     public stati
@@ -1714,177 +1714,8 @@
 1;%0A%0A
-    /**%0A     * @deprecated Use the correctly spelled %22AcceptTemporary%22%0A     * constant instead.%0A     */%0A    public static final int AccecptTemporary = AcceptTemporary;%0A%0A
     

Fix JavaDoc on interface and remove a deprecated constant that we do not need to carry forward.