Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify expressions again. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1393539 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joerg Schaible 2012-10-03 15:26:13 +00:00
parent bb7462c8b5
commit 46448a690c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/apache/commons/lang3/Conversion.java
View File

@ -597,8 +597,8 @@ public static long intsToLong(int[] src, int srcPos, long dstInit, int dstPos, i
for (int i = 0; i < nInts; i++ ) { for (int i = 0; i < nInts; i++ ) {
shift = i * 32 + dstPos; shift = i * 32 + dstPos;
long bits = ((0xffffffffL & src[i + srcPos]) << shift); long bits = ((0xffffffffL & src[i + srcPos]) << shift);
long mask = (0xffffffffL << shift); long mask = 0xffffffffL << shift;
out = ((out & ~mask) | bits); out = (out & ~mask) | bits;
} }
return out; return out;
} }
@ -919,7 +919,7 @@ public static long boolsToLong(boolean[] src, int srcPos, long dstInit, int dstP
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + dstPos; shift = i * 1 + dstPos;
long bits = (0x1L & ((src[i + srcPos]) ? 1 : 0)) << shift; long bits = (src[i + srcPos] ? 1L : 0) << shift;
long mask = 0x1L << shift; long mask = 0x1L << shift;
out = (out & ~mask) | bits; out = (out & ~mask) | bits;
} }
@ -951,7 +951,7 @@ public static int boolsToInt(boolean[] src, int srcPos, int dstInit, int dstPos,
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + dstPos; shift = i * 1 + dstPos;
int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; int bits = (src[i + srcPos] ? 1 : 0) << shift;
int mask = 0x1 << shift; int mask = 0x1 << shift;
out = (out & ~mask) | bits; out = (out & ~mask) | bits;
} }
@ -984,7 +984,7 @@ public static short boolsToShort(boolean[] src, int srcPos, short dstInit, int d
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + dstPos; shift = i * 1 + dstPos;
int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; int bits = (src[i + srcPos] ? 1 : 0) << shift;
int mask = 0x1 << shift; int mask = 0x1 << shift;
out = (short)((out & ~mask) | bits); out = (short)((out & ~mask) | bits);
} }
@ -1017,7 +1017,7 @@ public static byte boolsToByte(boolean[] src, int srcPos, byte dstInit, int dstP
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + dstPos; shift = i * 1 + dstPos;
int bits = (0x1 & ((src[i + srcPos]) ? 1 : 0)) << shift; int bits = (src[i + srcPos] ? 1 : 0) << shift;
int mask = 0x1 << shift; int mask = 0x1 << shift;
out = (byte)((out & ~mask) | bits); out = (byte)((out & ~mask) | bits);
} }