[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: updated copyright informaiton on gnu crypto that we
Kaffe CVS
cvs-commits at kaffe.org
Tue Feb 1 18:49:51 PST 2005
PatchSet 5960
Date: 2005/02/02 02:45:36
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: updated copyright informaiton on gnu crypto that were merged in into claspath
Members:
ChangeLog:1.3499->1.3500
libraries/javalib/javax/security/auth/AuthPermission.java:1.1->1.2
libraries/javalib/javax/security/auth/DestroyFailedException.java:1.1->1.2
libraries/javalib/javax/security/auth/Destroyable.java:1.1->1.2
libraries/javalib/javax/security/auth/Policy.java:1.1->1.2
libraries/javalib/javax/security/auth/RefreshFailedException.java:1.1->1.2
libraries/javalib/javax/security/auth/Refreshable.java:1.1->1.2
libraries/javalib/javax/security/auth/SubjectDomainCombiner.java:1.1->1.2
libraries/javalib/javax/security/auth/callback/Callback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/CallbackHandler.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/ChoiceCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/LanguageCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/NameCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/PasswordCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/TextInputCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/TextOutputCallback.java:1.2->1.3
libraries/javalib/javax/security/auth/callback/UnsupportedCallbackException.java:1.2->1.3
libraries/javalib/javax/security/auth/login/AccountExpiredException.java:1.1->1.2
libraries/javalib/javax/security/auth/login/AppConfigurationEntry.java:1.1->1.2
libraries/javalib/javax/security/auth/login/CredentialExpiredException.java:1.1->1.2
libraries/javalib/javax/security/auth/login/FailedLoginException.java:1.1->1.2
libraries/javalib/javax/security/auth/login/LoginException.java:1.1->1.2
libraries/javalib/javax/security/cert/Certificate.java:1.5->1.6
libraries/javalib/javax/security/cert/CertificateEncodingException.java:1.3->1.4
libraries/javalib/javax/security/cert/CertificateException.java:1.3->1.4
libraries/javalib/javax/security/cert/CertificateExpiredException.java:1.3->1.4
libraries/javalib/javax/security/cert/CertificateNotYetValidException.java:1.3->1.4
libraries/javalib/javax/security/cert/CertificateParsingException.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3499 kaffe/ChangeLog:1.3500
--- kaffe/ChangeLog:1.3499 Wed Feb 2 01:41:00 2005
+++ kaffe/ChangeLog Wed Feb 2 02:45:36 2005
@@ -1,5 +1,39 @@
2005-02-02 Dalibor Topic <robilad at kaffe.org>
+ libraries/javalib/javax/security/auth/AuthPermission.java,
+ libraries/javalib/javax/security/auth/DestroyFailedException.java,
+ libraries/javalib/javax/security/auth/Destroyable.java,
+ libraries/javalib/javax/security/auth/Policy.java,
+ libraries/javalib/javax/security/auth/RefreshFailedException.java,
+ libraries/javalib/javax/security/auth/Refreshable.java,
+ libraries/javalib/javax/security/auth/SubjectDomainCombiner.java,
+ libraries/javalib/javax/security/auth/callback/Callback.java,
+ libraries/javalib/javax/security/auth/callback/CallbackHandler.java,
+ libraries/javalib/javax/security/auth/callback/ChoiceCallback.java,
+ libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java,
+ libraries/javalib/javax/security/auth/callback/LanguageCallback.java,
+ libraries/javalib/javax/security/auth/callback/NameCallback.java,
+ libraries/javalib/javax/security/auth/callback/PasswordCallback.java,
+ libraries/javalib/javax/security/auth/callback/TextInputCallback.java,
+ libraries/javalib/javax/security/auth/callback/TextOutputCallback.java,
+ libraries/javalib/javax/security/auth/callback/UnsupportedCallbackException.java,
+ libraries/javalib/javax/security/auth/login/AccountExpiredException.java,
+ libraries/javalib/javax/security/auth/login/AppConfigurationEntry.java,
+ libraries/javalib/javax/security/auth/login/CredentialExpiredException.java,
+ libraries/javalib/javax/security/auth/login/FailedLoginException.java,
+ libraries/javalib/javax/security/auth/login/LoginException.java,
+ libraries/javalib/javax/security/cert/Certificate.java,
+ libraries/javalib/javax/security/cert/CertificateEncodingException.java,
+ libraries/javalib/javax/security/cert/CertificateException.java,
+ libraries/javalib/javax/security/cert/CertificateExpiredException.java,
+ libraries/javalib/javax/security/cert/CertificateNotYetValidException.java,
+ libraries/javalib/javax/security/cert/CertificateParsingException.java:
+ Resynced with GNU Classpath.
+
+ Reported by: Mark Wielaard <mark at klomp.org>
+
+2005-02-02 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/gnu/regexp/CharIndexedReader.java,
libraries/javalib/gnu/regexp/REFilterReader.java,
libraries/javalib/java/awt/TextBuffer.java:
Index: kaffe/libraries/javalib/javax/security/auth/AuthPermission.java
diff -u kaffe/libraries/javalib/javax/security/auth/AuthPermission.java:1.1 kaffe/libraries/javalib/javax/security/auth/AuthPermission.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/AuthPermission.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/AuthPermission.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* AuthPermission.java -- permissions related to authentication.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/DestroyFailedException.java
diff -u kaffe/libraries/javalib/javax/security/auth/DestroyFailedException.java:1.1 kaffe/libraries/javalib/javax/security/auth/DestroyFailedException.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/DestroyFailedException.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/DestroyFailedException.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* DestroyFailedException.java -- signals an object could not be destroyed.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/Destroyable.java
diff -u kaffe/libraries/javalib/javax/security/auth/Destroyable.java:1.1 kaffe/libraries/javalib/javax/security/auth/Destroyable.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/Destroyable.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/Destroyable.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* Destroyable.java -- an immutable object that may be destroyed.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/Policy.java
diff -u kaffe/libraries/javalib/javax/security/auth/Policy.java:1.1 kaffe/libraries/javalib/javax/security/auth/Policy.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/Policy.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/Policy.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* Policy.java -- deprecated precursor to java.security.Policy.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/RefreshFailedException.java
diff -u kaffe/libraries/javalib/javax/security/auth/RefreshFailedException.java:1.1 kaffe/libraries/javalib/javax/security/auth/RefreshFailedException.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/RefreshFailedException.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/RefreshFailedException.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* RefreshFailedException.java -- signals a failed refresh.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/Refreshable.java
diff -u kaffe/libraries/javalib/javax/security/auth/Refreshable.java:1.1 kaffe/libraries/javalib/javax/security/auth/Refreshable.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/Refreshable.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/Refreshable.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* Refreshable.java -- an object whose state may be refreshed.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/SubjectDomainCombiner.java
diff -u kaffe/libraries/javalib/javax/security/auth/SubjectDomainCombiner.java:1.1 kaffe/libraries/javalib/javax/security/auth/SubjectDomainCombiner.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/SubjectDomainCombiner.java:1.1 Wed Jul 21 01:42:12 2004
+++ kaffe/libraries/javalib/javax/security/auth/SubjectDomainCombiner.java Wed Feb 2 02:45:39 2005
@@ -1,20 +1,20 @@
/* SubjectDomainCombiner.java -- domain combiner for Subjects.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-GNU Crypto is distributed in the hope that it will be useful, but
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Crypto; see the file COPYING. If not, write to the
+along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Index: kaffe/libraries/javalib/javax/security/auth/callback/Callback.java
diff -u kaffe/libraries/javalib/javax/security/auth/callback/Callback.java:1.2 kaffe/libraries/javalib/javax/security/auth/callback/Callback.java:1.3
--- kaffe/libraries/javalib/javax/security/auth/callback/Callback.java:1.2 Tue Feb 1 15:31:26 2005
+++ kaffe/libraries/javalib/javax/security/auth/callback/Callback.java Wed Feb 2 02:45:39 2005
@@ -1,47 +1,42 @@
-package javax.security.auth.callback;
+/* Callback.java -- marker interface for callback classes
+ Copyright (C) 2003, Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
-// ----------------------------------------------------------------------------
-// $Id: Callback.java,v 1.2 2005/02/01 15:31:26 robilad Exp $
-//
-// Copyright (C) 2003, Free Software Foundation, Inc.
-//
-// This file is part of GNU Crypto.
-//
-// GNU Crypto is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// GNU Crypto is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; see the file COPYING. If not, write to the
-//
-// Free Software Foundation Inc.,
-// 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307
-// USA
-//
-// Linking this library statically or dynamically with other modules is
-// making a combined work based on this library. Thus, the terms and
-// conditions of the GNU General Public License cover the whole
-// combination.
-//
-// As a special exception, the copyright holders of this library give
-// you permission to link this library with independent modules to
-// produce an executable, regardless of the license terms of these
-// independent modules, and to copy and distribute the resulting
-// executable under terms of your choice, provided that you also meet,
-// for each linked independent module, the terms and conditions of the
-// license of that module. An independent module is a module which is
-// not derived from or based on this library. If you modify this
-// library, you may extend this exception to your version of the
-// library, but you are not obligated to do so. If you do not wish to
-// do so, delete this exception statement from your version.
-// ----------------------------------------------------------------------------
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.security.auth.callback;
/**
* <p>Implementations of this interface are passed to a {@link CallbackHandler},
Index: kaffe/libraries/javalib/javax/security/auth/callback/CallbackHandler.java
diff -u kaffe/libraries/javalib/javax/security/auth/callback/CallbackHandler.java:1.2 kaffe/libraries/javalib/javax/security/auth/callback/CallbackHandler.java:1.3
--- kaffe/libraries/javalib/javax/security/auth/callback/CallbackHandler.java:1.2 Tue Feb 1 15:31:26 2005
+++ kaffe/libraries/javalib/javax/security/auth/callback/CallbackHandler.java Wed Feb 2 02:45:39 2005
@@ -1,47 +1,42 @@
-package javax.security.auth.callback;
+/* CallbackHandler.java -- base interface for callback handlers.
+ Copyright (C) 2003, Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
-// ----------------------------------------------------------------------------
-// $Id: CallbackHandler.java,v 1.2 2005/02/01 15:31:26 robilad Exp $
-//
-// Copyright (C) 2003, Free Software Foundation, Inc.
-//
-// This file is part of GNU Crypto.
-//
-// GNU Crypto is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// GNU Crypto is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; see the file COPYING. If not, write to the
-//
-// Free Software Foundation Inc.,
-// 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307
-// USA
-//
-// Linking this library statically or dynamically with other modules is
-// making a combined work based on this library. Thus, the terms and
-// conditions of the GNU General Public License cover the whole
-// combination.
-//
-// As a special exception, the copyright holders of this library give
-// you permission to link this library with independent modules to
-// produce an executable, regardless of the license terms of these
-// independent modules, and to copy and distribute the resulting
-// executable under terms of your choice, provided that you also meet,
-// for each linked independent module, the terms and conditions of the
-// license of that module. An independent module is a module which is
-// not derived from or based on this library. If you modify this
-// library, you may extend this exception to your version of the
-// library, but you are not obligated to do so. If you do not wish to
-// do so, delete this exception statement from your version.
-// ----------------------------------------------------------------------------
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.security.auth.callback;
import java.io.IOException;
@@ -86,7 +81,8 @@
* constructor.</p>
*
*/
-public interface CallbackHandler {
+public interface CallbackHandler
+{
/**
* <p>Retrieve or display the information requested in the provided
Index: kaffe/libraries/javalib/javax/security/auth/callback/ChoiceCallback.java
diff -u kaffe/libraries/javalib/javax/security/auth/callback/ChoiceCallback.java:1.2 kaffe/libraries/javalib/javax/security/auth/callback/ChoiceCallback.java:1.3
--- kaffe/libraries/javalib/javax/security/auth/callback/ChoiceCallback.java:1.2 Tue Feb 1 15:31:26 2005
+++ kaffe/libraries/javalib/javax/security/auth/callback/ChoiceCallback.java Wed Feb 2 02:45:39 2005
@@ -1,47 +1,42 @@
-package javax.security.auth.callback;
+/* ChoiceCallback.java -- callback for a choice of values.
+ Copyright (C) 2003, Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-// ----------------------------------------------------------------------------
-// $Id: ChoiceCallback.java,v 1.2 2005/02/01 15:31:26 robilad Exp $
-//
-// Copyright (C) 2003, Free Software Foundation, Inc.
-//
-// This file is part of GNU Crypto.
-//
-// GNU Crypto is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// GNU Crypto is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; see the file COPYING. If not, write to the
-//
-// Free Software Foundation Inc.,
-// 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307
-// USA
-//
-// Linking this library statically or dynamically with other modules is
-// making a combined work based on this library. Thus, the terms and
-// conditions of the GNU General Public License cover the whole
-// combination.
-//
-// As a special exception, the copyright holders of this library give
-// you permission to link this library with independent modules to
-// produce an executable, regardless of the license terms of these
-// independent modules, and to copy and distribute the resulting
-// executable under terms of your choice, provided that you also meet,
-// for each linked independent module, the terms and conditions of the
-// license of that module. An independent module is a module which is
-// not derived from or based on this library. If you modify this
-// library, you may extend this exception to your version of the
-// library, but you are not obligated to do so. If you do not wish to
-// do so, delete this exception statement from your version.
-// ----------------------------------------------------------------------------
+
+package javax.security.auth.callback;
import java.io.Serializable;
@@ -53,7 +48,8 @@
*
* @see CallbackHandler
*/
-public class ChoiceCallback implements Callback, Serializable {
+public class ChoiceCallback implements Callback, Serializable
+{
// Constants and variables
// -------------------------------------------------------------------------
@@ -112,12 +108,14 @@
* <code>choices</code>.
*/
public ChoiceCallback(String prompt, String[] choices, int defaultChoice,
- boolean multipleSelectionsAllowed) {
+ boolean multipleSelectionsAllowed)
+ {
super();
setPrompt(prompt);
setChoices(choices);
- if (defaultChoice < 0 || defaultChoice >= this.choices.length) {
+ if (defaultChoice < 0 || defaultChoice >= this.choices.length)
+ {
throw new IllegalArgumentException("default choice is out of bounds");
}
this.defaultChoice = defaultChoice;
@@ -132,7 +130,8 @@
*
* @return the prompt.
*/
- public String getPrompt() {
+ public String getPrompt()
+ {
return prompt;
}
@@ -141,7 +140,8 @@
*
* @return the list of choices.
*/
- public String[] getChoices() {
+ public String[] getChoices()
+ {
return choices;
}
@@ -150,7 +150,8 @@
*
* @return the defaultChoice, represented as an index into the choices list.
*/
- public int getDefaultChoice() {
+ public int getDefaultChoice()
+ {
return defaultChoice;
}
@@ -160,7 +161,8 @@
*
* @return whether multiple selections are allowed.
*/
- public boolean allowMultipleSelections() {
+ public boolean allowMultipleSelections()
+ {
return multipleSelectionsAllowed;
}
@@ -171,7 +173,8 @@
* list.
* @see #getSelectedIndexes()
*/
- public void setSelectedIndex(int selection) {
+ public void setSelectedIndex(int selection)
+ {
this.selections = new int[1];
this.selections[0] = selection;
}
@@ -185,8 +188,10 @@
* allowed, as determined by <code>allowMultipleSelections</code>.
* @see #getSelectedIndexes()
*/
- public void setSelectedIndexes(int[] selections) {
- if (!multipleSelectionsAllowed) {
+ public void setSelectedIndexes(int[] selections)
+ {
+ if (!multipleSelectionsAllowed)
+ {
throw new UnsupportedOperationException("not allowed");
}
@@ -199,23 +204,30 @@
* @return the selected choices, represented as indexes into the choices list.
* @see #setSelectedIndexes(int[])
*/
- public int[] getSelectedIndexes() {
+ public int[] getSelectedIndexes()
+ {
return selections;
}
- private void setPrompt(String prompt) throws IllegalArgumentException {
- if ((prompt == null) || (prompt.length() == 0)) {
+ private void setPrompt(String prompt) throws IllegalArgumentException
+ {
+ if ((prompt == null) || (prompt.length() == 0))
+ {
throw new IllegalArgumentException("invalid prompt");
}
this.prompt = prompt;
}
- private void setChoices(String[] choices) throws IllegalArgumentException {
- if (choices == null || choices.length == 0) {
+ private void setChoices(String[] choices) throws IllegalArgumentException
+ {
+ if (choices == null || choices.length == 0)
+ {
throw new IllegalArgumentException("invalid choices");
}
- for (int i = 0; i < choices.length; i++) {
- if (choices[i] == null || choices[i].length() == 0) {
+ for (int i = 0; i < choices.length; i++)
+ {
+ if (choices[i] == null || choices[i].length() == 0)
+ {
throw new IllegalArgumentException("invalid choice at index #"+i);
}
}
Index: kaffe/libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java
diff -u kaffe/libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java:1.2 kaffe/libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java:1.3
--- kaffe/libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java:1.2 Tue Feb 1 15:31:26 2005
+++ kaffe/libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java Wed Feb 2 02:45:39 2005
@@ -1,47 +1,42 @@
-package javax.security.auth.callback;
+/* ConfirmationCallback.java -- callback for confirmations.
+ Copyright (C) 2003, Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-// ----------------------------------------------------------------------------
-// $Id: ConfirmationCallback.java,v 1.2 2005/02/01 15:31:26 robilad Exp $
-//
-// Copyright (C) 2003, Free Software Foundation, Inc.
-//
-// This file is part of GNU Crypto.
-//
-// GNU Crypto is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// GNU Crypto is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; see the file COPYING. If not, write to the
-//
-// Free Software Foundation Inc.,
-// 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307
-// USA
-//
-// Linking this library statically or dynamically with other modules is
-// making a combined work based on this library. Thus, the terms and
-// conditions of the GNU General Public License cover the whole
-// combination.
-//
-// As a special exception, the copyright holders of this library give
-// you permission to link this library with independent modules to
-// produce an executable, regardless of the license terms of these
-// independent modules, and to copy and distribute the resulting
-// executable under terms of your choice, provided that you also meet,
-// for each linked independent module, the terms and conditions of the
-// license of that module. An independent module is a module which is
-// not derived from or based on this library. If you modify this
-// library, you may extend this exception to your version of the
-// library, but you are not obligated to do so. If you do not wish to
-// do so, delete this exception statement from your version.
-// ----------------------------------------------------------------------------
+
+package javax.security.auth.callback;
import java.io.Serializable;
@@ -53,7 +48,8 @@
*
* @see CallbackHandler
*/
-public class ConfirmationCallback implements Callback, Serializable {
+public class ConfirmationCallback implements Callback, Serializable
+{
// Constants and variables
// -------------------------------------------------------------------------
@@ -147,26 +143,31 @@
* @since 1.4
*/
private String prompt;
+
/**
* @serial
* @since 1.4
*/
private int messageType;
+
/**
* @serial
* @since 1.4
*/
private int optionType;
+
/**
* @serial
* @since 1.4
*/
private int defaultOption;
+
/**
* @serial
* @since 1.4
*/
private String[] options = null;
+
/**
* @serial
* @since 1.4
@@ -196,7 +197,8 @@
* <code>optionType</code>.
*/
public ConfirmationCallback(int messageType, int optionType, int defaultOption)
- throws IllegalArgumentException {
+ throws IllegalArgumentException
+ {
super();
setMessageType(messageType);
@@ -227,7 +229,8 @@
* of <code>0</code>, or if <code>defaultOption</code> does not lie within
* the array boundaries of <code>options</code>.
*/
- public ConfirmationCallback(int messageType, String[] options, int defaultOption) {
+ public ConfirmationCallback(int messageType, String[] options, int defaultOption)
+ {
super();
setMessageType(messageType);
@@ -257,7 +260,8 @@
* not correspond to one of the options in <code>optionType</code>.
*/
public ConfirmationCallback(String prompt, int messageType, int optionType,
- int defaultOption) {
+ int defaultOption)
+ {
super();
setPrompt(prompt);
@@ -293,7 +297,8 @@
* <code>options</code>.
*/
public ConfirmationCallback(String prompt, int messageType, String[] options,
- int defaultOption) {
+ int defaultOption)
+ {
super();
setPrompt(prompt);
@@ -314,7 +319,8 @@
* @return the prompt, or <code>null</code> if this
* <code>ConfirmationCallback</code> was instantiated without a prompt.
*/
- public String getPrompt() {
+ public String getPrompt()
+ {
return prompt;
}
@@ -323,7 +329,8 @@
*
* @return the message type (INFORMATION, WARNING or ERROR).
*/
- public int getMessageType() {
+ public int getMessageType()
+ {
return messageType;
}
@@ -341,8 +348,10 @@
* <code>ConfirmationCallback</code> was instantiated with <code>options</code>
* instead of an <code>optionType</code>.
*/
- public int getOptionType() {
- if (options != null) {
+ public int getOptionType()
+ {
+ if (options != null)
+ {
return UNSPECIFIED_OPTION;
}
return optionType;
@@ -355,7 +364,8 @@
* <code>ConfirmationCallback</code> was instantiated with an
* <code>optionType</code> instead of <code>options</code>.
*/
- public String[] getOptions() {
+ public String[] getOptions()
+ {
return options;
}
@@ -369,7 +379,8 @@
* <code>options</code> array specified to the constructor of this
* <code>ConfirmationCallback</code>.
*/
- public int getDefaultOption() {
+ public int getDefaultOption()
+ {
return defaultOption;
}
@@ -384,10 +395,14 @@
* constructor of this <code>ConfirmationCallback</code>.
* @see #getSelectedIndex()
*/
- public void setSelectedIndex(int selection) {
- if (options != null) {
+ public void setSelectedIndex(int selection)
+ {
+ if (options != null)
+ {
setOptions(options, selection);
- } else {
+ }
+ else
+ {
setOptionType(optionType, selection);
}
}
@@ -403,12 +418,15 @@
* array specified to the constructor of this <code>ConfirmationCallback</code>.
* @see #setSelectedIndex(int)
*/
- public int getSelectedIndex() {
+ public int getSelectedIndex()
+ {
return this.selection;
}
- private void setMessageType(int messageType) throws IllegalArgumentException {
- switch (messageType) {
+ private void setMessageType(int messageType) throws IllegalArgumentException
+ {
+ switch (messageType)
+ {
case INFORMATION:
case WARNING:
case ERROR: this.messageType = messageType; break;
@@ -417,11 +435,14 @@
}
private void setOptionType(int optionType, int selectedOption)
- throws IllegalArgumentException {
- switch (optionType) {
+ throws IllegalArgumentException
+ {
+ switch (optionType)
+ {
case YES_NO_OPTION:
this.optionType = optionType;
- switch (selectedOption) {
+ switch (selectedOption)
+ {
case YES:
case NO: this.selection = selectedOption; break;
default: throw new IllegalArgumentException("invalid option");
@@ -429,7 +450,8 @@
break;
case YES_NO_CANCEL_OPTION:
this.optionType = optionType;
- switch (selectedOption) {
+ switch (selectedOption)
+ {
case YES:
case NO:
case CANCEL: this.selection = selectedOption; break;
@@ -438,7 +460,8 @@
break;
case OK_CANCEL_OPTION:
this.optionType = optionType;
- switch (selectedOption) {
+ switch (selectedOption)
+ {
case OK:
case CANCEL: this.selection = selectedOption; break;
default: throw new IllegalArgumentException("invalid option");
@@ -450,15 +473,20 @@
}
*** Patch too long, truncated ***
More information about the kaffe
mailing list