diff options
Diffstat (limited to 'gnu/java/security/util')
| -rw-r--r-- | gnu/java/security/util/ByteArray.java | 3 | ||||
| -rw-r--r-- | gnu/java/security/util/ByteBufferOutputStream.java | 3 | ||||
| -rw-r--r-- | gnu/java/security/util/ExpirableObject.java | 4 | ||||
| -rw-r--r-- | gnu/java/security/util/FormatUtil.java | 10 | ||||
| -rw-r--r-- | gnu/java/security/util/Sequence.java | 6 | ||||
| -rw-r--r-- | gnu/java/security/util/SimpleList.java | 5 | ||||
| -rw-r--r-- | gnu/java/security/util/Util.java | 26 |
7 files changed, 34 insertions, 23 deletions
diff --git a/gnu/java/security/util/ByteArray.java b/gnu/java/security/util/ByteArray.java index a9b9e5d00..c7f8dce11 100644 --- a/gnu/java/security/util/ByteArray.java +++ b/gnu/java/security/util/ByteArray.java @@ -1,5 +1,5 @@ /* ByteArray.java -- wrapper around a byte array, with nice toString output. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2015 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,6 +57,7 @@ public final class ByteArray return value; } + @Override public String toString () { StringWriter str = new StringWriter (); diff --git a/gnu/java/security/util/ByteBufferOutputStream.java b/gnu/java/security/util/ByteBufferOutputStream.java index 642ccdf68..70dc909c7 100644 --- a/gnu/java/security/util/ByteBufferOutputStream.java +++ b/gnu/java/security/util/ByteBufferOutputStream.java @@ -1,6 +1,6 @@ /* ByteBufferOutputStream.java -- output stream with a growable underlying byte buffer. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -98,6 +98,7 @@ public class ByteBufferOutputStream extends OutputStream return ((ByteBuffer) buffer.duplicate().flip()).slice(); } + @Override public String toString() { return super.toString() + " [ buffer: " + buffer + " ]"; diff --git a/gnu/java/security/util/ExpirableObject.java b/gnu/java/security/util/ExpirableObject.java index e24af249a..c2551c70b 100644 --- a/gnu/java/security/util/ExpirableObject.java +++ b/gnu/java/security/util/ExpirableObject.java @@ -1,5 +1,5 @@ /* ExpirableObject.java -- an object that is automatically destroyed. - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -107,6 +107,7 @@ public abstract class ExpirableObject * * @throws DestroyFailedException If this operation fails. */ + @Override public final void destroy() throws DestroyFailedException { doDestroy(); @@ -135,6 +136,7 @@ public abstract class ExpirableObject this.target = target; } + @Override public void run() { try diff --git a/gnu/java/security/util/FormatUtil.java b/gnu/java/security/util/FormatUtil.java index 35da322b8..e9bb253f8 100644 --- a/gnu/java/security/util/FormatUtil.java +++ b/gnu/java/security/util/FormatUtil.java @@ -1,5 +1,5 @@ /* FormatUtil.java -- Encoding and decoding format utility methods - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2015 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,7 +60,7 @@ public class FormatUtil */ public static final String getEncodingName(int formatID) { - String result = null; + String result; switch (formatID) { case Registry.RAW_ENCODING_ID: @@ -75,6 +75,8 @@ public class FormatUtil case Registry.ASN1_ENCODING_ID: result = Registry.ASN1_ENCODING; break; + default: + result = null; } return result; @@ -90,7 +92,7 @@ public class FormatUtil */ public static final String getEncodingShortName(int formatID) { - String result = null; + String result; switch (formatID) { case Registry.RAW_ENCODING_ID: @@ -105,6 +107,8 @@ public class FormatUtil case Registry.ASN1_ENCODING_ID: result = Registry.ASN1_ENCODING_SHORT_NAME; break; + default: + result = null; } return result; diff --git a/gnu/java/security/util/Sequence.java b/gnu/java/security/util/Sequence.java index 8069ce891..ac9427137 100644 --- a/gnu/java/security/util/Sequence.java +++ b/gnu/java/security/util/Sequence.java @@ -1,5 +1,5 @@ /* Sequence.java -- a sequence of integers. - Copyright (C) 2004, 2006, 2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2014, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -122,13 +122,15 @@ public final class Sequence return sequence[index]; } + @Override public int size() { return sequence.length; } + @Override public Object[] toArray() { - return (Object[]) sequence.clone(); + return sequence.clone(); } } diff --git a/gnu/java/security/util/SimpleList.java b/gnu/java/security/util/SimpleList.java index 2d3bd3525..cf0d64b3c 100644 --- a/gnu/java/security/util/SimpleList.java +++ b/gnu/java/security/util/SimpleList.java @@ -1,5 +1,5 @@ /* SimpleList.java -- simple way to make tuples. - Copyright (C) 2004, 2006, 2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2014, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -131,6 +131,7 @@ public final class SimpleList elements[i++] = o; } + @Override public int size() { if (elements == null) @@ -138,6 +139,7 @@ public final class SimpleList return elements.length; } + @Override public Object get(int index) { if (elements == null) @@ -147,6 +149,7 @@ public final class SimpleList return elements[index]; } + @Override public String toString() { return SimpleList.class.getName() + "(" + size() + ") " + super.toString(); diff --git a/gnu/java/security/util/Util.java b/gnu/java/security/util/Util.java index ef3d480a0..5bbb7264b 100644 --- a/gnu/java/security/util/Util.java +++ b/gnu/java/security/util/Util.java @@ -1,5 +1,5 @@ /* Util.java -- various utility routines. - Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2006, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -467,6 +467,7 @@ public class Util b1 = buffer[0]; b2 = buffer[1]; break; + default: // do nothing } CPStringBuilder sb = new CPStringBuilder(); int c; @@ -499,19 +500,16 @@ public class Util } if (pos >= len) break; - else - { - try - { - b0 = buffer[pos++]; - b1 = buffer[pos++]; - b2 = buffer[pos++]; - } - catch (ArrayIndexOutOfBoundsException x) - { - break; - } - } + try + { + b0 = buffer[pos++]; + b1 = buffer[pos++]; + b2 = buffer[pos++]; + } + catch (ArrayIndexOutOfBoundsException x) + { + break; + } } while (true); |