diff options
Diffstat (limited to 'libjava/classpath/java/nio/charset')
11 files changed, 74 insertions, 74 deletions
diff --git a/libjava/classpath/java/nio/charset/CharacterCodingException.java b/libjava/classpath/java/nio/charset/CharacterCodingException.java index d0580c9..05f1e3a 100644 --- a/libjava/classpath/java/nio/charset/CharacterCodingException.java +++ b/libjava/classpath/java/nio/charset/CharacterCodingException.java @@ -1,4 +1,4 @@ -/* CharacterCodingException.java -- +/* CharacterCodingException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/charset/Charset.java b/libjava/classpath/java/nio/charset/Charset.java index 924e005..1757b82 100644 --- a/libjava/classpath/java/nio/charset/Charset.java +++ b/libjava/classpath/java/nio/charset/Charset.java @@ -1,4 +1,4 @@ -/* Charset.java -- +/* Charset.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,15 +64,15 @@ public abstract class Charset implements Comparable<Charset> { private CharsetEncoder cachedEncoder; private CharsetDecoder cachedDecoder; - + /** * Extra Charset providers. */ private static CharsetProvider[] providers; - + private final String canonicalName; private final String[] aliases; - + protected Charset (String canonicalName, String[] aliases) { checkName (canonicalName); @@ -121,45 +121,45 @@ public abstract class Charset implements Comparable<Charset> * * This may be set by the user or VM with the file.encoding * property. - * + * * @since 1.5 */ public static Charset defaultCharset() { String encoding; - - try + + try { - encoding = SystemProperties.getProperty("file.encoding"); + encoding = SystemProperties.getProperty("file.encoding"); } catch(SecurityException e) { - // Use fallback. - encoding = "ISO-8859-1"; + // Use fallback. + encoding = "ISO-8859-1"; } catch(IllegalArgumentException e) { - // Use fallback. - encoding = "ISO-8859-1"; + // Use fallback. + encoding = "ISO-8859-1"; } try { - return forName(encoding); + return forName(encoding); } catch(UnsupportedCharsetException e) { - // Ignore. + // Ignore. } catch(IllegalCharsetNameException e) { - // Ignore. + // Ignore. } catch(IllegalArgumentException e) { - // Ignore. + // Ignore. } - + throw new IllegalStateException("Can't get default charset!"); } @@ -170,7 +170,7 @@ public abstract class Charset implements Comparable<Charset> /** * Returns the Charset instance for the charset of the given name. - * + * * @param charsetName * @return the Charset instance for the indicated charset * @throws UnsupportedCharsetException if this VM does not support @@ -184,7 +184,7 @@ public abstract class Charset implements Comparable<Charset> // Throws IllegalArgumentException as the JDK does. if(charsetName == null) throw new IllegalArgumentException("Charset name must not be null."); - + Charset cs = charsetForName (charsetName); if (cs == null) throw new UnsupportedCharsetException (charsetName); @@ -208,13 +208,13 @@ public abstract class Charset implements Comparable<Charset> Charset cs = provider().charsetForName(charsetName); if (cs == null) { - CharsetProvider[] providers = providers2(); - for (int i = 0; i < providers.length; i++) - { - cs = providers[i].charsetForName(charsetName); - if (cs != null) - break; - } + CharsetProvider[] providers = providers2(); + for (int i = 0; i < providers.length; i++) + { + cs = providers[i].charsetForName(charsetName); + if (cs != null) + break; + } } return cs; } @@ -225,8 +225,8 @@ public abstract class Charset implements Comparable<Charset> = new TreeMap(String.CASE_INSENSITIVE_ORDER); for (Iterator<Charset> i = provider().charsets(); i.hasNext(); ) { - Charset cs = i.next(); - charsets.put(cs.name(), cs); + Charset cs = i.next(); + charsets.put(cs.name(), cs); } CharsetProvider[] providers = providers2(); @@ -333,21 +333,21 @@ public abstract class Charset implements Comparable<Charset> { try { - if (cachedEncoder == null) - { - cachedEncoder = newEncoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedEncoder.reset(); - return cachedEncoder.encode (cb); + if (cachedEncoder == null) + { + cachedEncoder = newEncoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedEncoder.reset(); + return cachedEncoder.encode (cb); } catch (CharacterCodingException e) { throw new AssertionError (e); } } - + public final ByteBuffer encode (String str) { return encode (CharBuffer.wrap (str)); @@ -361,15 +361,15 @@ public abstract class Charset implements Comparable<Charset> { try { - if (cachedDecoder == null) - { - cachedDecoder = newDecoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedDecoder.reset(); - - return cachedDecoder.decode (bb); + if (cachedDecoder == null) + { + cachedDecoder = newDecoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedDecoder.reset(); + + return cachedDecoder.decode (bb); } catch (CharacterCodingException e) { diff --git a/libjava/classpath/java/nio/charset/CharsetDecoder.java b/libjava/classpath/java/nio/charset/CharsetDecoder.java index c86f1c8..cf43feaf 100644 --- a/libjava/classpath/java/nio/charset/CharsetDecoder.java +++ b/libjava/classpath/java/nio/charset/CharsetDecoder.java @@ -1,4 +1,4 @@ -/* CharsetDecoder.java -- +/* CharsetDecoder.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -160,7 +160,7 @@ public abstract class CharsetDecoder cr = decodeLoop (in, out); } catch (RuntimeException e) - { + { throw new CoderMalfunctionError (e); } @@ -199,7 +199,7 @@ public abstract class CharsetDecoder { throw new UnsupportedOperationException (); } - + public final CoderResult flush (CharBuffer out) { // It seems weird that you can flush after reset, but Sun's javadoc diff --git a/libjava/classpath/java/nio/charset/CharsetEncoder.java b/libjava/classpath/java/nio/charset/CharsetEncoder.java index 932fe35..1f079a3 100644 --- a/libjava/classpath/java/nio/charset/CharsetEncoder.java +++ b/libjava/classpath/java/nio/charset/CharsetEncoder.java @@ -1,4 +1,4 @@ -/* CharsetEncoder.java -- +/* CharsetEncoder.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ public abstract class CharsetEncoder private static final int STATE_CODING = 1; private static final int STATE_END = 2; private static final int STATE_FLUSHED = 3; - + private static final byte[] DEFAULT_REPLACEMENT = {(byte)'?'}; private final Charset charset; @@ -71,7 +71,7 @@ public abstract class CharsetEncoder this (cs, averageBytesPerChar, maxBytesPerChar, DEFAULT_REPLACEMENT); } - protected CharsetEncoder (Charset cs, float averageBytesPerChar, + protected CharsetEncoder (Charset cs, float averageBytesPerChar, float maxBytesPerChar, byte[] replacement) { if (averageBytesPerChar <= 0.0f) @@ -87,7 +87,7 @@ public abstract class CharsetEncoder this.replacement = replacement; implReplaceWith (replacement); } - + public final float averageBytesPerChar () { return averageBytesPerChar; diff --git a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java index 5770ade..f7a32d2 100644 --- a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java +++ b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java @@ -1,4 +1,4 @@ -/* CoderMalfunctionError.java -- +/* CoderMalfunctionError.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/charset/CoderResult.java b/libjava/classpath/java/nio/charset/CoderResult.java index 304d9d7..b083d84 100644 --- a/libjava/classpath/java/nio/charset/CoderResult.java +++ b/libjava/classpath/java/nio/charset/CoderResult.java @@ -1,4 +1,4 @@ -/* CoderResult.java -- +/* CoderResult.java -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.util.HashMap; * @since 1.4 */ public class CoderResult -{ +{ private static final int TYPE_MALFORMED = 0; private static final int TYPE_OVERFLOW = 1; private static final int TYPE_UNDERFLOW = 2; @@ -57,7 +57,7 @@ public class CoderResult = new CoderResult (TYPE_OVERFLOW, 0); public static final CoderResult UNDERFLOW = new CoderResult (TYPE_UNDERFLOW, 0); - + private static final String[] names = { "MALFORMED", "OVERFLOW", "UNDERFLOW", "UNMAPPABLE" }; @@ -126,7 +126,7 @@ public class CoderResult { return malformedCache.get (length); } - + public void throwException () throws CharacterCodingException { @@ -152,7 +152,7 @@ public class CoderResult public static CoderResult unmappableForLength (int length) { return unmappableCache.get (length); - } + } private abstract static class Cache { diff --git a/libjava/classpath/java/nio/charset/CodingErrorAction.java b/libjava/classpath/java/nio/charset/CodingErrorAction.java index 592c159..3b64030 100644 --- a/libjava/classpath/java/nio/charset/CodingErrorAction.java +++ b/libjava/classpath/java/nio/charset/CodingErrorAction.java @@ -1,4 +1,4 @@ -/* CodingErrorAction.java -- +/* CodingErrorAction.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,11 +40,11 @@ package java.nio.charset; public class CodingErrorAction { public static final CodingErrorAction IGNORE - = new CodingErrorAction("ignore"); + = new CodingErrorAction("ignore"); public static final CodingErrorAction REPLACE - = new CodingErrorAction("replace"); + = new CodingErrorAction("replace"); public static final CodingErrorAction REPORT - = new CodingErrorAction("report"); + = new CodingErrorAction("report"); private final String name; diff --git a/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java b/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java index 7baeac3..0e05d4d 100644 --- a/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java +++ b/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java @@ -1,4 +1,4 @@ -/* IllegalCharsetNameException.java -- +/* IllegalCharsetNameException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,9 +47,9 @@ public class IllegalCharsetNameException extends IllegalArgumentException * Compatible with JDK 1.4+ */ private static final long serialVersionUID = 1457525358470002989L; - + private String charsetName; - + /** * Creates the exception * diff --git a/libjava/classpath/java/nio/charset/MalformedInputException.java b/libjava/classpath/java/nio/charset/MalformedInputException.java index 463d368..3870b55 100644 --- a/libjava/classpath/java/nio/charset/MalformedInputException.java +++ b/libjava/classpath/java/nio/charset/MalformedInputException.java @@ -1,4 +1,4 @@ -/* MalformedInputException.java -- +/* MalformedInputException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ public class MalformedInputException extends CharacterCodingException private static final long serialVersionUID = - 3438823399834806194L; private int inputLength; - + /** * Creates the exception * diff --git a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java index d22a238..d9cdb49 100644 --- a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java +++ b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java @@ -1,4 +1,4 @@ -/* UnmappableCharacterException.java -- +/* UnmappableCharacterException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ public class UnmappableCharacterException extends CharacterCodingException private static final long serialVersionUID = - 7026962371537706123L; private int inputLength; - + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java b/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java index 39536ba..c4f9d17 100644 --- a/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java +++ b/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java @@ -1,4 +1,4 @@ -/* UnsupportedCharsetException.java -- +/* UnsupportedCharsetException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,9 +47,9 @@ public class UnsupportedCharsetException extends IllegalArgumentException * Compatible with JDK 1.4+ */ private static final long serialVersionUID = 1490765524727386367L; - + String charsetName; - + /** * Creates the exception */ |