tmiller 02/02/01 12:08:11 Modified: java/src/org/apache/xalan/xsltc/compiler/util NamedMethodGenerator.java NodeCounterGenerator.java NodeSetType.java NodeSortRecordGenerator.java NodeType.java RealType.java ReferenceType.java ResultTreeType.java RtMethodGenerator.java SlotAllocator.java StringType.java TestGenerator.java Util.java LongType.java Log: changed de.fub.bytecode to org.apache.bcel Revision Changes Path 1.2 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java Index: NamedMethodGenerator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NamedMethodGenerator.java 17 Apr 2001 18:52:17 -0000 1.1 +++ NamedMethodGenerator.java 1 Feb 2002 20:08:10 -0000 1.2 @@ -1,5 +1,5 @@ /* - * @(#)$Id: NamedMethodGenerator.java,v 1.1 2001/04/17 18:52:17 sboag Exp $ + * @(#)$Id: NamedMethodGenerator.java,v 1.2 2002/02/01 20:08:10 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,8 +64,8 @@ package org.apache.xalan.xsltc.compiler.util; import java.util.Vector; -import de.fub.bytecode.generic.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.Type; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.Template; 1.3 +2 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java Index: NodeCounterGenerator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NodeCounterGenerator.java 8 Oct 2001 09:22:37 -0000 1.2 +++ NodeCounterGenerator.java 1 Feb 2002 20:08:10 -0000 1.3 @@ -1,5 +1,5 @@ /* - * @(#)$Id: NodeCounterGenerator.java,v 1.2 2001/10/08 09:22:37 morten Exp $ + * @(#)$Id: NodeCounterGenerator.java,v 1.3 2002/02/01 20:08:10 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ package org.apache.xalan.xsltc.compiler.util; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Stylesheet; /** 1.9 +4 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java Index: NodeSetType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- NodeSetType.java 30 Oct 2001 15:35:30 -0000 1.8 +++ NodeSetType.java 1 Feb 2002 20:08:11 -0000 1.9 @@ -1,5 +1,5 @@ /* - * @(#)$Id: NodeSetType.java,v 1.8 2001/10/30 15:35:30 morten Exp $ + * @(#)$Id: NodeSetType.java,v 1.9 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,7 +64,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -84,8 +84,8 @@ return NODE_ITERATOR_SIG; } - public de.fub.bytecode.generic.Type toJCType() { - return new de.fub.bytecode.generic.ObjectType(NODE_ITERATOR); + public org.apache.bcel.generic.Type toJCType() { + return new org.apache.bcel.generic.ObjectType(NODE_ITERATOR); } /** 1.4 +2 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java Index: NodeSortRecordGenerator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NodeSortRecordGenerator.java 17 Aug 2001 13:17:44 -0000 1.3 +++ NodeSortRecordGenerator.java 1 Feb 2002 20:08:11 -0000 1.4 @@ -1,5 +1,5 @@ /* - * @(#)$Id: NodeSortRecordGenerator.java,v 1.3 2001/08/17 13:17:44 morten Exp $ + * @(#)$Id: NodeSortRecordGenerator.java,v 1.4 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -65,7 +65,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.util.*; import org.apache.xalan.xsltc.compiler.Stylesheet; 1.7 +4 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java Index: NodeType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NodeType.java 30 Oct 2001 15:35:30 -0000 1.6 +++ NodeType.java 1 Feb 2002 20:08:11 -0000 1.7 @@ -1,5 +1,5 @@ /* - * @(#)$Id: NodeType.java,v 1.6 2001/10/30 15:35:30 morten Exp $ + * @(#)$Id: NodeType.java,v 1.7 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,7 +64,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.NodeTest; import org.apache.xalan.xsltc.compiler.FlowList; @@ -101,8 +101,8 @@ return "I"; } - public de.fub.bytecode.generic.Type toJCType() { - return de.fub.bytecode.generic.Type.INT; + public org.apache.bcel.generic.Type toJCType() { + return org.apache.bcel.generic.Type.INT; } /** 1.3 +5 -5 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java Index: RealType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RealType.java 30 Oct 2001 15:35:30 -0000 1.2 +++ RealType.java 1 Feb 2002 20:08:11 -0000 1.3 @@ -1,5 +1,5 @@ /* - * @(#)$Id: RealType.java,v 1.2 2001/10/30 15:35:30 morten Exp $ + * @(#)$Id: RealType.java,v 1.3 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,7 +64,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -84,8 +84,8 @@ return "D"; } - public de.fub.bytecode.generic.Type toJCType() { - return de.fub.bytecode.generic.Type.DOUBLE; + public org.apache.bcel.generic.Type toJCType() { + return org.apache.bcel.generic.Type.DOUBLE; } /** @@ -192,7 +192,7 @@ // Store real into a local variable il.append(DUP2); local = methodGen.addLocalVariable("real_to_boolean_tmp", - de.fub.bytecode.generic.Type.DOUBLE, + org.apache.bcel.generic.Type.DOUBLE, il.getEnd(), null); il.append(new DSTORE(local.getIndex())); 1.7 +4 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java Index: ReferenceType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ReferenceType.java 30 Oct 2001 15:35:30 -0000 1.6 +++ ReferenceType.java 1 Feb 2002 20:08:11 -0000 1.7 @@ -1,5 +1,5 @@ /* - * @(#)$Id: ReferenceType.java,v 1.6 2001/10/30 15:35:30 morten Exp $ + * @(#)$Id: ReferenceType.java,v 1.7 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -65,7 +65,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -85,8 +85,8 @@ return "Ljava/lang/Object;"; } - public de.fub.bytecode.generic.Type toJCType() { - return de.fub.bytecode.generic.Type.OBJECT; + public org.apache.bcel.generic.Type toJCType() { + return org.apache.bcel.generic.Type.OBJECT; } /** 1.10 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java Index: ResultTreeType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ResultTreeType.java 11 Dec 2001 13:10:57 -0000 1.9 +++ ResultTreeType.java 1 Feb 2002 20:08:11 -0000 1.10 @@ -1,5 +1,5 @@ /* - * @(#)$Id: ResultTreeType.java,v 1.9 2001/12/11 13:10:57 morten Exp $ + * @(#)$Id: ResultTreeType.java,v 1.10 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -67,7 +67,7 @@ import org.apache.xalan.xsltc.DOM; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -95,7 +95,7 @@ return DOM_INTF_SIG; } - public de.fub.bytecode.generic.Type toJCType() { + public org.apache.bcel.generic.Type toJCType() { return Util.getJCRefType(toSignature()); } 1.2 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java Index: RtMethodGenerator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RtMethodGenerator.java 17 Apr 2001 18:52:20 -0000 1.1 +++ RtMethodGenerator.java 1 Feb 2002 20:08:11 -0000 1.2 @@ -1,5 +1,5 @@ /* - * @(#)$Id: RtMethodGenerator.java,v 1.1 2001/04/17 18:52:20 sboag Exp $ + * @(#)$Id: RtMethodGenerator.java,v 1.2 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,8 +64,8 @@ package org.apache.xalan.xsltc.compiler.util; import java.util.Vector; -import de.fub.bytecode.generic.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.Type; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.Template; 1.3 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java Index: SlotAllocator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SlotAllocator.java 30 Oct 2001 14:57:53 -0000 1.2 +++ SlotAllocator.java 1 Feb 2002 20:08:11 -0000 1.3 @@ -1,5 +1,5 @@ /* - * @(#)$Id: SlotAllocator.java,v 1.2 2001/10/30 14:57:53 morten Exp $ + * @(#)$Id: SlotAllocator.java,v 1.3 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -62,8 +62,8 @@ package org.apache.xalan.xsltc.compiler.util; -import de.fub.bytecode.generic.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.Type; +import org.apache.bcel.generic.*; final class SlotAllocator { 1.5 +4 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java Index: StringType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- StringType.java 21 Nov 2001 13:57:52 -0000 1.4 +++ StringType.java 1 Feb 2002 20:08:11 -0000 1.5 @@ -1,5 +1,5 @@ /* - * @(#)$Id: StringType.java,v 1.4 2001/11/21 13:57:52 morten Exp $ + * @(#)$Id: StringType.java,v 1.5 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,7 +64,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -88,8 +88,8 @@ return true; } - public de.fub.bytecode.generic.Type toJCType() { - return de.fub.bytecode.generic.Type.STRING; + public org.apache.bcel.generic.Type toJCType() { + return org.apache.bcel.generic.Type.STRING; } /** 1.3 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java Index: TestGenerator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestGenerator.java 28 Jun 2001 15:36:39 -0000 1.2 +++ TestGenerator.java 1 Feb 2002 20:08:11 -0000 1.3 @@ -1,5 +1,5 @@ /* - * @(#)$Id: TestGenerator.java,v 1.2 2001/06/28 15:36:39 morten Exp $ + * @(#)$Id: TestGenerator.java,v 1.3 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -64,8 +64,8 @@ package org.apache.xalan.xsltc.compiler.util; -import de.fub.bytecode.generic.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.Type; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Template; public final class TestGenerator extends MethodGenerator { 1.3 +3 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java Index: Util.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Util.java 18 Oct 2001 10:29:08 -0000 1.2 +++ Util.java 1 Feb 2002 20:08:11 -0000 1.3 @@ -1,5 +1,5 @@ /* - * @(#)$Id: Util.java,v 1.2 2001/10/18 10:29:08 morten Exp $ + * @(#)$Id: Util.java,v 1.3 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -63,8 +63,8 @@ package org.apache.xalan.xsltc.compiler.util; -import de.fub.bytecode.generic.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.Type; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; public final class Util { 1.2 +4 -4 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/LongType.java Index: LongType.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/LongType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LongType.java 9 Nov 2001 15:15:19 -0000 1.1 +++ LongType.java 1 Feb 2002 20:08:11 -0000 1.2 @@ -1,5 +1,5 @@ /* - * @(#)$Id: LongType.java,v 1.1 2001/11/09 15:15:19 tmiller Exp $ + * @(#)$Id: LongType.java,v 1.2 2002/02/01 20:08:11 tmiller Exp $ * * The Apache Software License, Version 1.1 * @@ -63,7 +63,7 @@ package org.apache.xalan.xsltc.compiler.util; import org.apache.xalan.xsltc.compiler.util.Type; -import de.fub.bytecode.generic.*; +import org.apache.bcel.generic.*; import org.apache.xalan.xsltc.compiler.Parser; import org.apache.xalan.xsltc.compiler.FlowList; import org.apache.xalan.xsltc.compiler.Constants; @@ -83,8 +83,8 @@ return "J"; } - public de.fub.bytecode.generic.Type toJCType() { - return de.fub.bytecode.generic.Type.LONG; + public org.apache.bcel.generic.Type toJCType() { + return org.apache.bcel.generic.Type.LONG; } /**
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]