From ce57ab760f69de6db452def7ffbf5b114a2d8694 Mon Sep 17 00:00:00 2001
From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 10 Mar 2006 21:46:48 +0000
Subject:        Imported GNU Classpath 0.90        * scripts/makemake.tcl: Set
 gnu/java/awt/peer/swing to ignore.        * gnu/classpath/jdwp/VMFrame.java
 (SIZE): New constant.        * java/lang/VMCompiler.java: Use
 gnu.java.security.hash.MD5.        * java/lang/Math.java: New override file. 
       * java/lang/Character.java: Merged from Classpath.        (start, end):
 Now 'int's.        (canonicalName): New field.        (CANONICAL_NAME,
 NO_SPACES_NAME, CONSTANT_NAME): New constants.        (UnicodeBlock): Added
 argument.        (of): New overload.        (forName): New method.       
 Updated unicode blocks.        (sets): Updated.        * sources.am:
 Regenerated.        * Makefile.in: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/gnu/java/nio/charset/Provider.java            | 3 ++-
 libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java  | 1 -
 libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java  | 1 -
 libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'libjava/classpath/gnu/java/nio/charset')

diff --git a/libjava/classpath/gnu/java/nio/charset/Provider.java b/libjava/classpath/gnu/java/nio/charset/Provider.java
index 01c2650a81b..ad3b1da8471 100644
--- a/libjava/classpath/gnu/java/nio/charset/Provider.java
+++ b/libjava/classpath/gnu/java/nio/charset/Provider.java
@@ -81,7 +81,8 @@ public final class Provider extends CharsetProvider
    */
   private boolean extendedLoaded;
 
-  private Provider ()
+  // Package private to avoid an accessor method in PrivilegedAction below.
+  Provider ()
   {
     extendedLoaded = false;
     canonicalNames = new HashMap ();
diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java
index fa6f4970042..f76d3fd5e1a 100644
--- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java
+++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java
@@ -44,7 +44,6 @@ import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
 
 final class IconvDecoder extends CharsetDecoder
diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java
index d5cc8877f75..47446f98fd4 100644
--- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java
+++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java
@@ -43,7 +43,6 @@ import gnu.classpath.Pointer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
 
diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java
index 6fd8b744082..cf9fc56a2f5 100644
--- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java
+++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java
@@ -40,8 +40,6 @@ package gnu.java.nio.charset.iconv;
 
 import java.nio.charset.Charset;
 import java.nio.charset.spi.CharsetProvider;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Vector;
 
-- 
cgit v1.2.3