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

bug 59170: remove deprecated constants, make private variables final, whitespace

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1753052 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-07-17 10:27:18 +00:00
parent b3300cf4be
commit 38b29717ec
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
View File

@ -25,11 +25,8 @@ import org.apache.poi.util.LittleEndian;
/** /**
* This class is used to represent a sprm operation from a Word 97/2000/XP * This class is used to represent a sprm operation from a Word 97/2000/XP
* document. * document.
*
* @author Ryan Ackley
* @version 1.0
*/ */
@Internal @Internal(since="3.8 beta 4")
public final class SprmOperation public final class SprmOperation
{ {
private static final BitField BITFIELD_OP = BitFieldFactory private static final BitField BITFIELD_OP = BitFieldFactory
@ -50,11 +47,6 @@ public final class SprmOperation
public static final int TYPE_SEP = 4; public static final int TYPE_SEP = 4;
public static final int TYPE_TAP = 5; public static final int TYPE_TAP = 5;
@Deprecated
final static public int PAP_TYPE = TYPE_PAP;
@Deprecated
final static public int TAP_TYPE = TYPE_TAP;
public static int getOperationFromOpcode( short opcode ) public static int getOperationFromOpcode( short opcode )
{ {
return BITFIELD_OP.getValue( opcode ); return BITFIELD_OP.getValue( opcode );
@ -65,11 +57,11 @@ public final class SprmOperation
return BITFIELD_TYPE.getValue( opcode ); return BITFIELD_TYPE.getValue( opcode );
} }
private int _offset; private final int _offset;
private int _gOffset; private int _gOffset;
private byte[] _grpprl; private final byte[] _grpprl;
private int _size; private final int _size;
private short _value; private final short _value;
public SprmOperation( byte[] grpprl, int offset ) public SprmOperation( byte[] grpprl, int offset )
{ {
@ -136,7 +128,8 @@ public final class SprmOperation
public short getOperandShortSigned() public short getOperandShortSigned()
{ {
if ( getSizeCode() != 2 && getSizeCode() != 4 && getSizeCode() != 5 ) int sizeCode = getSizeCode();
if ( sizeCode != 2 && sizeCode != 4 && sizeCode != 5 )
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Current SPRM doesn't have signed short operand: " + this ); "Current SPRM doesn't have signed short operand: " + this );
@ -175,8 +168,8 @@ public final class SprmOperation
int offset = _gOffset; int offset = _gOffset;
if ( sprm == SPRM_LONG_TABLE || sprm == SPRM_LONG_PARAGRAPH ) if ( sprm == SPRM_LONG_TABLE || sprm == SPRM_LONG_PARAGRAPH )
{ {
int retVal = ( 0x0000ffff & LittleEndian.getShort( _grpprl, int retVal = ( 0x0000ffff &
offset ) ) + 3; LittleEndian.getShort( _grpprl, offset ) ) + 3;
_gOffset += 2; _gOffset += 2;
return retVal; return retVal;
} }