Changed the copyright notices and removed tab characters.

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

22 files changed, 408 insertions, 650 deletions

diff --git a/src/main/javassist/compiler/ast/ASTList.java b/src/main/javassist/compiler/ast/ASTList.java
index 887a528a..9364a32d 100644
--- a/src/main/javassist/compiler/ast/ASTList.java
+++ b/src/main/javassist/compiler/ast/ASTList.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -36,17 +25,17 @@ public class ASTList extends ASTree {
     private ASTList right;
 
     public ASTList(ASTree _head, ASTList _tail) {
-	left = _head;
-	right = _tail;
+        left = _head;
+        right = _tail;
     }
 
     public ASTList(ASTree _head) {
-	left = _head;
-	right = null;
+        left = _head;
+        right = null;
     }
 
     public static ASTList make(ASTree e1, ASTree e2, ASTree e3) {
-	return new ASTList(e1, new ASTList(e2, new ASTList(e3)));
+        return new ASTList(e1, new ASTList(e2, new ASTList(e3)));
     }
 
     public ASTree getLeft() { return left; }
@@ -56,7 +45,7 @@ public class ASTList extends ASTree {
     public void setLeft(ASTree _left) { left = _left; }
 
     public void setRight(ASTree _right) {
-	right = (ASTList)_right;
+        right = (ASTList)_right;
     }
 
     /**
@@ -65,7 +54,7 @@ public class ASTList extends ASTree {
     public ASTree head() { return left; }
 
     public void setHead(ASTree _head) {
-	left = _head;
+        left = _head;
     }
 
     /**
@@ -74,60 +63,60 @@ public class ASTList extends ASTree {
     public ASTList tail() { return right; }
 
     public void setTail(ASTList _tail) {
-	right = _tail;
+        right = _tail;
     }
 
     public void accept(Visitor v) throws CompileError { v.atASTList(this); }
 
     public String toString() {
-	StringBuffer sbuf = new StringBuffer();
-	sbuf.append("(<");
-	sbuf.append(getTag());
-	sbuf.append('>');
-	ASTList list = this;
-	while (list != null) {
-	    sbuf.append(' ');
-	    ASTree a = list.left;
-	    sbuf.append(a == null ? "<null>" : a.toString());
-	    list = list.right;
-	}
-
-	sbuf.append(')');
-	return sbuf.toString();
+        StringBuffer sbuf = new StringBuffer();
+        sbuf.append("(<");
+        sbuf.append(getTag());
+        sbuf.append('>');
+        ASTList list = this;
+        while (list != null) {
+            sbuf.append(' ');
+            ASTree a = list.left;
+            sbuf.append(a == null ? "<null>" : a.toString());
+            list = list.right;
+        }
+
+        sbuf.append(')');
+        return sbuf.toString();
     }
 
     /**
      * Returns the number of the elements in this list.
      */
     public int length() {
-	return length(this);
+        return length(this);
     }
 
     public static int length(ASTList list) {
-	if (list == null)
-	    return 0;
+        if (list == null)
+            return 0;
 
-	int n = 0;
-	while (list != null) {
-	    list = list.right;
-	    ++n;
-	}
+        int n = 0;
+        while (list != null) {
+            list = list.right;
+            ++n;
+        }
 
-	return n;
+        return n;
     }
 
     /**
      * Returns a sub list of the list.  The sub list begins with the
      * n-th element of the list.
      *
-     * @param nth	zero or more than zero.
+     * @param nth       zero or more than zero.
      */
     public ASTList sublist(int nth) {
-	ASTList list = this;
-	while (nth-- > 0)
-	    list = list.right;
+        ASTList list = this;
+        while (nth-- > 0)
+            list = list.right;
 
-	return list;
+        return list;
     }
 
     /**
@@ -135,35 +124,35 @@ public class ASTList extends ASTree {
      * list.
      */
     public boolean subst(ASTree newObj, ASTree oldObj) {
-	for (ASTList list = this; list != null; list = list.right)
-	    if (list.left == oldObj) {
-		list.left = newObj;
-		return true;
-	    }
+        for (ASTList list = this; list != null; list = list.right)
+            if (list.left == oldObj) {
+                list.left = newObj;
+                return true;
+            }
 
-	return false;
+        return false;
     }
 
     /**
      * Appends an object to a list.
      */
     public static ASTList append(ASTList a, ASTree b) {
-	return concat(a, new ASTList(b));
+        return concat(a, new ASTList(b));
     }
 
     /**
      * Concatenates two lists.
      */
     public static ASTList concat(ASTList a, ASTList b) {
-	if (a == null)
-	    return b;
-	else {
-	    ASTList list = a;
-	    while (list.right != null)
-		list = list.right;
-
-	    list.right = b;
-	    return a;
-	}
+        if (a == null)
+            return b;
+        else {
+            ASTList list = a;
+            while (list.right != null)
+                list = list.right;
+
+            list.right = b;
+            return a;
+        }
     }
 }
diff --git a/src/main/javassist/compiler/ast/ASTree.java b/src/main/javassist/compiler/ast/ASTree.java
index 72825142..85ecaf47 100644
--- a/src/main/javassist/compiler/ast/ASTree.java
+++ b/src/main/javassist/compiler/ast/ASTree.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import java.io.Serializable;
@@ -50,11 +39,11 @@ public abstract class ASTree implements Serializable {
     public abstract void accept(Visitor v) throws CompileError;
 
     public String toString() {
-	StringBuffer sbuf = new StringBuffer();
-	sbuf.append('<');
-	sbuf.append(getTag());
-	sbuf.append('>');
-	return sbuf.toString();
+        StringBuffer sbuf = new StringBuffer();
+        sbuf.append('<');
+        sbuf.append(getTag());
+        sbuf.append('>');
+        return sbuf.toString();
     }
 
     /**
@@ -62,7 +51,7 @@ public abstract class ASTree implements Serializable {
      * <code>toString()</code>.
      */
     protected String getTag() {
-	String name = getClass().getName();
-	return name.substring(name.lastIndexOf('.') + 1);
+        String name = getClass().getName();
+        return name.substring(name.lastIndexOf('.') + 1);
     }
 }
diff --git a/src/main/javassist/compiler/ast/AssignExpr.java b/src/main/javassist/compiler/ast/AssignExpr.java
index 0a062d46..ec3e59b7 100644
--- a/src/main/javassist/compiler/ast/AssignExpr.java
+++ b/src/main/javassist/compiler/ast/AssignExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -36,15 +25,15 @@ public class AssignExpr extends Expr {
      */
 
     public AssignExpr(int op, ASTree _head, ASTList _tail) {
-	super(op, _head, _tail);
+        super(op, _head, _tail);
     }
 
     public static AssignExpr makeAssign(int op, ASTree oprand1,
-					ASTree oprand2) {
-	return new AssignExpr(op, oprand1, new ASTList(oprand2));
+                                        ASTree oprand2) {
+        return new AssignExpr(op, oprand1, new ASTList(oprand2));
     }
 
     public void accept(Visitor v) throws CompileError {
-	v.atAssignExpr(this);
+        v.atAssignExpr(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/BinExpr.java b/src/main/javassist/compiler/ast/BinExpr.java
index a8fdeb62..57bac5ef 100644
--- a/src/main/javassist/compiler/ast/BinExpr.java
+++ b/src/main/javassist/compiler/ast/BinExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -37,11 +26,11 @@ public class BinExpr extends Expr {
      */
 
     public BinExpr(int op, ASTree _head, ASTList _tail) {
-	super(op, _head, _tail);
+        super(op, _head, _tail);
     }
 
     public static BinExpr makeBin(int op, ASTree oprand1, ASTree oprand2) {
-	return new BinExpr(op, oprand1, new ASTList(oprand2));
+        return new BinExpr(op, oprand1, new ASTList(oprand2));
     }
 
     public void accept(Visitor v) throws CompileError { v.atBinExpr(this); }
diff --git a/src/main/javassist/compiler/ast/CastExpr.java b/src/main/javassist/compiler/ast/CastExpr.java
index 7f8775cb..62fbc61c 100644
--- a/src/main/javassist/compiler/ast/CastExpr.java
+++ b/src/main/javassist/compiler/ast/CastExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.TokenId;
@@ -36,15 +25,15 @@ public class CastExpr extends ASTList implements TokenId {
     protected int arrayDim;
 
     public CastExpr(ASTList className, int dim, ASTree expr) {
-	super(className, new ASTList(expr));
-	castType = CLASS;
-	arrayDim = dim;
+        super(className, new ASTList(expr));
+        castType = CLASS;
+        arrayDim = dim;
     }
 
     public CastExpr(int type, int dim, ASTree expr) {
-	super(null, new ASTList(expr));
-	castType = type;
-	arrayDim = dim;
+        super(null, new ASTList(expr));
+        castType = type;
+        arrayDim = dim;
     }
 
     /* Returns CLASS, BOOLEAN, INT, or ...
diff --git a/src/main/javassist/compiler/ast/CondExpr.java b/src/main/javassist/compiler/ast/CondExpr.java
index d4a8a108..4451edc6 100644
--- a/src/main/javassist/compiler/ast/CondExpr.java
+++ b/src/main/javassist/compiler/ast/CondExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -32,7 +21,7 @@ import javassist.compiler.CompileError;
  */
 public class CondExpr extends ASTList {
     public CondExpr(ASTree cond, ASTree thenp, ASTree elsep) {
-	super(cond, new ASTList(thenp, new ASTList(elsep)));
+        super(cond, new ASTList(thenp, new ASTList(elsep)));
     }
 
     public ASTree condExpr() { return head(); }
diff --git a/src/main/javassist/compiler/ast/Declarator.java b/src/main/javassist/compiler/ast/Declarator.java
index edeb839d..7361b92e 100644
--- a/src/main/javassist/compiler/ast/Declarator.java
+++ b/src/main/javassist/compiler/ast/Declarator.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.TokenId;
@@ -35,43 +24,43 @@ public class Declarator extends ASTList implements TokenId {
     protected int varType;
     protected int arrayDim;
     protected int localVar;
-    protected String qualifiedClass;	// JVM-internal representation
+    protected String qualifiedClass;    // JVM-internal representation
 
     public Declarator(int type, int dim) {
-	super(null);
-	varType = type;
-	arrayDim = dim;
-	localVar = -1;
-	qualifiedClass = null;
+        super(null);
+        varType = type;
+        arrayDim = dim;
+        localVar = -1;
+        qualifiedClass = null;
     }
 
     public Declarator(ASTList className, int dim) {
-	super(null);
-	varType = CLASS;
-	arrayDim = dim;
-	localVar = -1;
-	qualifiedClass = astToClassName(className, '/');
+        super(null);
+        varType = CLASS;
+        arrayDim = dim;
+        localVar = -1;
+        qualifiedClass = astToClassName(className, '/');
     }
 
     /* For declaring a pre-defined? local variable.
      */
     public Declarator(int type, String jvmClassName, int dim,
-		      int var, Symbol sym) {
-	super(null);
-	varType = type;
-	arrayDim = dim;
-	localVar = var;
-	qualifiedClass = jvmClassName;
-	setLeft(sym);
-	append(this, null);	// initializer
+                      int var, Symbol sym) {
+        super(null);
+        varType = type;
+        arrayDim = dim;
+        localVar = var;
+        qualifiedClass = jvmClassName;
+        setLeft(sym);
+        append(this, null);     // initializer
     }
 
     public Declarator make(Symbol sym, int dim, ASTree init) {
-	Declarator d = new Declarator(this.varType, this.arrayDim + dim);
-	d.qualifiedClass = this.qualifiedClass;
-	d.setLeft(sym);
-	d.append(d, init);
-	return d;
+        Declarator d = new Declarator(this.varType, this.arrayDim + dim);
+        d.qualifiedClass = this.qualifiedClass;
+        d.setLeft(sym);
+        d.append(d, init);
+        return d;
     }
 
     /* Returns CLASS, BOOLEAN, BYTE, CHAR, SHORT, INT, LONG, FLOAT,
@@ -92,11 +81,11 @@ public class Declarator extends ASTList implements TokenId {
     public void setVariable(Symbol sym) { setLeft(sym); }
 
     public ASTree getInitializer() {
-	ASTList t = tail();
-	if (t != null)
-	    return t.head();
-	else
-	    return null;
+        ASTList t = tail();
+        if (t != null)
+            return t.head();
+        else
+            return null;
     }
 
     public void setLocalVar(int n) { localVar = n; }
@@ -106,23 +95,23 @@ public class Declarator extends ASTList implements TokenId {
     public String getTag() { return "decl"; }
 
     public void accept(Visitor v) throws CompileError {
-	v.atDeclarator(this);
+        v.atDeclarator(this);
     }
 
     public static String astToClassName(ASTList name, char sep) {
-	if (name == null)
-	    return null;
+        if (name == null)
+            return null;
 
-	StringBuffer sbuf = new StringBuffer();
-	for (;;) {
-	    sbuf.append(((Symbol)name.head()).get());
-	    name = name.tail();
-	    if (name == null)
-		break;
+        StringBuffer sbuf = new StringBuffer();
+        for (;;) {
+            sbuf.append(((Symbol)name.head()).get());
+            name = name.tail();
+            if (name == null)
+                break;
 
-	    sbuf.append(sep);
-	}
+            sbuf.append(sep);
+        }
 
-	return sbuf.toString();
+        return sbuf.toString();
     }
 }
diff --git a/src/main/javassist/compiler/ast/DoubleConst.java b/src/main/javassist/compiler/ast/DoubleConst.java
index 459f030f..dcd91c58 100644
--- a/src/main/javassist/compiler/ast/DoubleConst.java
+++ b/src/main/javassist/compiler/ast/DoubleConst.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -45,6 +34,6 @@ public class DoubleConst extends ASTree {
     public String toString() { return Double.toString(value); }
 
     public void accept(Visitor v) throws CompileError {
-	v.atDoubleConst(this);
+        v.atDoubleConst(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/Expr.java b/src/main/javassist/compiler/ast/Expr.java
index 1fecc9ce..0e345ef2 100644
--- a/src/main/javassist/compiler/ast/Expr.java
+++ b/src/main/javassist/compiler/ast/Expr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.TokenId;
@@ -41,17 +30,17 @@ public class Expr extends ASTList implements TokenId {
     protected int operatorId;
 
     public Expr(int op, ASTree _head, ASTList _tail) {
-	super(_head, _tail);
-	operatorId = op;
+        super(_head, _tail);
+        operatorId = op;
     }
 
     public Expr(int op, ASTree _head) {
-	super(_head);
-	operatorId = op;
+        super(_head);
+        operatorId = op;
     }
 
     public static Expr make(int op, ASTree oprand1, ASTree oprand2) {
-	return new Expr(op, oprand1, new ASTList(oprand2));
+        return new Expr(op, oprand1, new ASTList(oprand2));
     }
 
     public int getOperator() { return operatorId; }
@@ -63,18 +52,18 @@ public class Expr extends ASTList implements TokenId {
     public void accept(Visitor v) throws CompileError { v.atExpr(this); }
 
     public String getName() {
-	int id = operatorId;
-	if (id < 128)
-	    return String.valueOf((char)id);
-	else if (NEQ <= id && id <= ARSHIFT_E)
-	    return opNames[id - NEQ];
-	else if (id == INSTANCEOF)
-	    return "instanceof";
-	else
-	    return String.valueOf(id);
+        int id = operatorId;
+        if (id < 128)
+            return String.valueOf((char)id);
+        else if (NEQ <= id && id <= ARSHIFT_E)
+            return opNames[id - NEQ];
+        else if (id == INSTANCEOF)
+            return "instanceof";
+        else
+            return String.valueOf(id);
     }
 
     protected String getTag() {
-	return "op:" + getName();
+        return "op:" + getName();
     }
 }
diff --git a/src/main/javassist/compiler/ast/FieldDecl.java b/src/main/javassist/compiler/ast/FieldDecl.java
index d57dd632..481552c0 100644
--- a/src/main/javassist/compiler/ast/FieldDecl.java
+++ b/src/main/javassist/compiler/ast/FieldDecl.java
@@ -1,35 +1,24 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
 
 public class FieldDecl extends ASTList {
     public FieldDecl(ASTree _head, ASTList _tail) {
-	super(_head, _tail);
+        super(_head, _tail);
     }
 
     public ASTList getModifiers() { return (ASTList)getLeft(); }
@@ -39,6 +28,6 @@ public class FieldDecl extends ASTList {
     public ASTree getInit() { return (ASTree)sublist(2).head(); }
 
     public void accept(Visitor v) throws CompileError {
-	v.atFieldDecl(this);
+        v.atFieldDecl(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/InstanceOfExpr.java b/src/main/javassist/compiler/ast/InstanceOfExpr.java
index 03d6bc1f..81195065 100644
--- a/src/main/javassist/compiler/ast/InstanceOfExpr.java
+++ b/src/main/javassist/compiler/ast/InstanceOfExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -32,18 +21,18 @@ import javassist.compiler.CompileError;
  */
 public class InstanceOfExpr extends CastExpr {
     public InstanceOfExpr(ASTList className, int dim, ASTree expr) {
-	super(className, dim, expr);
+        super(className, dim, expr);
     }
 
     public InstanceOfExpr(int type, int dim, ASTree expr) {
-	super(type, dim, expr);
+        super(type, dim, expr);
     }
 
     public String getTag() {
-	return "instanceof:" + castType + ":" + arrayDim;
+        return "instanceof:" + castType + ":" + arrayDim;
     }
 
     public void accept(Visitor v) throws CompileError {
-	v.atInstanceOfExpr(this);
+        v.atInstanceOfExpr(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/IntConst.java b/src/main/javassist/compiler/ast/IntConst.java
index 63ce70cb..12952c56 100644
--- a/src/main/javassist/compiler/ast/IntConst.java
+++ b/src/main/javassist/compiler/ast/IntConst.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -45,6 +34,6 @@ public class IntConst extends ASTree {
     public String toString() { return Long.toString(value); }
 
     public void accept(Visitor v) throws CompileError {
-	v.atIntConst(this);
+        v.atIntConst(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/Keyword.java b/src/main/javassist/compiler/ast/Keyword.java
index 9e1798ec..864a2ce4 100644
--- a/src/main/javassist/compiler/ast/Keyword.java
+++ b/src/main/javassist/compiler/ast/Keyword.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -34,7 +23,7 @@ public class Keyword extends ASTree {
     protected int tokenId;
 
     public Keyword(int token) {
-	tokenId = token;
+        tokenId = token;
     }
 
     public int get() { return tokenId; }
diff --git a/src/main/javassist/compiler/ast/Member.java b/src/main/javassist/compiler/ast/Member.java
index a4825874..fd7e86b9 100644
--- a/src/main/javassist/compiler/ast/Member.java
+++ b/src/main/javassist/compiler/ast/Member.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -32,7 +21,7 @@ import javassist.compiler.CompileError;
  */
 public class Member extends Symbol {
     public Member(String name) {
-	super(name);
+        super(name);
     }
 
     public void accept(Visitor v) throws CompileError { v.atMember(this); }
diff --git a/src/main/javassist/compiler/ast/MethodDecl.java b/src/main/javassist/compiler/ast/MethodDecl.java
index 3c529014..b2e601fe 100644
--- a/src/main/javassist/compiler/ast/MethodDecl.java
+++ b/src/main/javassist/compiler/ast/MethodDecl.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -31,12 +20,12 @@ public class MethodDecl extends ASTList {
     public static final String initName = "<init>";
 
     public MethodDecl(ASTree _head, ASTList _tail) {
-	super(_head, _tail);
+        super(_head, _tail);
     }
 
     public boolean isConstructor() {
-	Symbol sym = getReturn().getVariable();
-	return sym != null && initName.equals(sym.get());
+        Symbol sym = getReturn().getVariable();
+        return sym != null && initName.equals(sym.get());
     }
 
     public ASTList getModifiers() { return (ASTList)getLeft(); }
@@ -50,6 +39,6 @@ public class MethodDecl extends ASTList {
     public Stmnt getBody() { return (Stmnt)sublist(4).head(); }
 
     public void accept(Visitor v) throws CompileError {
-	v.atMethodDecl(this);
+        v.atMethodDecl(this);
     }
 }
diff --git a/src/main/javassist/compiler/ast/NewExpr.java b/src/main/javassist/compiler/ast/NewExpr.java
index 33c721ed..bcb360dc 100644
--- a/src/main/javassist/compiler/ast/NewExpr.java
+++ b/src/main/javassist/compiler/ast/NewExpr.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.TokenId;
@@ -36,27 +25,27 @@ public class NewExpr extends ASTList implements TokenId {
     protected int arrayType;
 
     public NewExpr(ASTList className, ASTList args) {
-	super(className, new ASTList(args));
-	newArray = false;
-	arrayType = CLASS;
+        super(className, new ASTList(args));
+        newArray = false;
+        arrayType = CLASS;
     }
 
     public NewExpr(int type, ASTList arraySize, ASTree init) {
-	super(null, new ASTList(arraySize));
-	newArray = true;
-	arrayType = type;
-	if (init != null)
-	    append(this, init);
+        super(null, new ASTList(arraySize));
+        newArray = true;
+        arrayType = type;
+        if (init != null)
+            append(this, init);
     }
 
     public static NewExpr makeObjectArray(ASTList className,
-					  ASTList arraySize, ASTree init) {
-	NewExpr e = new NewExpr(className, arraySize);
-	e.newArray = true;
-	if (init != null)
-	    append(e, init);
+                                          ASTList arraySize, ASTree init) {
+        NewExpr e = new NewExpr(className, arraySize);
+        e.newArray = true;
+        if (init != null)
+            append(e, init);
 
-	return e;
+        return e;
     }
 
     public boolean isArray() { return newArray; }
@@ -72,16 +61,16 @@ public class NewExpr extends ASTList implements TokenId {
     public ASTList getArraySize() { return getArguments(); }
 
     public ASTree getInitializer() {
-	ASTree t = getRight().getRight();
-	if (t == null)
-	    return null;
-	else
-	    return t.getLeft();
+        ASTree t = getRight().getRight();
+        if (t == null)
+            return null;
+        else
+            return t.getLeft();
     }
 
     public void accept(Visitor v) throws CompileError { v.atNewExpr(this); }
 
     protected String getTag() {
-	return newArray ? "new[]" : "new";
+        return newArray ? "new[]" : "new";
     }
 }
diff --git a/src/main/javassist/compiler/ast/Pair.java b/src/main/javassist/compiler/ast/Pair.java
index 520207a8..7e46fe8b 100644
--- a/src/main/javassist/compiler/ast/Pair.java
+++ b/src/main/javassist/compiler/ast/Pair.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -35,20 +24,20 @@ public class Pair extends ASTree {
     protected ASTree left, right;
 
     public Pair(ASTree _left, ASTree _right) {
-	left = _left;
-	right = _right;
+        left = _left;
+        right = _right;
     }
 
     public void accept(Visitor v) throws CompileError { v.atPair(this); }
 
     public String toString() {
-	StringBuffer sbuf = new StringBuffer();
-	sbuf.append("(<Pair> ");
-	sbuf.append(left == null ? "<null>" : left.toString());
-	sbuf.append(" . ");
-	sbuf.append(right == null ? "<null>" : right.toString());
-	sbuf.append(')');
-	return sbuf.toString();
+        StringBuffer sbuf = new StringBuffer();
+        sbuf.append("(<Pair> ");
+        sbuf.append(left == null ? "<null>" : left.toString());
+        sbuf.append(" . ");
+        sbuf.append(right == null ? "<null>" : right.toString());
+        sbuf.append(')');
+        return sbuf.toString();
     }
 
     public ASTree getLeft() { return left; }
diff --git a/src/main/javassist/compiler/ast/Stmnt.java b/src/main/javassist/compiler/ast/Stmnt.java
index c6b9a97e..b237e659 100644
--- a/src/main/javassist/compiler/ast/Stmnt.java
+++ b/src/main/javassist/compiler/ast/Stmnt.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.TokenId;
@@ -35,25 +24,25 @@ public class Stmnt extends ASTList implements TokenId {
     protected int operatorId;
 
     public Stmnt(int op, ASTree _head, ASTList _tail) {
-	super(_head, _tail);
-	operatorId = op;
+        super(_head, _tail);
+        operatorId = op;
     }
 
     public Stmnt(int op, ASTree _head) {
-	super(_head);
-	operatorId = op;
+        super(_head);
+        operatorId = op;
     }
 
     public Stmnt(int op) {
-	this(op, null);
+        this(op, null);
     }
 
     public static Stmnt make(int op, ASTree oprand1, ASTree oprand2) {
-	return new Stmnt(op, oprand1, new ASTList(oprand2));
+        return new Stmnt(op, oprand1, new ASTList(oprand2));
     }
 
     public static Stmnt make(int op, ASTree op1, ASTree op2, ASTree op3) {
-	return new Stmnt(op, op1, new ASTList(op2, new ASTList(op3)));
+        return new Stmnt(op, op1, new ASTList(op2, new ASTList(op3)));
     }
 
     public void accept(Visitor v) throws CompileError { v.atStmnt(this); }
@@ -61,9 +50,9 @@ public class Stmnt extends ASTList implements TokenId {
     public int getOperator() { return operatorId; }
 
     protected String getTag() {
-	if (operatorId < 128)
-	    return "stmnt:" + (char)operatorId;
-	else
-	    return "stmnt:" + operatorId;
+        if (operatorId < 128)
+            return "stmnt:" + (char)operatorId;
+        else
+            return "stmnt:" + operatorId;
     }
 }
diff --git a/src/main/javassist/compiler/ast/StringL.java b/src/main/javassist/compiler/ast/StringL.java
index 5f173f50..5e99e5f0 100644
--- a/src/main/javassist/compiler/ast/StringL.java
+++ b/src/main/javassist/compiler/ast/StringL.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -34,7 +23,7 @@ public class StringL extends ASTree {
     protected String text;
 
     public StringL(String t) {
-	text = t;
+        text = t;
     }
 
     public String get() { return text; }
diff --git a/src/main/javassist/compiler/ast/Symbol.java b/src/main/javassist/compiler/ast/Symbol.java
index c8e753bf..0d48ab8f 100644
--- a/src/main/javassist/compiler/ast/Symbol.java
+++ b/src/main/javassist/compiler/ast/Symbol.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -34,7 +23,7 @@ public class Symbol extends ASTree {
     protected String identifier;
 
     public Symbol(String sym) {
-	identifier = sym;
+        identifier = sym;
     }
 
     public String get() { return identifier; }
diff --git a/src/main/javassist/compiler/ast/Variable.java b/src/main/javassist/compiler/ast/Variable.java
index 16112a99..63f9bee6 100644
--- a/src/main/javassist/compiler/ast/Variable.java
+++ b/src/main/javassist/compiler/ast/Variable.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
@@ -34,14 +23,14 @@ public class Variable extends Symbol {
     protected Declarator declarator;
 
     public Variable(String sym, Declarator d) {
-	super(sym);
-	declarator = d;
+        super(sym);
+        declarator = d;
     }
 
     public Declarator getDeclarator() { return declarator; }
 
     public String toString() {
-	return identifier + ":" + declarator.getType();
+        return identifier + ":" + declarator.getType();
     }
 
     public void accept(Visitor v) throws CompileError { v.atVariable(this); }
diff --git a/src/main/javassist/compiler/ast/Visitor.java b/src/main/javassist/compiler/ast/Visitor.java
index 685713de..e7b4596c 100644
--- a/src/main/javassist/compiler/ast/Visitor.java
+++ b/src/main/javassist/compiler/ast/Visitor.java
@@ -1,28 +1,17 @@
 /*
- * This file is part of the Javassist toolkit.
+ * Javassist, a Java-bytecode translator toolkit.
+ * Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
  *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * either http://www.mozilla.org/MPL/.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Javassist.
- *
- * The Initial Developer of the Original Code is Shigeru Chiba.  Portions
- * created by Shigeru Chiba are Copyright (C) 1999-2003 Shigeru Chiba.
- * All Rights Reserved.
- *
- * Contributor(s):
- *
- * The development of this software is supported in part by the PRESTO
- * program (Sakigake Kenkyu 21) of Japan Science and Technology Corporation.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  */
-
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;