Made the constructors in subclasses of Expr protected.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@144 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/src/main/javassist/expr/Cast.java b/src/main/javassist/expr/Cast.java
index 160698fffd921aa75478a502be314788e471978c..1c495c0800c2c1b85bed230c5a723d04f39875fd 100644 (file)
--- a/src/main/javassist/expr/Cast.java
+++ b/src/main/javassist/expr/Cast.java
@@ -27,7 +27,7 @@ public class Cast extends Expr {
     /**
      * Undocumented constructor.  Do not use; internal-use only.
      */
-    Cast(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
+    protected Cast(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
         super(pos, i, declaring, m);
     }
 

diff --git a/src/main/javassist/expr/Expr.java b/src/main/javassist/expr/Expr.java
index 50d25d52dbb0fa06b4f41c3759365b65e00b694a..3c99b1fc7e138a49e9efbf9a2e6a4733ef95dc25 100644 (file)
--- a/src/main/javassist/expr/Expr.java
+++ b/src/main/javassist/expr/Expr.java
@@ -45,20 +45,20 @@ public abstract class Expr implements Opcode {
         thisMethod = m;
     }
 
-    final ConstPool getConstPool() {
+    protected final ConstPool getConstPool() {
         return thisMethod.getConstPool();
     }
 
-    final boolean edited() { return edited; }
+    protected final boolean edited() { return edited; }
 
-    final int locals() { return maxLocals; }
+    protected final int locals() { return maxLocals; }
 
-    final int stack() { return maxStack; }
+    protected final int stack() { return maxStack; }
 
     /**
      * Returns true if this method is static.
      */
-    final boolean withinStatic() {
+    protected final boolean withinStatic() {
         return (thisMethod.getAccessFlags() & AccessFlag.STATIC) != 0;
     }
 

diff --git a/src/main/javassist/expr/FieldAccess.java b/src/main/javassist/expr/FieldAccess.java
index 954c3413439a1ba71a4f4f0f7be98167faa2419f..a517443c51518ce7a28bd7c9cba258701714b27b 100644 (file)
--- a/src/main/javassist/expr/FieldAccess.java
+++ b/src/main/javassist/expr/FieldAccess.java
@@ -26,8 +26,8 @@ import javassist.compiler.ast.ASTList;
 public class FieldAccess extends Expr {
     int opcode;
 
-    FieldAccess(int pos, CodeIterator i, CtClass declaring, MethodInfo m,
-                int op) {
+    protected FieldAccess(int pos, CodeIterator i, CtClass declaring,
+                          MethodInfo m, int op) {
         super(pos, i, declaring, m);
         opcode = op;
     }

diff --git a/src/main/javassist/expr/Handler.java b/src/main/javassist/expr/Handler.java
index fddf95e4b7fc3af94ee6e525fb84816ca11947cb..bdca0d5053aade255bb8b6cb6f9ace3eb9af2792 100644 (file)
--- a/src/main/javassist/expr/Handler.java
+++ b/src/main/javassist/expr/Handler.java
@@ -30,8 +30,8 @@ public class Handler extends Expr {
     /**
      * Undocumented constructor.  Do not use; internal-use only.
      */
-    Handler(ExceptionTable et, int nth,
-            CodeIterator it, CtClass declaring, MethodInfo m) {
+    protected Handler(ExceptionTable et, int nth,
+                      CodeIterator it, CtClass declaring, MethodInfo m) {
         super(et.handlerPc(nth), it, declaring, m);
         etable = et;
         index = nth;

diff --git a/src/main/javassist/expr/Instanceof.java b/src/main/javassist/expr/Instanceof.java
index 2cb9790b701bbc6fc49738ee95b35f6dbe731db1..675034d2e7e235e71df86569f6bf53a81f0bb001 100644 (file)
--- a/src/main/javassist/expr/Instanceof.java
+++ b/src/main/javassist/expr/Instanceof.java
@@ -27,7 +27,8 @@ public class Instanceof extends Expr {
     /**
      * Undocumented constructor.  Do not use; internal-use only.
      */
-    Instanceof(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
+    protected Instanceof(int pos, CodeIterator i, CtClass declaring,
+                         MethodInfo m) {
         super(pos, i, declaring, m);
     }
 

diff --git a/src/main/javassist/expr/MethodCall.java b/src/main/javassist/expr/MethodCall.java
index 1e0a842d33867378bc57423c07f10e09fbf99eac..eac1fd1dd28fff0e988c65cf775d323ae68513e0 100644 (file)
--- a/src/main/javassist/expr/MethodCall.java
+++ b/src/main/javassist/expr/MethodCall.java
@@ -26,7 +26,8 @@ public class MethodCall extends Expr {
     /**
      * Undocumented constructor.  Do not use; internal-use only.
      */
-    MethodCall(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
+    protected MethodCall(int pos, CodeIterator i, CtClass declaring,
+                         MethodInfo m) {
         super(pos, i, declaring, m);
     }
 

diff --git a/src/main/javassist/expr/NewArray.java b/src/main/javassist/expr/NewArray.java
index db34cf8539ed51d7fbb706a5eeaeee1554349cbf..3ad8b4600006ac84c9056f6824445ba535f97bd9 100644 (file)
--- a/src/main/javassist/expr/NewArray.java
+++ b/src/main/javassist/expr/NewArray.java
@@ -29,8 +29,8 @@ import javassist.compiler.ast.ASTList;
 public class NewArray extends Expr {
     int opcode;
 
-    NewArray(int pos, CodeIterator i, CtClass declaring, MethodInfo m,
-             int op) {
+    protected NewArray(int pos, CodeIterator i, CtClass declaring,
+                       MethodInfo m, int op) {
         super(pos, i, declaring, m);
         opcode = op;
     }

diff --git a/src/main/javassist/expr/NewExpr.java b/src/main/javassist/expr/NewExpr.java
index e4c979fe2c36dcb46b8a57a6f584c362ad43bea1..be33c76dc92c3753a8bdc07487b6f96c0a02a8b1 100644 (file)
--- a/src/main/javassist/expr/NewExpr.java
+++ b/src/main/javassist/expr/NewExpr.java
@@ -30,9 +30,8 @@ public class NewExpr extends Expr {
     /**
      * Undocumented constructor.  Do not use; internal-use only.
      */
-    NewExpr(int pos, CodeIterator i, CtClass declaring, MethodInfo m,
-            String type, int np)
-    {
+    protected NewExpr(int pos, CodeIterator i, CtClass declaring,
+                      MethodInfo m, String type, int np) {
         super(pos, i, declaring, m);
         newTypeName = type;
         newPos = np;