You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/12/20 18:11:28 UTC
svn commit: r1552740 - in /commons/proper/compress/trunk/src:
main/java/org/apache/commons/compress/archivers/ar/
main/java/org/apache/commons/compress/archivers/arj/
main/java/org/apache/commons/compress/archivers/cpio/
main/java/org/apache/commons/co...
Author: ggregory
Date: Fri Dec 20 17:11:27 2013
New Revision: 1552740
URL: http://svn.apache.org/r1552740
Log:
Remove some unnecessary parentheses.
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java Fri Dec 20 17:11:27 2013
@@ -158,7 +158,7 @@ public class ArArchiveEntry implements A
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + (name == null ? 0 : name.hashCode());
return result;
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java Fri Dec 20 17:11:27 2013
@@ -259,7 +259,7 @@ public class ArArchiveInputStream extend
}
final int ret = this.input.read(b, off, toRead);
count(ret);
- offset += (ret > 0 ? ret : 0);
+ offset += ret > 0 ? ret : 0;
return ret;
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java Fri Dec 20 17:11:27 2013
@@ -77,7 +77,7 @@ public class ArArchiveOutputStream exten
if (prevEntry == null || !haveUnclosedEntry){
throw new IOException("No current entry to close");
}
- if ((entryOffset % 2) != 0) {
+ if (entryOffset % 2 != 0) {
out.write('\n'); // Pad byte
}
haveUnclosedEntry = false;
@@ -147,7 +147,7 @@ public class ArArchiveOutputStream exten
}
offset = fill(offset, 16, ' ');
- final String m = "" + (pEntry.getLastModified());
+ final String m = "" + pEntry.getLastModified();
if (m.length() > 12) {
throw new IOException("modified too long");
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java Fri Dec 20 17:11:27 2013
@@ -83,7 +83,7 @@ public class ArjArchiveEntry implements
* account if the archive has beeen created on Unix.</p>
*/
public Date getLastModifiedDate() {
- long ts = isHostOsUnix() ? (localFileHeader.dateTimeModified * 1000l)
+ long ts = isHostOsUnix() ? localFileHeader.dateTimeModified * 1000l
: ZipUtil.dosToJavaTime(0xFFFFFFFFL & localFileHeader.dateTimeModified);
return new Date(ts);
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java Fri Dec 20 17:11:27 2013
@@ -525,7 +525,7 @@ public class CpioArchiveEntry implements
*/
public long getNumberOfLinks() {
return nlink == 0 ?
- (isDirectory() ? 2 : 1)
+ isDirectory() ? 2 : 1
: nlink;
}
@@ -861,7 +861,7 @@ public class CpioArchiveEntry implements
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + (name == null ? 0 : name.hashCode());
return result;
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java Fri Dec 20 17:11:27 2013
@@ -134,7 +134,7 @@ public class DumpArchiveInputStream exte
queue = new PriorityQueue<DumpArchiveEntry>(10,
new Comparator<DumpArchiveEntry>() {
public int compare(DumpArchiveEntry p, DumpArchiveEntry q) {
- if ((p.getOriginalName() == null) || (q.getOriginalName() == null)) {
+ if (p.getOriginalName() == null || q.getOriginalName() == null) {
return Integer.MAX_VALUE;
}
@@ -321,14 +321,14 @@ public class DumpArchiveInputStream exte
boolean first = true;
while (first ||
- (DumpArchiveConstants.SEGMENT_TYPE.ADDR == entry.getHeaderType())) {
+ DumpArchiveConstants.SEGMENT_TYPE.ADDR == entry.getHeaderType()) {
// read the header that we just peeked at.
if (!first) {
raw.readRecord();
}
if (!names.containsKey(Integer.valueOf(entry.getIno())) &&
- (DumpArchiveConstants.SEGMENT_TYPE.INODE == entry.getHeaderType())) {
+ DumpArchiveConstants.SEGMENT_TYPE.INODE == entry.getHeaderType()) {
pending.put(Integer.valueOf(entry.getIno()), entry);
}
@@ -344,7 +344,7 @@ public class DumpArchiveInputStream exte
int reclen = 0;
- for (int i = 0; (i < (datalen - 8)) && (i < (size - 8));
+ for (int i = 0; i < datalen - 8 && i < size - 8;
i += reclen) {
int ino = DumpArchiveUtil.convert32(blockBuffer, i);
reclen = DumpArchiveUtil.convert16(blockBuffer, i + 4);
@@ -461,20 +461,20 @@ public class DumpArchiveInputStream exte
public int read(byte[] buf, int off, int len) throws IOException {
int totalRead = 0;
- if (hasHitEOF || isClosed || (entryOffset >= entrySize)) {
+ if (hasHitEOF || isClosed || entryOffset >= entrySize) {
return -1;
}
- if ((len + entryOffset) > entrySize) {
+ if (len + entryOffset > entrySize) {
len = (int) (entrySize - entryOffset);
}
while (len > 0) {
- int sz = (len > (readBuf.length - recordOffset))
- ? (readBuf.length - recordOffset) : len;
+ int sz = len > readBuf.length - recordOffset
+ ? readBuf.length - recordOffset : len;
// copy any data we have
- if ((recordOffset + sz) <= readBuf.length) {
+ if (recordOffset + sz <= readBuf.length) {
System.arraycopy(readBuf, recordOffset, buf, off, sz);
totalRead += sz;
recordOffset += sz;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java Fri Dec 20 17:11:27 2013
@@ -143,7 +143,7 @@ public class SevenZFile implements Close
* @throws IOException if the next entry could not be read
*/
public SevenZArchiveEntry getNextEntry() throws IOException {
- if (currentEntryIndex >= (archive.files.length - 1)) {
+ if (currentEntryIndex >= archive.files.length - 1) {
return null;
}
++currentEntryIndex;
@@ -424,7 +424,7 @@ public class SevenZFile implements Close
}
long sum = 0;
if (nid == NID.kSize) {
- for (int i = 0; i < (folder.numUnpackSubStreams - 1); i++) {
+ for (int i = 0; i < folder.numUnpackSubStreams - 1; i++) {
final long size = readUint64(header);
subStreamsInfo.unpackSizes[nextUnpackStream++] = size;
sum += size;
@@ -489,9 +489,9 @@ public class SevenZFile implements Close
coders[i] = new Coder();
int bits = header.readUnsignedByte();
final int idSize = bits & 0xf;
- final boolean isSimple = ((bits & 0x10) == 0);
- final boolean hasAttributes = ((bits & 0x20) != 0);
- final boolean moreAlternativeMethods = ((bits & 0x80) != 0);
+ final boolean isSimple = (bits & 0x10) == 0;
+ final boolean hasAttributes = (bits & 0x20) != 0;
+ final boolean moreAlternativeMethods = (bits & 0x80) != 0;
coders[i].decompressionMethodId = new byte[idSize];
header.readFully(coders[i].decompressionMethodId);
@@ -625,7 +625,7 @@ public class SevenZFile implements Close
if (external != 0) {
throw new IOException("Not implemented");
} else {
- if (((size - 1) & 1) != 0) {
+ if ((size - 1 & 1) != 0) {
throw new IOException("File names length invalid");
}
final byte[] names = new byte[(int)(size - 1)];
@@ -721,7 +721,7 @@ public class SevenZFile implements Close
int nonEmptyFileCounter = 0;
int emptyFileCounter = 0;
for (int i = 0; i < files.length; i++) {
- files[i].setHasStream((isEmptyStream == null) ? true : !isEmptyStream.get(i));
+ files[i].setHasStream(isEmptyStream == null ? true : !isEmptyStream.get(i));
if (files[i].hasStream()) {
files[i].setDirectory(false);
files[i].setAntiItem(false);
@@ -730,8 +730,8 @@ public class SevenZFile implements Close
files[i].setSize(archive.subStreamsInfo.unpackSizes[nonEmptyFileCounter]);
++nonEmptyFileCounter;
} else {
- files[i].setDirectory((isEmptyFile == null) ? true : !isEmptyFile.get(emptyFileCounter));
- files[i].setAntiItem((isAnti == null) ? false : isAnti.get(emptyFileCounter));
+ files[i].setDirectory(isEmptyFile == null ? true : !isEmptyFile.get(emptyFileCounter));
+ files[i].setAntiItem(isAnti == null ? false : isAnti.get(emptyFileCounter));
files[i].setHasCrc(false);
files[i].setSize(0);
++emptyFileCounter;
@@ -745,7 +745,7 @@ public class SevenZFile implements Close
final StreamMap streamMap = new StreamMap();
int nextFolderPackStreamIndex = 0;
- final int numFolders = (archive.folders != null) ? archive.folders.length : 0;
+ final int numFolders = archive.folders != null ? archive.folders.length : 0;
streamMap.folderFirstPackStreamIndex = new int[numFolders];
for (int i = 0; i < numFolders; i++) {
streamMap.folderFirstPackStreamIndex[i] = nextFolderPackStreamIndex;
@@ -753,7 +753,7 @@ public class SevenZFile implements Close
}
long nextPackStreamOffset = 0;
- final int numPackSizes = (archive.packSizes != null) ? archive.packSizes.length : 0;
+ final int numPackSizes = archive.packSizes != null ? archive.packSizes.length : 0;
streamMap.packStreamOffsets = new long[numPackSizes];
for (int i = 0; i < numPackSizes; i++) {
streamMap.packStreamOffsets[i] = nextPackStreamOffset;
@@ -902,10 +902,10 @@ public class SevenZFile implements Close
long value = 0;
for (int i = 0; i < 8; i++) {
if ((firstByte & mask) == 0) {
- return value | ((firstByte & (mask - 1)) << (8 * i));
+ return value | (firstByte & mask - 1) << 8 * i;
}
long nextByte = in.readUnsignedByte();
- value |= (nextByte << (8 * i));
+ value |= nextByte << 8 * i;
mask >>>= 1;
}
return value;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java Fri Dec 20 17:11:27 2013
@@ -222,7 +222,7 @@ public class TarArchiveEntry implements
this.name = name;
this.mode = isDir ? DEFAULT_DIR_MODE : DEFAULT_FILE_MODE;
this.linkFlag = isDir ? LF_DIR : LF_NORMAL;
- this.modTime = (new Date()).getTime() / MILLIS_PER_SECOND;
+ this.modTime = new Date().getTime() / MILLIS_PER_SECOND;
this.userName = "";
}
@@ -897,7 +897,7 @@ public class TarArchiveEntry implements
private int writeEntryHeaderField(long value, byte[] outbuf, int offset,
int length, boolean starMode) {
if (!starMode && (value < 0
- || value >= (1l << (3 * (length - 1))))) {
+ || value >= 1l << 3 * (length - 1))) {
// value doesn't fit into field when written as octal
// number, will be written to PAX header or causes an
// error
@@ -1030,8 +1030,8 @@ public class TarArchiveEntry implements
char ch2 = fileName.charAt(1);
if (ch2 == ':'
- && ((ch1 >= 'a' && ch1 <= 'z')
- || (ch1 >= 'A' && ch1 <= 'Z'))) {
+ && (ch1 >= 'a' && ch1 <= 'z'
+ || ch1 >= 'A' && ch1 <= 'Z')) {
fileName = fileName.substring(2);
}
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java Fri Dec 20 17:11:27 2013
@@ -369,7 +369,7 @@ public class TarArchiveOutputStream exte
*/
@Override
public void write(byte[] wBuf, int wOffset, int numToWrite) throws IOException {
- if ((currBytes + numToWrite) > currSize) {
+ if (currBytes + numToWrite > currSize) {
throw new IOException("request to write '" + numToWrite
+ "' bytes exceeds size in header of '"
+ currSize + "' bytes for entry '"
@@ -385,7 +385,7 @@ public class TarArchiveOutputStream exte
}
if (assemLen > 0) {
- if ((assemLen + numToWrite) >= recordBuf.length) {
+ if (assemLen + numToWrite >= recordBuf.length) {
int aLen = recordBuf.length - assemLen;
System.arraycopy(assemBuf, 0, recordBuf, 0,
@@ -543,7 +543,7 @@ public class TarArchiveOutputStream exte
*/
private void writeRecord(byte[] buf, int offset) throws IOException {
- if ((offset + recordSize) > buf.length) {
+ if (offset + recordSize > buf.length) {
throw new IOException("record has length '" + buf.length
+ "' with offset '" + offset
+ "' which is less than the record size of '"
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java Fri Dec 20 17:11:27 2013
@@ -28,10 +28,10 @@ package org.apache.commons.compress.arch
public interface TarConstants {
/** Default record size */
- int DEFAULT_RCDSIZE = (512);
+ int DEFAULT_RCDSIZE = 512;
/** Default block size */
- int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20);
+ int DEFAULT_BLKSIZE = DEFAULT_RCDSIZE * 20;
/**
* GNU format as per before tar 1.12.
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java Fri Dec 20 17:11:27 2013
@@ -197,7 +197,7 @@ public class TarUtils {
if (negative) {
// 2's complement
val--;
- val ^= ((long) Math.pow(2, (length - 1) * 8) - 1);
+ val ^= (long) Math.pow(2, (length - 1) * 8) - 1;
}
return negative ? -val : val;
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java Fri Dec 20 17:11:27 2013
@@ -134,7 +134,7 @@ public class ExtraFieldUtils {
LOOP:
while (start <= data.length - WORD) {
ZipShort headerId = new ZipShort(data, start);
- int length = (new ZipShort(data, start + 2)).getValue();
+ int length = new ZipShort(data, start + 2).getValue();
if (start + WORD + length > data.length) {
switch(onUnparseableData.getKey()) {
case UnparseableExtraField.THROW_KEY:
@@ -180,7 +180,7 @@ public class ExtraFieldUtils {
} catch (IllegalAccessException iae) {
throw (ZipException) new ZipException(iae.getMessage()).initCause(iae);
}
- start += (length + WORD);
+ start += length + WORD;
}
ZipExtraField[] result = new ZipExtraField[v.size()];
@@ -212,7 +212,7 @@ public class ExtraFieldUtils {
0, result, start + 2, 2);
byte[] local = data[i].getLocalFileDataData();
System.arraycopy(local, 0, result, start + WORD, local.length);
- start += (local.length + WORD);
+ start += local.length + WORD;
}
if (lastIsUnparseableHolder) {
byte[] local = data[data.length - 1].getLocalFileDataData();
@@ -245,7 +245,7 @@ public class ExtraFieldUtils {
0, result, start + 2, 2);
byte[] local = data[i].getCentralDirectoryData();
System.arraycopy(local, 0, result, start + WORD, local.length);
- start += (local.length + WORD);
+ start += local.length + WORD;
}
if (lastIsUnparseableHolder) {
byte[] local = data[data.length - 1].getCentralDirectoryData();
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java Fri Dec 20 17:11:27 2013
@@ -182,8 +182,8 @@ public final class GeneralPurposeBit {
b.useUTF8ForNames((generalPurposeFlag & UFT8_NAMES_FLAG) != 0);
b.useStrongEncryption((generalPurposeFlag & STRONG_ENCRYPTION_FLAG) != 0);
b.useEncryption((generalPurposeFlag & ENCRYPTION_FLAG) != 0);
- b.slidingDictionarySize = ((generalPurposeFlag & SLIDING_DICTIONARY_SIZE_FLAG) != 0) ? 8192 : 4096;
- b.numberOfShannonFanoTrees = ((generalPurposeFlag & NUMBER_OF_SHANNON_FANO_TREES_FLAG) != 0) ? 3 : 2;
+ b.slidingDictionarySize = (generalPurposeFlag & SLIDING_DICTIONARY_SIZE_FLAG) != 0 ? 8192 : 4096;
+ b.numberOfShannonFanoTrees = (generalPurposeFlag & NUMBER_OF_SHANNON_FANO_TREES_FLAG) != 0 ? 3 : 2;
return b;
}
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java Fri Dec 20 17:11:27 2013
@@ -259,7 +259,7 @@ public class X7875_NewUnix implements Zi
@Override
public int hashCode() {
- int hc = (-1234567 * version);
+ int hc = -1234567 * version;
// Since most UID's and GID's are below 65,536, this is (hopefully!)
// a nice way to make sure typical UID and GID values impact the hash
// as much as possible.
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java Fri Dec 20 17:11:27 2013
@@ -268,7 +268,7 @@ public class ChangeSetPerformer {
return nestedEnum.hasMoreElements();
}
public ArchiveEntry next() {
- return (current = nestedEnum.nextElement());
+ return current = nestedEnum.nextElement();
}
public InputStream getInputStream() throws IOException {
return in.getInputStream(current);
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java Fri Dec 20 17:11:27 2013
@@ -43,7 +43,7 @@ public class ArchiveUtils {
public static String toString(ArchiveEntry entry){
StringBuilder sb = new StringBuilder();
sb.append(entry.isDirectory()? 'd' : '-');// c.f. "ls -l" output
- String size = Long.toString((entry.getSize()));
+ String size = Long.toString(entry.getSize());
sb.append(' ');
// Pad output to 7 places, leading spaces
for(int i=7; i > size.length(); i--){
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java Fri Dec 20 17:11:27 2013
@@ -92,7 +92,7 @@ public final class IOUtils {
}
numToSkip -= skipped;
}
- return (available - numToSkip);
+ return available - numToSkip;
}
/**
Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java Fri Dec 20 17:11:27 2013
@@ -202,7 +202,7 @@ public final class ZipTestCase extends A
ZipArchiveEntry entry = null;
while((entry = (ZipArchiveEntry)in.getNextEntry()) != null) {
- results.add((entry.getName()));
+ results.add(entry.getName());
ArchiveInputStream nestedIn = new ArchiveStreamFactory().createArchiveInputStream("zip", in);
ZipArchiveEntry nestedEntry = null;
Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java?rev=1552740&r1=1552739&r2=1552740&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java Fri Dec 20 17:11:27 2013
@@ -33,7 +33,7 @@ public final class XZTestCase extends Ab
public void testXZCreation() throws Exception {
long max = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax();
- System.out.println("XZTestCase: HeapMax="+max+" bytes "+((double)max/(1024*1024))+" MB");
+ System.out.println("XZTestCase: HeapMax="+max+" bytes "+(double)max/(1024*1024)+" MB");
final File input = getFile("test1.xml");
final File output = new File(dir, "test1.xml.xz");
final OutputStream out = new FileOutputStream(output);