svn commit: r1697056 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals: ExecutionVisitor.java Frame.java InstConstraintVisitor.java Pass3bVerifier.java

[se...@apache.org]

Author: sebb
Date: Fri Aug 21 20:39:18 2015
New Revision: 1697056

URL: http://svn.apache.org/r1697056
Log:
Better name (_ not usual in method names)

Modified:
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
    commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java?rev=1697056&r1=1697055&r2=1697056&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java Fri Aug 21 20:39:18 2015
@@ -838,7 +838,7 @@ public class ExecutionVisitor extends Em
     public void visitINVOKESPECIAL(INVOKESPECIAL o){
         if (o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME)){
             UninitializedObjectType t = (UninitializedObjectType) stack().peek(o.getArgumentTypes(cpg).length);
-            if (t == Frame.get_this()){
+            if (t == Frame.getThis()){
                 Frame._this = null;
             }
             stack().initializeObject(t);

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java?rev=1697056&r1=1697055&r2=1697056&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java Fri Aug 21 20:39:18 2015
@@ -125,15 +125,17 @@ public class Frame{
 
     /**
      * @return the _this
+     * @since 6.0
      */
-    public static UninitializedObjectType get_this() {
+    public static UninitializedObjectType getThis() {
         return _this;
     }
 
     /**
      * @param _this the _this to set
+     * @since 6.0
      */
-    public static void set_this(UninitializedObjectType _this) {
+    public static void setThis(UninitializedObjectType _this) {
         Frame._this = _this;
     }
 }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java?rev=1697056&r1=1697055&r2=1697056&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java Fri Aug 21 20:39:18 2015
@@ -2882,7 +2882,7 @@ public class InstConstraintVisitor exten
     @Override
     public void visitRETURN(RETURN o){
         if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){// If we leave an <init> method
-            if ((Frame.get_this() != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) {
+            if ((Frame.getThis() != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) {
                 constraintViolated(o, "Leaving a constructor that itself did not call a constructor.");
             }
         }

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java?rev=1697056&r1=1697055&r2=1697056&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java Fri Aug 21 20:39:18 2015
@@ -350,7 +350,7 @@ public final class Pass3bVerifier extend
                 Frame f = new Frame(mg.getMaxLocals(),mg.getMaxStack());
                 if ( !mg.isStatic() ){
                     if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){
-                        Frame.set_this(new UninitializedObjectType(ObjectType.getInstance(jc.getClassName())));
+                        Frame.setThis(new UninitializedObjectType(ObjectType.getInstance(jc.getClassName())));
                         f.getLocals().set(0, Frame._this);
                     }
                     else{