PolicyFile.java, [...]: Fixed copyright header.

2005-02-22  Michael Koch  <konqueror@gmx.de>

	* gnu/java/security/PolicyFile.java,
	gnu/java/security/pkcs/PKCS7SignedData.java,
	gnu/java/security/pkcs/SignerInfo.java:
	Fixed copyright header.

From-SVN: r95399

3 files changed, 23 insertions, 19 deletions

diff --git a/libjava/gnu/java/security/PolicyFile.java b/libjava/gnu/java/security/PolicyFile.java
index d5c14dc..c939dda 100644
--- a/libjava/gnu/java/security/PolicyFile.java
+++ b/libjava/gnu/java/security/PolicyFile.java
@@ -1,18 +1,20 @@
-/* PolicyFile.java -- policy file reader.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* PolicyFile.java -- policy file reader
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program 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 this program; 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.
 
@@ -33,7 +35,6 @@ 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 gnu.java.security;
 
 import java.io.File;
@@ -143,7 +144,8 @@ public final class PolicyFile extends Policy
   // -------------------------------------------------------------------------
 
   private static final boolean DEBUG = true;
-  private static void debug(String msg)
+  // Package-private to avoid a trampoline.
+  static void debug(String msg)
   {
     System.err.print(">> PolicyFile: ");
     System.err.println(msg);
diff --git a/libjava/gnu/java/security/pkcs/PKCS7SignedData.java b/libjava/gnu/java/security/pkcs/PKCS7SignedData.java
index 5c2a98a..869febe 100644
--- a/libjava/gnu/java/security/pkcs/PKCS7SignedData.java
+++ b/libjava/gnu/java/security/pkcs/PKCS7SignedData.java
@@ -1,18 +1,20 @@
-/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program 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 this program; 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.
 
@@ -33,7 +35,6 @@ 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 gnu.java.security.pkcs;
 
 import gnu.java.security.OID;
diff --git a/libjava/gnu/java/security/pkcs/SignerInfo.java b/libjava/gnu/java/security/pkcs/SignerInfo.java
index 15fe9f9..d6b747d 100644
--- a/libjava/gnu/java/security/pkcs/SignerInfo.java
+++ b/libjava/gnu/java/security/pkcs/SignerInfo.java
@@ -1,18 +1,20 @@
-/* SignerInfo.java -- a SignerInfo object, from PKCS #7.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* SignerInfo.java -- a SignerInfo object, from PKCS #7
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program 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 this program; 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.
 
@@ -33,7 +35,6 @@ 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 gnu.java.security.pkcs;
 
 import gnu.java.security.OID;