[jboss-cvs] javassist SVN: r622 - in trunk: src/main/javassist/bytecode/analysis and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: chiba
Date: 2012-02-25 08:00:17 -0500 (Sat, 25 Feb 2012)
New Revision: 622

Modified:
   trunk/pom.xml
   trunk/src/main/javassist/bytecode/analysis/ControlFlow.java
Log:
fixed JASSIST-156

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-02-19 15:39:28 UTC (rev 621)
+++ trunk/pom.xml	2012-02-25 13:00:17 UTC (rev 622)
@@ -123,6 +123,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <source>1.4</source>
           <target>1.4</target>
@@ -131,6 +132,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
         <configuration>
           <archive>
             <manifestFile>${project.build.sourceDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -228,62 +230,27 @@
 	 needed by sample code
 	 -->
     <profile>
-      <id>jdk14</id>
+      <id>default_profile</id>
       <activation>
-        <jdk>1.4</jdk>
-        <property>
-           <name>!no.tools</name>
-        </property>
+        <os>
+          <family>!mac</family>
+        </os>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>1.4</version>
-          <scope>system</scope>
-          <optional>true</optional>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
+      <properties>
+        <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+      </properties>
     </profile>
     <profile>
-      <id>jdk15</id>
+      <id>osx_profile</id>
       <activation>
-        <jdk>1.5</jdk>
-        <property>
-           <name>!no.tools</name>
-        </property>
+        <os>
+          <family>mac</family>
+        </os>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>1.5</version>
-          <scope>system</scope>
-          <optional>true</optional>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
+      <properties>
+        <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
+      </properties>
     </profile>
-    <profile>
-      <id>jdk16</id>
-      <activation>
-        <jdk>1.6</jdk>
-        <property>
-           <name>!no.tools</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>1.6</version>
-          <scope>system</scope>
-          <optional>true</optional>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
-    </profile>
   </profiles>
   <dependencies>
     <dependency>

Modified: trunk/src/main/javassist/bytecode/analysis/ControlFlow.java
===================================================================
--- trunk/src/main/javassist/bytecode/analysis/ControlFlow.java	2012-02-19 15:39:28 UTC (rev 621)
+++ trunk/src/main/javassist/bytecode/analysis/ControlFlow.java	2012-02-25 13:00:17 UTC (rev 622)
@@ -344,7 +344,7 @@
             StringBuffer sbuf = new StringBuffer();
             sbuf.append("Node[pos=").append(block().position());
             sbuf.append(", parent=");
-            sbuf.append(parent == null ? "*" : parent.block().position());
+            sbuf.append(parent == null ? "*" : Integer.toString(parent.block().position()));
             sbuf.append(", children{");
             for (int i = 0; i < children.length; i++)
                 sbuf.append(children[i].block().position()).append(", ");