From 7d651220a36ec97dfbff7e6bd23fe6147956f078 Mon Sep 17 00:00:00 2001 From: Dalibor Topic Date: Sun, 20 Feb 2005 21:18:30 +0000 Subject: RE.java, [...]: Made 'inner' classes real public static inner classes... 2005-02-20 Dalibor Topic * 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/java/io/ObjectInputStream.java | 37 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'libjava/java/io/ObjectInputStream.java') diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index bcaa2e3a158..6f4faf89a6a 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/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(); @@ -1879,7 +1878,7 @@ public class ObjectInputStream extends InputStream private int depth = 0; private void dumpElement (String msg) - { + { System.out.print(msg); } @@ -1898,24 +1897,24 @@ public class ObjectInputStream extends InputStream System.loadLibrary ("javaio"); } } -} - - -// used to keep a prioritized list of object validators -class ValidatorAndPriority implements Comparable -{ - int priority; - ObjectInputValidation validator; - - ValidatorAndPriority (ObjectInputValidation validator, int priority) - { - this.priority = priority; - this.validator = validator; - } - public int compareTo (Object o) + // used to keep a prioritized list of object validators + private static final class ValidatorAndPriority implements Comparable { - ValidatorAndPriority vap = (ValidatorAndPriority)o; - return this.priority - vap.priority; + int priority; + ObjectInputValidation validator; + + ValidatorAndPriority (ObjectInputValidation validator, int priority) + { + this.priority = priority; + this.validator = validator; + } + + public int compareTo (Object o) + { + ValidatorAndPriority vap = (ValidatorAndPriority)o; + return this.priority - vap.priority; + } } } + -- cgit v1.2.3