Author: sebb
Date: Sun Aug 23 21:10:54 2015
New Revision: 1697260
URL: http://svn.apache.org/r1697260
Log:
setGetPosition was a bad idea; use separate get/set methods
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java?rev=1697260&r1=1697259&r2=1697260&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
Sun Aug 23 21:10:54 2015
@@ -245,7 +245,7 @@ public abstract class BranchInstruction
* @return the position
* @since 6.0
*/
- public int getPosition() {
+ protected int getPosition() {
return position;
}
@@ -255,9 +255,8 @@ public abstract class BranchInstruction
* @return the new position
* @since 6.0
*/
- protected int setGetPosition(int position) {
+ protected void setPosition(int position) {
this.position = position;
- return position;
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java?rev=1697260&r1=1697259&r2=1697260&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
Sun Aug 23 21:10:54 2015
@@ -68,7 +68,7 @@ public class GOTO extends GotoInstructio
@Override
protected int updatePosition( int offset, int max_offset ) {
int i = getTargetOffset(); // Depending on old position value
- setGetPosition(getPosition() + offset); // Position may be shifted by
preceding expansions
+ setPosition(getPosition() + offset); // Position may be shifted by
preceding expansions
if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for
short (estimate)
opcode = org.apache.commons.bcel6.Constants.GOTO_W;
short old_length = length;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java?rev=1697260&r1=1697259&r2=1697260&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
Sun Aug 23 21:10:54 2015
@@ -60,7 +60,7 @@ public class JSR extends JsrInstruction
@Override
protected int updatePosition( int offset, int max_offset ) {
int i = getTargetOffset(); // Depending on old position value
- setGetPosition(getPosition() + offset); // Position may be shifted by
preceding expansions
+ setPosition(getPosition() + offset); // Position may be shifted by
preceding expansions
if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for
short (estimate)
opcode = org.apache.commons.bcel6.Constants.JSR_W;
short old_length = length;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1697260&r1=1697259&r2=1697260&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
Sun Aug 23 21:10:54 2015
@@ -89,7 +89,7 @@ public abstract class Select extends Bra
*/
@Override
protected int updatePosition( int offset, int max_offset ) {
- setGetPosition(getPosition() + offset); // Additional offset caused by
preceding SWITCHs, GOTOs, etc.
+ setPosition(getPosition() + offset); // Additional offset caused by
preceding SWITCHs, GOTOs, etc.
short old_length = length;
/* Alignment on 4-byte-boundary, + 1, because of tag byte.
*/
