You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by ha...@apache.org on 2001/11/05 10:54:19 UTC

cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser BCELSQLParser.java BaseBCELParser.java LXSQLParser.java

hammant     01/11/05 01:54:19

  Modified:    apps/db/src/java/org/apache/avalon/db/bcel/parser
                        BCELSQLParser.java BaseBCELParser.java
                        LXSQLParser.java
  Log:
  BCEL debugging messages
  
  Revision  Changes    Path
  1.6       +4 -3      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.java
  
  Index: BCELSQLParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BCELSQLParser.java	2001/11/05 01:01:28	1.5
  +++ BCELSQLParser.java	2001/11/05 09:54:19	1.6
  @@ -45,6 +45,7 @@
   import org.apache.bcel.generic.FieldGen;
   import org.apache.bcel.generic.InstructionList;
   import org.apache.bcel.generic.MethodGen;
  +import org.apache.bcel.generic.InstructionFactory;
   
   import org.apache.bcel.classfile.Field;
   
  @@ -58,7 +59,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class BCELSQLParser extends BaseBCELParser {
   
  @@ -96,6 +97,7 @@
                                      "<SQL Generated>", Constants.ACC_PUBLIC | Constants.ACC_SUPER,
                                      null);
           ConstantPoolGen cp = cg.getConstantPool();
  +        InstructionFactory factory = new InstructionFactory(cg);
           Vector columns = new Vector();
   
           while (st.hasMoreTokens()) {
  @@ -110,8 +112,7 @@
               Column column = new DefaultColumn(fieldName, sqlFieldType, fieldType.toString());
   
               columns.add(column);
  -            createField(cp, cg, fieldType, fieldName);
  -            createSetter(cp, cg, fieldType, fieldName, tableName);
  +            createFieldAndSetter(cp, cg, factory, fieldType, fieldName, tableName);
           }
   
           //TODO need to create constrcutor suitable for superclass.
  
  
  
  1.5       +8 -10     jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BaseBCELParser.java
  
  Index: BaseBCELParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BaseBCELParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseBCELParser.java	2001/11/05 01:01:28	1.4
  +++ BaseBCELParser.java	2001/11/05 09:54:19	1.5
  @@ -46,6 +46,7 @@
   import org.apache.bcel.generic.FieldGen;
   import org.apache.bcel.generic.InstructionList;
   import org.apache.bcel.generic.MethodGen;
  +import org.apache.bcel.generic.InstructionFactory;
   
   import org.apache.bcel.classfile.Field;
   
  @@ -59,7 +60,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public abstract class BaseBCELParser extends AbstractLoggable
           implements Block, SQLParser, Contextualizable, Composable, Configurable {
  @@ -187,29 +188,26 @@
           return Type.VOID;
       }
   
  -    protected void createField(ConstantPoolGen cp, ClassGen cg, Type fieldType, String name) {
  +    protected void createFieldAndSetter(ConstantPoolGen cp, ClassGen cg, InstructionFactory factory, Type fieldType, String name,
  +                              String table) {
  +
  +        InstructionList il = new InstructionList();
   
           System.out.println("fn=" + name);
           System.out.println("Type2=" + fieldType);
  -
           FieldGen fg = new FieldGen(Constants.ACC_PUBLIC, fieldType, name, cp);
   
  -        cg.addField(fg.getField());
  -    }
  -
  -    protected void createSetter(ConstantPoolGen cp, ClassGen cg, Type fieldType, String name,
  -                              String table) {
  -
  -        InstructionList il = new InstructionList();
           MethodGen mg = new MethodGen(Constants.ACC_PUBLIC,    // access flags
                                        Type.VOID,               // return type
                                        new Type[]{ fieldType }, new String[]{ "value" },    // arg names
                                        "set" + name, table,     // method, class
                                        il, cp);
   
  +        il.append(factory.createPrintln("Hello?!"));
           mg.stripAttributes(true);
           mg.setMaxStack();
           mg.setMaxLocals();
  +        cg.addField(fg.getField());
           cg.addMethod(mg.getMethod());
       }
   
  
  
  
  1.10      +4 -3      jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/LXSQLParser.java
  
  Index: LXSQLParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/LXSQLParser.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LXSQLParser.java	2001/11/05 08:06:48	1.9
  +++ LXSQLParser.java	2001/11/05 09:54:19	1.10
  @@ -46,6 +46,7 @@
   import org.apache.bcel.generic.FieldGen;
   import org.apache.bcel.generic.InstructionList;
   import org.apache.bcel.generic.MethodGen;
  +import org.apache.bcel.generic.InstructionFactory;
   
   import org.apache.bcel.classfile.Field;
   import org.w3c.dom.Document;
  @@ -74,7 +75,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class LXSQLParser extends BaseBCELParser {
   
  @@ -151,6 +152,7 @@
                                      "<SQL Generated>", Constants.ACC_PUBLIC | Constants.ACC_SUPER,
                                      null);
               ConstantPoolGen cp = cg.getConstantPool();
  +            InstructionFactory factory = new InstructionFactory(cg);
   
               NodeList subRootNodes = rootElement.getChildNodes();
   
  @@ -168,8 +170,7 @@
                               Column column = new DefaultColumn(fieldName, sqlFieldType, fieldType.toString());
   
                               columns.add(column);
  -                            createField(cp, cg, fieldType, fieldName);
  -                            createSetter(cp, cg, fieldType, fieldName, tableName);
  +                            createFieldAndSetter(cp, cg, factory, fieldType, fieldName, tableName);
                           } else {
                               // TODO  There should be no other element types inside <columns>
                           }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>