changed delimiters, etc.

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

diff --git a/build.xml b/build.xml
index 004bb513d06e63008ff18359cb4c05c9cec793b6..4068a7ce39347d385c5d73db952d30b21004426d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,177 +1,177 @@
-<?xml version="1.0"?>\r
-\r
-<!-- =================================================================== -->\r
-<!-- JBoss build file                                                    -->\r
-<!-- =================================================================== -->\r
-\r
-<project name="javassist" default="jar" basedir=".">\r
-\r
-  <property name="dist-version" value="javassist-2.7"/>\r
-\r
-  <property environment="env"/>\r
-  <property name="target.jar" value="javassist.jar"/>\r
-  <property name="src.dir" value="${basedir}/src/main"/>\r
-  <property name="build.dir" value="${basedir}/build"/>\r
-  <property name="build.classes.dir" value="${build.dir}/classes"/>\r
-\r
-  <property name="run.dir" value="${build.classes.dir}"/>\r
-\r
-  <!-- Build classpath -->\r
-  <path id="classpath">\r
-    <pathelement location="${build.classes.dir}"/>\r
-  </path>\r
-\r
-  <property name="build.classpath" refid="classpath"/>\r
-\r
-  <!-- =================================================================== -->\r
-  <!-- Prepares the build directory                                        -->\r
-  <!-- =================================================================== -->\r
-  <target name="prepare" >\r
-    <mkdir dir="${build.dir}"/>\r
-    <mkdir dir="${build.classes.dir}"/>\r
-  </target>\r
-\r
-  <!-- =================================================================== -->\r
-  <!-- Compiles the source code                                            -->\r
-  <!-- =================================================================== -->\r
-  <target name="compile" depends="prepare">\r
-    <javac srcdir="${src.dir}"\r
-           destdir="${build.classes.dir}"\r
-           debug="on"\r
-           deprecation="on"\r
-           optimize="off"\r
-           includes="**">\r
-            <classpath refid="classpath"/>\r
-    </javac>\r
-  </target>\r
-\r
-  <target name="sample" depends="compile">\r
-    <javac srcdir="${basedir}"\r
-           destdir="${build.classes.dir}"\r
-           debug="on"\r
-           deprecation="on"\r
-           optimize="off"\r
-           includes="sample/**">\r
-            <classpath refid="classpath"/>\r
-    </javac>\r
-    <copy file="sample/vector/Test.j"\r
-          todir="${build.classes.dir}/sample/vector"/>\r
-    <copy todir="${build.classes.dir}/sample/evolve">\r
-      <fileset dir="sample/evolve"/>\r
-    </copy>\r
-    <echo>To run the sample programs, change the current directory \r
-to ${build.classes.dir}.</echo>\r
-  </target>\r
-\r
-  <target name="jar" depends="compile">\r
-    <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">\r
-      <fileset dir="${build.classes.dir}">\r
-         <include name="**/*.class"/>\r
-      </fileset>\r
-     </jar>\r
-  </target>\r
-\r
-  <target name="javadocs">\r
-    <javadoc packagenames="javassist.*"\r
-           excludepackagenames="javassist.compiler.*,javassist.convert.*"\r
-           sourcepath="src/main"\r
-           defaultexcludes="yes"\r
-           destdir="html"\r
-           author="true"\r
-           version="true"\r
-           use="true"\r
-           Locale="en_US"\r
-           charset="iso-8859-1"\r
-           Public="true"\r
-           nohelp="true"\r
-           windowtitle="Javassist API">\r
-      <doctitle><![CDATA[<h1>Javassist</h1>]]></doctitle>\r
-      <bottom><![CDATA[<i>Javassist, a Java-bytecode translator toolkit. \r
-Copyright (C) 1999-2004 Shigeru Chiba. All Rights Reserved.</i>]]></bottom>\r
-    </javadoc>\r
-  </target>\r
-\r
-  <target name="dist" depends="jar,javadocs">\r
-    <delete file="${dist-version}.zip"/>\r
-    <zip zipfile="${dist-version}.zip">\r
-       <zipfileset dir="${basedir}" prefix="${dist-version}">\r
-          <include name="**"/>\r
-          <exclude name="build/**"/>\r
-          <exclude name="local/**"/>\r
-          <exclude name="${dist-version}.zip"/>\r
-       </zipfileset>\r
-    </zip>\r
-  </target>\r
-\r
-  <target name="clean">\r
-    <delete dir="build"/>\r
-    <delete dir="html"/>\r
-    <delete file="${target.jar}"/>\r
-    <delete file="${dist-version}.zip"/>\r
-  </target>\r
-\r
-  <!-- =================================================================== -->\r
-  <!-- Run samples                                                         -->\r
-  <!-- =================================================================== -->\r
-\r
-  <target name = "sample-all"\r
-          depends="sample-test,sample-reflect,sample-duplicate,sample-vector">\r
-    <echo>** please run sample-rmi and sample-evolve separately **</echo>\r
-  </target>\r
-\r
-  <target name = "sample-test" depends="sample" >\r
-    <java fork="true" dir="${run.dir}" classname="sample.Test">\r
-      <classpath refid="classpath"/>\r
-    </java>\r
-  </target>\r
-\r
-  <target name = "sample-reflect" depends="sample" >\r
-    <java fork="true" dir="${run.dir}" classname="javassist.reflect.Loader">\r
-      <classpath refid="classpath"/>\r
-      <arg line="sample.reflect.Main Joe" />\r
-    </java>\r
-  </target>\r
-\r
-  <target name = "sample-duplicate" depends="sample" >\r
-    <echo>run sample.duplicate.Viewer without reflection</echo>\r
-    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Viewer">\r
-      <classpath refid="classpath"/>\r
-    </java>\r
-    <echo>run sample.duplicate.Viewer with reflection</echo>\r
-    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Main">\r
-      <classpath refid="classpath"/>\r
-    </java>\r
-  </target>\r
-\r
-  <target name = "sample-vector" depends="sample" >\r
-    <echo>javassist.preproc.Compiler sample/vector/Test.j</echo>\r
-    <java fork="true" dir="${run.dir}" classname="javassist.preproc.Compiler">\r
-      <classpath refid="classpath"/>\r
-      <arg line="sample/vector/Test.j"/>\r
-    </java>\r
-    <echo>javac sample/vector/Test.java</echo>\r
-    <javac srcdir="${build.classes.dir}"\r
-           destdir="${build.classes.dir}"\r
-           includes="sample/vector/Test.java">\r
-            <classpath refid="classpath"/>\r
-    </javac>\r
-    <java fork="true" dir="${run.dir}" classname="sample.vector.Test" />\r
-  </target>\r
-\r
-  <target name = "sample-rmi" depends="sample" >\r
-    <echo>** Please open sample/rmi/webdemo.html with your browser **</echo>\r
-    <java fork="true" dir="${run.dir}" classname="sample.rmi.Counter">\r
-      <classpath refid="classpath"/>\r
-      <arg value="5001" />\r
-    </java>\r
-  </target>\r
-\r
-  <target name = "sample-evolve" depends="sample" >\r
-    <echo>** Please open http://localhost:5003/demo.html with your browser **</echo>\r
-    <java fork="true" dir="${run.dir}" classname="sample.evolve.DemoLoader">\r
-      <classpath refid="classpath"/>\r
-      <arg value="5003" />\r
-    </java>\r
-  </target>\r
-\r
-</project>\r
+<?xml version="1.0"?>
+
+<!-- =================================================================== -->
+<!-- JBoss build file                                                    -->
+<!-- =================================================================== -->
+
+<project name="javassist" default="jar" basedir=".">
+
+  <property name="dist-version" value="javassist-2.7"/>
+
+  <property environment="env"/>
+  <property name="target.jar" value="javassist.jar"/>
+  <property name="src.dir" value="${basedir}/src/main"/>
+  <property name="build.dir" value="${basedir}/build"/>
+  <property name="build.classes.dir" value="${build.dir}/classes"/>
+
+  <property name="run.dir" value="${build.classes.dir}"/>
+
+  <!-- Build classpath -->
+  <path id="classpath">
+    <pathelement location="${build.classes.dir}"/>
+  </path>
+
+  <property name="build.classpath" refid="classpath"/>
+
+  <!-- =================================================================== -->
+  <!-- Prepares the build directory                                        -->
+  <!-- =================================================================== -->
+  <target name="prepare" >
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${build.classes.dir}"/>
+  </target>
+
+  <!-- =================================================================== -->
+  <!-- Compiles the source code                                            -->
+  <!-- =================================================================== -->
+  <target name="compile" depends="prepare">
+    <javac srcdir="${src.dir}"
+           destdir="${build.classes.dir}"
+           debug="on"
+           deprecation="on"
+           optimize="off"
+           includes="**">
+            <classpath refid="classpath"/>
+    </javac>
+  </target>
+
+  <target name="sample" depends="compile">
+    <javac srcdir="${basedir}"
+           destdir="${build.classes.dir}"
+           debug="on"
+           deprecation="on"
+           optimize="off"
+           includes="sample/**">
+            <classpath refid="classpath"/>
+    </javac>
+    <copy file="sample/vector/Test.j"
+          todir="${build.classes.dir}/sample/vector"/>
+    <copy todir="${build.classes.dir}/sample/evolve">
+      <fileset dir="sample/evolve"/>
+    </copy>
+    <echo>To run the sample programs, change the current directory 
+to ${build.classes.dir}.</echo>
+  </target>
+
+  <target name="jar" depends="compile">
+    <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
+      <fileset dir="${build.classes.dir}">
+         <include name="**/*.class"/>
+      </fileset>
+     </jar>
+  </target>
+
+  <target name="javadocs">
+    <javadoc packagenames="javassist.*"
+           excludepackagenames="javassist.compiler.*,javassist.convert.*"
+           sourcepath="src/main"
+           defaultexcludes="yes"
+           destdir="html"
+           author="true"
+           version="true"
+           use="true"
+           Locale="en_US"
+           charset="iso-8859-1"
+           Public="true"
+           nohelp="true"
+           windowtitle="Javassist API">
+      <doctitle><![CDATA[<h1>Javassist</h1>]]></doctitle>
+      <bottom><![CDATA[<i>Javassist, a Java-bytecode translator toolkit. 
+Copyright (C) 1999-2004 Shigeru Chiba. All Rights Reserved.</i>]]></bottom>
+    </javadoc>
+  </target>
+
+  <target name="dist" depends="jar,javadocs">
+    <delete file="${dist-version}.zip"/>
+    <zip zipfile="${dist-version}.zip">
+       <zipfileset dir="${basedir}" prefix="${dist-version}">
+          <include name="**"/>
+          <exclude name="build/**"/>
+          <exclude name="local/**"/>
+          <exclude name="${dist-version}.zip"/>
+       </zipfileset>
+    </zip>
+  </target>
+
+  <target name="clean">
+    <delete dir="build"/>
+    <delete dir="html"/>
+    <delete file="${target.jar}"/>
+    <delete file="${dist-version}.zip"/>
+  </target>
+
+  <!-- =================================================================== -->
+  <!-- Run samples                                                         -->
+  <!-- =================================================================== -->
+
+  <target name = "sample-all"
+          depends="sample-test,sample-reflect,sample-duplicate,sample-vector">
+    <echo>** please run sample-rmi and sample-evolve separately **</echo>
+  </target>
+
+  <target name = "sample-test" depends="sample" >
+    <java fork="true" dir="${run.dir}" classname="sample.Test">
+      <classpath refid="classpath"/>
+    </java>
+  </target>
+
+  <target name = "sample-reflect" depends="sample" >
+    <java fork="true" dir="${run.dir}" classname="javassist.reflect.Loader">
+      <classpath refid="classpath"/>
+      <arg line="sample.reflect.Main Joe" />
+    </java>
+  </target>
+
+  <target name = "sample-duplicate" depends="sample" >
+    <echo>run sample.duplicate.Viewer without reflection</echo>
+    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Viewer">
+      <classpath refid="classpath"/>
+    </java>
+    <echo>run sample.duplicate.Viewer with reflection</echo>
+    <java fork="true" dir="${run.dir}" classname="sample.duplicate.Main">
+      <classpath refid="classpath"/>
+    </java>
+  </target>
+
+  <target name = "sample-vector" depends="sample" >
+    <echo>javassist.preproc.Compiler sample/vector/Test.j</echo>
+    <java fork="true" dir="${run.dir}" classname="javassist.preproc.Compiler">
+      <classpath refid="classpath"/>
+      <arg line="sample/vector/Test.j"/>
+    </java>
+    <echo>javac sample/vector/Test.java</echo>
+    <javac srcdir="${build.classes.dir}"
+           destdir="${build.classes.dir}"
+           includes="sample/vector/Test.java">
+            <classpath refid="classpath"/>
+    </javac>
+    <java fork="true" dir="${run.dir}" classname="sample.vector.Test" />
+  </target>
+
+  <target name = "sample-rmi" depends="sample" >
+    <echo>** Please open sample/rmi/webdemo.html with your browser **</echo>
+    <java fork="true" dir="${run.dir}" classname="sample.rmi.Counter">
+      <classpath refid="classpath"/>
+      <arg value="5001" />
+    </java>
+  </target>
+
+  <target name = "sample-evolve" depends="sample" >
+    <echo>** Please open http://localhost:5003/demo.html with your browser **</echo>
+    <java fork="true" dir="${run.dir}" classname="sample.evolve.DemoLoader">
+      <classpath refid="classpath"/>
+      <arg value="5003" />
+    </java>
+  </target>
+
+</project>

diff --git a/src/main/javassist/ClassPool.java b/src/main/javassist/ClassPool.java
index e19915afc720dfa148bb1e12c2eeb093b56531f0..e6c756139bb130291ce9f1641bd1978ddc54542e 100644 (file)
--- a/src/main/javassist/ClassPool.java
+++ b/src/main/javassist/ClassPool.java
@@ -28,9 +28,6 @@ import java.util.Hashtable;
  * from various
  * sources represented by <code>ClassPath</code> and create
  * <code>CtClass</code> objects representing those class files.
- * The source may be another <code>ClassPool</code>.  If so,
- * <code>write()</code> is called on the source <code>ClassPool</code>
- * for obtaining a class file.
  *
  * <p>A <code>CtClass</code>
  * object contained in a <code>ClassPool</code> is written to an
@@ -63,7 +60,8 @@ import java.util.Hashtable;
  * <p>The users can add a listener object receiving an event from a
  * <code>ClassPool</code>.  An event occurs when a listener is
  * added to a <code>ClassPool</code> and when <code>write()</code>
- * is called on a <code>ClassPool</code>.  The listener class
+ * is called on a <code>ClassPool</code> (not when <code>get()</code>
+ * is called!).  The listener class
  * must implement <code>Translator</code>.  A typical listener object
  * is used for modifying a <code>CtClass</code> object <i>on demand</i>
  * when it is written to an output stream.