RE.java, [...]: Made 'inner' classes real public static inner classes...

2005-02-20  Dalibor Topic  <robilad@kaffe.org>

	* libraries/javalib/gnu/regexp/RE.java,
	libraries/javalib/java/io/ObjectInputStream.java,
	libraries/javalib/java/security/AllPermission.java,
	libraries/javalib/java/security/BasicPermission.java,
	libraries/javalib/java/security/Permissions.java,
	libraries/javalib/java/text/MessageFormat.java:
	Made 'inner' classes real public static inner classes,
	and made them final where possible, or removed them
	where unused.

From-SVN: r95310

libjava/ChangeLog

@@ -1,3 +1,15 @@
+2005-02-20  Dalibor Topic  <robilad@kaffe.org>
+
+	* libraries/javalib/gnu/regexp/RE.java,
+	libraries/javalib/java/io/ObjectInputStream.java,
+	libraries/javalib/java/security/AllPermission.java,
+	libraries/javalib/java/security/BasicPermission.java,
+	libraries/javalib/java/security/Permissions.java,
+	libraries/javalib/java/text/MessageFormat.java:
+	Made 'inner' classes real public static inner classes,
+	and made them final where possible, or removed them
+	where unused.
+
 2005-02-20  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/text/FormatCharacterIterator.java:

libjava/gnu/regexp/RE.java

@@ -43,15 +43,6 @@ import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.Vector;
 
-class IntPair implements Serializable {
-  public int first, second;
-}
-
-class CharUnit implements Serializable {
-  public char ch;
-  public boolean bk;
-}
-
 /**
  * RE provides the user interface for compiling and matching regular
  * expressions.
@@ -119,6 +110,16 @@ class CharUnit implements Serializable {
  */
 
 public class RE extends REToken {
+
+  private static final class IntPair implements Serializable {
+    public int first, second;
+  }
+
+  private static final class CharUnit implements Serializable {
+    public char ch;
+    public boolean bk;
+  }
+
   // This String will be returned by getVersion()
   private static final String VERSION = "1.1.5-dev";
 

libjava/java/io/ObjectInputStream.java

@@ -1809,7 +1809,6 @@ public class ObjectInputStream extends InputStream
    * @param sm SecurityManager instance which should be called.
    * @return The current class loader in the calling stack.
    */
-
   private static native ClassLoader currentClassLoader (SecurityManager sm);
   
   private native ClassLoader getCallersClassLoader();
@@ -1898,12 +1897,10 @@ public class ObjectInputStream extends InputStream
 	System.loadLibrary ("javaio");
       }
   }
-}
 
-
-// used to keep a prioritized list of object validators
-class ValidatorAndPriority implements Comparable
-{
+  // used to keep a prioritized list of object validators
+  private static final class ValidatorAndPriority implements Comparable
+  {
     int priority;
     ObjectInputValidation validator;
 
@@ -1918,4 +1915,6 @@ class ValidatorAndPriority implements Comparable
       ValidatorAndPriority vap = (ValidatorAndPriority)o;
       return this.priority - vap.priority;
     }
+  }
 }
+

libjava/java/security/AllPermission.java

@@ -1,5 +1,5 @@
 /* AllPermission.java -- Permission to do anything
-   Copyright (C) 1998, 2001, 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -135,16 +135,15 @@ public final class AllPermission extends Permission
   {
     return new AllPermissionCollection();
   }
-} // class AllPermission
 
-/**
+  /**
    * Implements AllPermission.newPermissionCollection, and obeys serialization
    * of JDK.
    *
- * @author Eric Blake <ebb9@email.byu.edu>
+   * @author Eric Blake (ebb9@email.byu.edu)
    */
-final class AllPermissionCollection extends PermissionCollection
-{
+  private static final class AllPermissionCollection extends PermissionCollection
+  {
     /**
      * Compatible with JDK 1.1+.
      */
@@ -195,4 +194,5 @@ final class AllPermissionCollection extends PermissionCollection
         ? Collections.enumeration(Collections.singleton(new AllPermission()))
         : EmptyEnumeration.getInstance();
     }
-} // class AllPermissionCollection
+  } // class AllPermissionCollection
+} // class AllPermission

libjava/java/security/BasicPermission.java

@@ -72,8 +72,9 @@ import java.util.Hashtable;
  * @since 1.1
  * @status updated to 1.4
  */
-public abstract class BasicPermission extends Permission
+public abstract class BasicPermission extends java.security.Permission
   implements Serializable
+  // FIXME extends with fully qualified classname as workaround for gcj 3.3.
 {
   /**
    * Compatible with JDK 1.1+.
@@ -197,16 +198,15 @@ public abstract class BasicPermission extends Permission
   {
     return new BasicPermissionCollection(getClass());
   }
-} // class BasicPermission
 
-/**
+  /**
    * Implements AllPermission.newPermissionCollection, and obeys serialization
    * of JDK.
    *
- * @author Eric Blake <ebb9@email.byu.edu>
+   * @author Eric Blake (ebb9@email.byu.edu)
    */
-final class BasicPermissionCollection extends PermissionCollection
-{
+  private static final class BasicPermissionCollection extends PermissionCollection
+  {
     /**
      * Compatible with JDK 1.1+.
      */
@@ -304,4 +304,5 @@ final class BasicPermissionCollection extends PermissionCollection
     {
       return permissions.elements();
     }
-} // class BasicPermissionCollection
+  } // class BasicPermissionCollection
+} // class BasicPermission

libjava/java/security/Permissions.java

@@ -188,16 +188,15 @@ public final class Permissions extends PermissionCollection
       }
     };
   }
-} // class Permissions
 
-/**
+  /**
    * Implements the permission collection for all permissions without one of
    * their own, and obeys serialization of JDK.
    *
- * @author Eric Blake <ebb9@email.byu.edu>
+   * @author Eric Blake (ebb9@email.byu.edu)
    */
-class PermissionsHash extends PermissionCollection
-{
+  private static final class PermissionsHash extends PermissionCollection
+  {
     /**
      * Compatible with JDK 1.1+.
      */
@@ -251,4 +250,5 @@ class PermissionsHash extends PermissionCollection
     {
       return perms.elements();
     }
+  } // class PermissionsHash
 } // class Permissions

libjava/java/text/MessageFormat.java

@@ -46,18 +46,20 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Vector;
 
-/**
- * @author Tom Tromey <tromey@cygnus.com>
- * @author Jorge Aliss <jaliss@hotmail.com>
+public class MessageFormat extends Format
+{
+  /**
+   * @author Tom Tromey (tromey@cygnus.com)
+   * @author Jorge Aliss (jaliss@hotmail.com)
    * @date March 3, 1999
    */
-/* Written using "Java Class Libraries", 2nd edition, plus online
+  /* Written using "Java Class Libraries", 2nd edition, plus online
    * API docs for JDK 1.2 from http://www.javasoft.com.
    * Status:  Believed complete and correct to 1.2, except serialization.
    *          and parsing.
    */
-final class MessageFormatElement
-{
+  private static final class MessageFormatElement
+  {
     // Argument number.
     int argNumber;
     // Formatter to be used.  This is the format set by setFormat.
@@ -143,10 +145,8 @@ final class MessageFormatElement
 	  format = new ChoiceFormat (style);
         }
     }
-}
+  }
 
-public class MessageFormat extends Format
-{
   private static final long serialVersionUID = 6479157306784022952L;
 
   public static class Field extends Format.Field