[Fix] Fixed binaryTo*() due to not parsing in reverse
This commit is contained in:
parent
48142e517c
commit
936ce8ca8b
|
@ -206,13 +206,27 @@ public class StringHelper {
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static char binaryToChar(String binary) {
|
||||||
|
if (binary.indexOf(' ') != -1)
|
||||||
|
binary = binary.replaceAll(" ", "");
|
||||||
|
if (binary.length() != Byte.SIZE && binary.length() != Short.SIZE)
|
||||||
|
throw new IllegalArgumentException("char as binary must be 8 or 16 chars long!");
|
||||||
|
int b = 0;
|
||||||
|
for (int i = 0; i < binary.length(); i++) {
|
||||||
|
if (binary.charAt((binary.length() - 1) - i) == '1')
|
||||||
|
b = setBit(b, i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (char) b;
|
||||||
|
}
|
||||||
|
|
||||||
public static short binaryToShort(String binary) {
|
public static short binaryToShort(String binary) {
|
||||||
binary = binary.replaceAll(" ", "");
|
binary = binary.replaceAll(" ", "");
|
||||||
if (binary.length() != Short.SIZE)
|
if (binary.length() != Short.SIZE)
|
||||||
throw new IllegalArgumentException("Short as binary must be 8 chars long!");
|
throw new IllegalArgumentException("Short as binary must be 8 chars long!");
|
||||||
short b = 0;
|
short b = 0;
|
||||||
for (int i = 0; i < Short.SIZE; i++) {
|
for (int i = 0; i < Short.SIZE; i++) {
|
||||||
if (binary.charAt(i) == '1')
|
if (binary.charAt((Short.SIZE - 1) - i) == '1')
|
||||||
b = setBit(b, i);
|
b = setBit(b, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -225,7 +239,7 @@ public class StringHelper {
|
||||||
throw new IllegalArgumentException("Integer as binary must be 8 chars long!");
|
throw new IllegalArgumentException("Integer as binary must be 8 chars long!");
|
||||||
int b = 0;
|
int b = 0;
|
||||||
for (int i = 0; i < Integer.SIZE; i++) {
|
for (int i = 0; i < Integer.SIZE; i++) {
|
||||||
if (binary.charAt(i) == '1')
|
if (binary.charAt((Integer.SIZE - 1) - i) == '1')
|
||||||
b = setBit(b, i);
|
b = setBit(b, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -869,5 +883,4 @@ public class StringHelper {
|
||||||
return uniqueId;
|
return uniqueId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue