moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

remove Internal UnhandledDataStructure.copyOfRange because function is available in JDK 1.6+ and we no longer support JDK 1.5

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751984 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-07-09 06:38:16 +00:00
parent ca22a79e01
commit 518253650a
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
View File

@ -283,24 +283,17 @@ public final class FIBFieldHandler
{ {
result.append( '\t' ); result.append( '\t' );
result.append( leftPad( Integer.toString( x ), 8, ' ' ) ); result.append( leftPad( Integer.toString( x ), 8, ' ' ) );
result.append( leftPad( result.append( leftPad( Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, ' ' ) );
Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6,
' ' ) );
result.append( " 0x" ); result.append( " 0x" );
result.append( leftPad( result.append( leftPad( Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), 4, '0' ) );
Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, ' ' ) );
4, '0' ) ); result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, ' ' ) );
result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8,
' ' ) );
result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8,
' ' ) );
UnhandledDataStructure structure = _unknownMap.get( Integer UnhandledDataStructure structure = _unknownMap.get( Integer.valueOf( x ) );
.valueOf( x ) );
if ( structure != null ) if ( structure != null )
{ {
result.append( " => Unknown structure of size " ); result.append( " => Unknown structure of size " );
result.append( structure._buf.length ); result.append( structure.getBuf().length );
} }
result.append( '\n' ); result.append( '\n' );
} }

21
src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
View File

@ -17,6 +17,8 @@
package org.apache.poi.hwpf.model; package org.apache.poi.hwpf.model;
import java.util.Arrays;
import org.apache.poi.util.Internal; import org.apache.poi.util.Internal;
/** /**
@ -27,7 +29,7 @@ import org.apache.poi.util.Internal;
@Internal @Internal
public final class UnhandledDataStructure public final class UnhandledDataStructure
{ {
byte[] _buf; private final byte[] _buf;
public UnhandledDataStructure(byte[] buf, int offset, int length) public UnhandledDataStructure(byte[] buf, int offset, int length)
{ {
@ -46,24 +48,11 @@ public final class UnhandledDataStructure
} }
// Save that requested portion of the data // Save that requested portion of the data
_buf = copyOfRange(buf, offset, offsetEnd); _buf = Arrays.copyOfRange(buf, offset, offsetEnd);
} }
/** /*package*/ byte[] getBuf()
* 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()
{ {
return _buf; return _buf;
} }