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

Removed unnecessary multiplication by one. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1592163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Duncan Jones 2014-05-03 08:21:49 +00:00
parent 64ef8a8022
commit 2486300548
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1051,7 +1051,7 @@ public class Conversion {
long out = dstInit; long out = dstInit;
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 + dstPos;
final long bits = (src[i + srcPos] ? 1L : 0) << shift; final long bits = (src[i + srcPos] ? 1L : 0) << shift;
final long mask = 0x1L << shift; final long mask = 0x1L << shift;
out = (out & ~mask) | bits; out = (out & ~mask) | bits;
@ -1087,7 +1087,7 @@ public class Conversion {
int out = dstInit; int out = dstInit;
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 + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift; final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift; final int mask = 0x1 << shift;
out = (out & ~mask) | bits; out = (out & ~mask) | bits;
@ -1124,7 +1124,7 @@ public class Conversion {
short out = dstInit; short out = dstInit;
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 + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift; final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift; final int mask = 0x1 << shift;
out = (short)((out & ~mask) | bits); out = (short)((out & ~mask) | bits);
@ -1160,7 +1160,7 @@ public class Conversion {
byte out = dstInit; byte out = dstInit;
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 + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift; final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift; final int mask = 0x1 << shift;
out = (byte)((out & ~mask) | bits); out = (byte)((out & ~mask) | bits);
@ -1558,7 +1558,7 @@ public class Conversion {
} }
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + srcPos; shift = i + srcPos;
dst[dstPos + i] = ((0x1 & (src >> shift)) != 0); dst[dstPos + i] = ((0x1 & (src >> shift)) != 0);
} }
return dst; return dst;
@ -1592,7 +1592,7 @@ public class Conversion {
} }
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + srcPos; shift = i + srcPos;
dst[dstPos + i] = ((0x1 & (src >> shift)) != 0); dst[dstPos + i] = ((0x1 & (src >> shift)) != 0);
} }
return dst; return dst;
@ -1625,9 +1625,9 @@ public class Conversion {
"nBools-1+srcPos is greather or equal to than 16"); "nBools-1+srcPos is greather or equal to than 16");
} }
int shift = 0; int shift = 0;
assert ((nBools - 1) * 1 < 16 - srcPos); assert ((nBools - 1) < 16 - srcPos);
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + srcPos; shift = i + srcPos;
dst[dstPos + i] = ((0x1 & (src >> shift)) != 0); dst[dstPos + i] = ((0x1 & (src >> shift)) != 0);
} }
return dst; return dst;
@ -1660,7 +1660,7 @@ public class Conversion {
} }
int shift = 0; int shift = 0;
for (int i = 0; i < nBools; i++ ) { for (int i = 0; i < nBools; i++ ) {
shift = i * 1 + srcPos; shift = i + srcPos;
dst[dstPos + i] = ((0x1 & (src >> shift)) != 0); dst[dstPos + i] = ((0x1 & (src >> shift)) != 0);
} }
return dst; return dst;