From 518253650a570fba256dfa9a41289f4758462c2b Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Sat, 9 Jul 2016 06:38:16 +0000 Subject: [PATCH] remove Internal UnhandledDataStructure.copyOfRange because function is available in JDK 1.6+ and we no longer support JDK 1.5 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751984 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hwpf/model/FIBFieldHandler.java | 19 ++++++----------- .../hwpf/model/UnhandledDataStructure.java | 21 +++++-------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java index 68911d1933..ec422d9ffd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java @@ -283,24 +283,17 @@ public final class FIBFieldHandler { result.append( '\t' ); result.append( leftPad( Integer.toString( x ), 8, ' ' ) ); - result.append( leftPad( - Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, - ' ' ) ); + result.append( leftPad( Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, ' ' ) ); result.append( " 0x" ); - result.append( leftPad( - Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), - 4, '0' ) ); - result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, - ' ' ) ); - result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, - ' ' ) ); + result.append( leftPad( Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), 4, '0' ) ); + result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, ' ' ) ); + result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, ' ' ) ); - UnhandledDataStructure structure = _unknownMap.get( Integer - .valueOf( x ) ); + UnhandledDataStructure structure = _unknownMap.get( Integer.valueOf( x ) ); if ( structure != null ) { result.append( " => Unknown structure of size " ); - result.append( structure._buf.length ); + result.append( structure.getBuf().length ); } result.append( '\n' ); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java index 306697e476..89d5c492fd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java @@ -17,6 +17,8 @@ package org.apache.poi.hwpf.model; +import java.util.Arrays; + import org.apache.poi.util.Internal; /** @@ -27,7 +29,7 @@ import org.apache.poi.util.Internal; @Internal public final class UnhandledDataStructure { - byte[] _buf; + private final byte[] _buf; public UnhandledDataStructure(byte[] buf, int offset, int length) { @@ -46,24 +48,11 @@ public final class UnhandledDataStructure } // Save that requested portion of the data - _buf = copyOfRange(buf, offset, offsetEnd); + _buf = Arrays.copyOfRange(buf, offset, offsetEnd); } - /** - * YK: Arrays.copyOfRange is not in JDK 1.5 - */ - static byte[] copyOfRange(byte[] original, int from, int to) { - int newLength = to - from; - if (newLength < 0) - throw new IllegalArgumentException(from + " > " + to); - byte[] copy = new byte[newLength]; - System.arraycopy(original, from, copy, 0, - Math.min(original.length - from, newLength)); - return copy; - } - - byte[] getBuf() + /*package*/ byte[] getBuf() { return _buf; } -- 2.39.5