From b3dce09331e937b93df249d65a5029a6d6b74cdd Mon Sep 17 00:00:00 2001
From: chiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3>
Date: Mon, 18 Oct 2004 19:01:45 +0000
Subject: [PATCH] Made the constructors in subclasses of Expr protected.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@144 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
---
 src/main/javassist/expr/Cast.java        |  2 +-
 src/main/javassist/expr/Expr.java        | 10 +++++-----
 src/main/javassist/expr/FieldAccess.java |  4 ++--
 src/main/javassist/expr/Handler.java     |  4 ++--
 src/main/javassist/expr/Instanceof.java  |  3 ++-
 src/main/javassist/expr/MethodCall.java  |  3 ++-
 src/main/javassist/expr/NewArray.java    |  4 ++--
 src/main/javassist/expr/NewExpr.java     |  5 ++---
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/javassist/expr/Cast.java b/src/main/javassist/expr/Cast.java
index 160698ff..1c495c08 100644
--- 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 50d25d52..3c99b1fc 100644
--- 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 954c3413..a517443c 100644
--- 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 fddf95e4..bdca0d50 100644
--- 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 2cb9790b..675034d2 100644
--- 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 1e0a842d..eac1fd1d 100644
--- 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 db34cf85..3ad8b460 100644
--- 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 e4c979fe..be33c76d 100644
--- 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;
-- 
2.39.5