This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new 0d65a27 Replaced deprecated constants in examples (#38)
0d65a27 is described below
commit 0d65a2718b4171a947388f20b59b4e1ae51d4a74
Author: Arthur Kupriyanov <[email protected]>
AuthorDate: Mon Dec 9 18:26:20 2019 +0300
Replaced deprecated constants in examples (#38)
---
src/examples/HelloWorldBuilder.java | 50 ++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/examples/HelloWorldBuilder.java
b/src/examples/HelloWorldBuilder.java
index 00487c7..627de49 100644
--- a/src/examples/HelloWorldBuilder.java
+++ b/src/examples/HelloWorldBuilder.java
@@ -62,13 +62,13 @@ import org.apache.bcel.generic.Type;
public class HelloWorldBuilder {
public static void main(final String[] argv) {
final ClassGen cg = new ClassGen("HelloWorld", "java.lang.Object",
- "<generated>", Constants.ACC_PUBLIC |
- Constants.ACC_SUPER,
+ "<generated>", Const.ACC_PUBLIC |
+ Const.ACC_SUPER,
null);
final ConstantPoolGen cp = cg.getConstantPool(); // cg creates
constant pool
final InstructionList il = new InstructionList();
- final MethodGen mg = new MethodGen(Constants.ACC_STATIC |
- Constants.ACC_PUBLIC,// access flags
+ final MethodGen mg = new MethodGen(Const.ACC_STATIC |
+ Const.ACC_PUBLIC,// access flags
Type.VOID, // return type
new Type[]{ // argument types
new ArrayType(Type.STRING, 1)
@@ -83,18 +83,18 @@ public class HelloWorldBuilder {
// Create BufferedReader object and store it in local variable `in'.
il.append(factory.createNew("java.io.BufferedReader"));
- il.append(InstructionConstants.DUP); // Use predefined constant, i.e.
flyweight
+ il.append(InstructionConst.DUP); // Use predefined constant, i.e.
flyweight
il.append(factory.createNew("java.io.InputStreamReader"));
- il.append(InstructionConstants.DUP);
- il.append(factory.createFieldAccess("java.lang.System", "in",
i_stream, Constants.GETSTATIC));
+ il.append(InstructionConst.DUP);
+ il.append(factory.createFieldAccess("java.lang.System", "in",
i_stream, Const.GETSTATIC));
// Call constructors, i.e. BufferedReader(InputStreamReader())
il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
Type.VOID, new Type[]{i_stream},
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
il.append(factory.createInvoke("java.io.BufferedReader", "<init>",
Type.VOID,
new Type[]{new ObjectType("java.io.Reader")},
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
// Create local variable `in'
LocalVariableGen lg = mg.addLocalVariable("in", new
ObjectType("java.io.BufferedReader"), null, null);
@@ -104,19 +104,19 @@ public class HelloWorldBuilder {
// Create local variable `name'
lg = mg.addLocalVariable("name", Type.STRING, null, null);
final int name = lg.getIndex();
- il.append(InstructionConstants.ACONST_NULL);
+ il.append(InstructionConst.ACONST_NULL);
lg.setStart(il.append(new ASTORE(name))); // `name' valid from here
// try { ...
final InstructionHandle try_start =
- il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Constants.GETSTATIC));
+ il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Const.GETSTATIC));
il.append(new PUSH(cp, "Please enter your name> "));
il.append(factory.createInvoke("java.io.PrintStream", "print",
Type.VOID,
- new Type[]{Type.STRING}, Constants.INVOKEVIRTUAL));
+ new Type[]{Type.STRING}, Const.INVOKEVIRTUAL));
il.append(new ALOAD(in));
il.append(factory.createInvoke("java.io.BufferedReader", "readLine",
- Type.STRING, Type.NO_ARGS, Constants.INVOKEVIRTUAL));
+ Type.STRING, Type.NO_ARGS, Const.INVOKEVIRTUAL));
il.append(new ASTORE(name));
// Upon normal execution we jump behind exception handler, the target
address is not known yet.
@@ -127,41 +127,41 @@ public class HelloWorldBuilder {
* Add exception handler: print exception and return from method
*/
final InstructionHandle handler =
- il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Constants.GETSTATIC));
+ il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Const.GETSTATIC));
// Little trick in order not to save exception object temporarily
- il.append(InstructionConstants.SWAP);
+ il.append(InstructionConst.SWAP);
- il.append(factory.createInvoke("java.io.PrintStream", "println",
Type.VOID, new Type[]{Type.OBJECT}, Constants.INVOKEVIRTUAL));
- il.append(InstructionConstants.RETURN);
+ il.append(factory.createInvoke("java.io.PrintStream", "println",
Type.VOID, new Type[]{Type.OBJECT}, Const.INVOKEVIRTUAL));
+ il.append(InstructionConst.RETURN);
mg.addExceptionHandler(try_start, try_end, handler, new
ObjectType("java.io.IOException"));
// Normal code continues, now we can set the branch target of the GOTO
that jumps over the handler code.
final InstructionHandle ih =
- il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Constants.GETSTATIC));
+ il.append(factory.createFieldAccess("java.lang.System", "out",
p_stream, Const.GETSTATIC));
g.setTarget(ih);
// String concatenation compiles to StringBuffer operations.
il.append(factory.createNew(Type.STRINGBUFFER));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(new PUSH(cp, "Hello, "));
il.append(factory.createInvoke("java.lang.StringBuffer", "<init>",
Type.VOID, new Type[]{Type.STRING},
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
il.append(new ALOAD(name));
// Concatenate strings using a StringBuffer and print them.
il.append(factory.createInvoke("java.lang.StringBuffer", "append",
Type.STRINGBUFFER, new Type[]{Type.STRING},
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(factory.createInvoke("java.lang.StringBuffer", "toString",
Type.STRING, Type.NO_ARGS,
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(factory.createInvoke("java.io.PrintStream", "println",
Type.VOID, new Type[]{Type.STRING},
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
- il.append(InstructionConstants.RETURN);
+ il.append(InstructionConst.RETURN);
mg.setMaxStack(5); // Needed stack size
cg.addMethod(mg.getMethod());
@@ -169,7 +169,7 @@ public class HelloWorldBuilder {
il.dispose(); // Reuse instruction handles
// Add public <init> method, i.e. empty constructor
- cg.addEmptyConstructor(Constants.ACC_PUBLIC);
+ cg.addEmptyConstructor(Const.ACC_PUBLIC);
// Get JavaClass object and dump it to file.
try {
