Changed fromStream
method name to from
to be consistent. Fixed falldown case error when converting from bytes longer than the expected length
This commit is contained in:
parent
55ee9d973f
commit
60d6f6330f
@ -29,9 +29,7 @@ import java.nio.ByteBuffer;
|
|||||||
@SuppressWarnings("ALL")
|
@SuppressWarnings("ALL")
|
||||||
public
|
public
|
||||||
class BigEndian {
|
class BigEndian {
|
||||||
// the following are ALL in Bit-Endian (byte[0] is most significant)
|
// the following are ALL in Bit-Endian (byte[0] is MOST significant)
|
||||||
// TODO: switch these to big endian. these are a copy of little endian
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CHAR to and from bytes
|
* CHAR to and from bytes
|
||||||
@ -59,6 +57,7 @@ class BigEndian {
|
|||||||
char number = 0;
|
char number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[0] & 0xFF) << 8;
|
number |= (bytes[0] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -79,7 +78,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
char fromStream(final InputStream inputStream) throws IOException {
|
char from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -132,6 +131,7 @@ class BigEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[0] & 0xFF) << 8;
|
number |= (bytes[0] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -152,7 +152,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
UShort fromStream(final InputStream inputStream) throws IOException {
|
UShort from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -213,6 +213,7 @@ class BigEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[0] & 0xFF) << 8;
|
number |= (bytes[0] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -233,7 +234,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
short fromStream(final InputStream inputStream) throws IOException {
|
short from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -286,6 +287,7 @@ class BigEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[0] & 0xFF) << 8;
|
number |= (bytes[0] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -306,7 +308,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
UShort fromStream(final InputStream inputStream) throws IOException {
|
UShort from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -369,6 +371,7 @@ class BigEndian {
|
|||||||
int number = 0;
|
int number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 4:
|
case 4:
|
||||||
number |= (bytes[0] & 0xFF) << 24;
|
number |= (bytes[0] & 0xFF) << 24;
|
||||||
case 3:
|
case 3:
|
||||||
@ -396,7 +399,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
int fromStream(InputStream inputStream) throws IOException {
|
int from(InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -457,6 +460,7 @@ class BigEndian {
|
|||||||
int number = 0;
|
int number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 4:
|
case 4:
|
||||||
number |= (bytes[0] & 0xFF) << 24;
|
number |= (bytes[0] & 0xFF) << 24;
|
||||||
case 3:
|
case 3:
|
||||||
@ -486,7 +490,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
UInteger fromStream(final InputStream inputStream) throws IOException {
|
UInteger from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read());
|
return from((byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read(), (byte) inputStream.read());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -562,6 +566,7 @@ class BigEndian {
|
|||||||
long number = 0L;
|
long number = 0L;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 8:
|
case 8:
|
||||||
number |= (long) (bytes[0] & 0xFF) << 56;
|
number |= (long) (bytes[0] & 0xFF) << 56;
|
||||||
case 7:
|
case 7:
|
||||||
@ -601,7 +606,7 @@ class BigEndian {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
long fromStream(final InputStream inputStream) throws IOException {
|
long from(final InputStream inputStream) throws IOException {
|
||||||
return from((byte) inputStream.read(),
|
return from((byte) inputStream.read(),
|
||||||
(byte) inputStream.read(),
|
(byte) inputStream.read(),
|
||||||
(byte) inputStream.read(),
|
(byte) inputStream.read(),
|
||||||
@ -717,7 +722,6 @@ class BigEndian {
|
|||||||
byte[] bytes = x.toBigInteger()
|
byte[] bytes = x.toBigInteger()
|
||||||
.toByteArray();
|
.toByteArray();
|
||||||
|
|
||||||
|
|
||||||
if (bytes.length < 8) {
|
if (bytes.length < 8) {
|
||||||
byte[] fixedBytes = new byte[8];
|
byte[] fixedBytes = new byte[8];
|
||||||
int length = bytes.length;
|
int length = bytes.length;
|
||||||
|
@ -30,8 +30,7 @@ import java.nio.ByteBuffer;
|
|||||||
@SuppressWarnings("ALL")
|
@SuppressWarnings("ALL")
|
||||||
public
|
public
|
||||||
class LittleEndian {
|
class LittleEndian {
|
||||||
// the following are ALL in Little-Endian (byte[0] is least significant)
|
// the following are ALL in Little-Endian (byte[0] is LEAST significant)
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CHAR to and from bytes
|
* CHAR to and from bytes
|
||||||
@ -59,6 +58,7 @@ class LittleEndian {
|
|||||||
char number = 0;
|
char number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[1] & 0xFF) << 8;
|
number |= (bytes[1] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -133,6 +133,7 @@ class LittleEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[1] & 0xFF) << 8;
|
number |= (bytes[1] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -212,6 +213,7 @@ class LittleEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[1] & 0xFF) << 8;
|
number |= (bytes[1] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -285,6 +287,7 @@ class LittleEndian {
|
|||||||
short number = 0;
|
short number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 2:
|
case 2:
|
||||||
number |= (bytes[1] & 0xFF) << 8;
|
number |= (bytes[1] & 0xFF) << 8;
|
||||||
case 1:
|
case 1:
|
||||||
@ -367,6 +370,7 @@ class LittleEndian {
|
|||||||
int number = 0;
|
int number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 4:
|
case 4:
|
||||||
number |= (bytes[3] & 0xFF) << 24;
|
number |= (bytes[3] & 0xFF) << 24;
|
||||||
case 3:
|
case 3:
|
||||||
@ -455,6 +459,7 @@ class LittleEndian {
|
|||||||
int number = 0;
|
int number = 0;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 4:
|
case 4:
|
||||||
number |= (bytes[3] & 0xFF) << 24;
|
number |= (bytes[3] & 0xFF) << 24;
|
||||||
case 3:
|
case 3:
|
||||||
@ -561,6 +566,7 @@ class LittleEndian {
|
|||||||
long number = 0L;
|
long number = 0L;
|
||||||
|
|
||||||
switch (bytes.length) {
|
switch (bytes.length) {
|
||||||
|
default:
|
||||||
case 8:
|
case 8:
|
||||||
number |= (long) (bytes[7] & 0xFF) << 56;
|
number |= (long) (bytes[7] & 0xFF) << 56;
|
||||||
case 7:
|
case 7:
|
||||||
|
Loading…
Reference in New Issue
Block a user