diff options
Diffstat (limited to 'libjava/classpath/gnu/java/nio/charset/iconv')
4 files changed, 32 insertions, 34 deletions
diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java index ffd2a103f98..2c59267b513 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java @@ -63,11 +63,11 @@ public final class IconvCharset extends Charset { try { - return new IconvDecoder(this, info); + return new IconvDecoder(this, info); } catch (IllegalArgumentException e) { - return null; + return null; } } @@ -75,11 +75,11 @@ public final class IconvCharset extends Charset { try { - return new IconvEncoder(this, info); + return new IconvEncoder(this, info); } catch (IllegalArgumentException e) { - return null; + return null; } } } diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java index f76d3fd5e1a..86f7107f26b 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java @@ -78,20 +78,20 @@ final class IconvDecoder extends CharsetDecoder inArr = in.array(); else { - inArr = new byte[remIn]; - in.get(inArr); + inArr = new byte[remIn]; + in.get(inArr); } if (out.hasArray()) { - ret = decode(inArr, out.array(), inPos, remIn, outPos, remOut); - out.position(outPos + (remOut - outremaining)); + ret = decode(inArr, out.array(), inPos, remIn, outPos, remOut); + out.position(outPos + (remOut - outremaining)); } else { - char[] outArr = new char[remOut]; - ret = decode(inArr, outArr, inPos, remIn, outPos, remOut); - out.put(outArr, 0, (remOut - outremaining)); + char[] outArr = new char[remOut]; + ret = decode(inArr, outArr, inPos, remIn, outPos, remOut); + out.put(outArr, 0, (remOut - outremaining)); } in.position(inPos + (remIn - inremaining)); @@ -108,5 +108,3 @@ final class IconvDecoder extends CharsetDecoder closeIconv(); } } - - diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java index 47446f98fd4..4f7a34b2819 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java @@ -78,20 +78,20 @@ final class IconvEncoder extends CharsetEncoder inArr = in.array(); else { - inArr = new char[remIn]; - in.get(inArr); + inArr = new char[remIn]; + in.get(inArr); } if (out.hasArray()) { - ret = encode(inArr, out.array(), inPos, remIn, outPos, remOut); - out.position(outPos + (remOut - outremaining)); + ret = encode(inArr, out.array(), inPos, remIn, outPos, remOut); + out.position(outPos + (remOut - outremaining)); } else { - byte[] outArr = new byte[remOut]; - ret = encode(inArr, outArr, inPos, remIn, outPos, remOut); - out.put(outArr, 0, (remOut - outremaining)); + byte[] outArr = new byte[remOut]; + ret = encode(inArr, outArr, inPos, remIn, outPos, remOut); + out.put(outArr, 0, (remOut - outremaining)); } in.position(inPos + (remIn - inremaining)); diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java index cf9fc56a2f5..1d5ca1052bd 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java @@ -72,13 +72,13 @@ public final class IconvProvider extends CharsetProvider Vector charsets = new Vector(); for (int i = 0; i < names.size(); i++) { - try - { - charsets.add(new IconvCharset((IconvMetaData) names.elementAt(i))); - } - catch (IllegalArgumentException e) - { - } + try + { + charsets.add(new IconvCharset((IconvMetaData) names.elementAt(i))); + } + catch (IllegalArgumentException e) + { + } } return charsets.iterator(); } @@ -87,17 +87,17 @@ public final class IconvProvider extends CharsetProvider { try { - IconvMetaData info = IconvMetaData.get(charsetName); + IconvMetaData info = IconvMetaData.get(charsetName); - // Try anyway if the set isn't found. - if (info == null) - info = new IconvMetaData(charsetName, 2.0f, 2.0f, 2.0f, 2.0f, - new String[] { }, charsetName); - return new IconvCharset(info); + // Try anyway if the set isn't found. + if (info == null) + info = new IconvMetaData(charsetName, 2.0f, 2.0f, 2.0f, 2.0f, + new String[] { }, charsetName); + return new IconvCharset(info); } catch (IllegalArgumentException e) { - return null; + return null; } } |