diff options
| author | chiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3> | 2012-02-25 13:00:17 +0000 |
|---|---|---|
| committer | chiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3> | 2012-02-25 13:00:17 +0000 |
| commit | 256279fbd282807e2d49fda3c167243b79e833de (patch) | |
| tree | 79af97b0130c88ceac87caf0f7a48c777e518a69 | |
| parent | a8e8b5e785def68b1d643e536459c10db2d79a96 (diff) | |
| download | javassist-256279fbd282807e2d49fda3c167243b79e833de.tar.gz javassist-256279fbd282807e2d49fda3c167243b79e833de.zip | |
fixed JASSIST-156
git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@622 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
| -rw-r--r-- | pom.xml | 65 | ||||
| -rw-r--r-- | src/main/javassist/bytecode/analysis/ControlFlow.java | 2 |
2 files changed, 17 insertions, 50 deletions
@@ -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,61 +230,26 @@ 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> - </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> + <properties> + <toolsjar>${java.home}/../Classes/classes.jar</toolsjar> + </properties> </profile> </profiles> <dependencies> diff --git a/src/main/javassist/bytecode/analysis/ControlFlow.java b/src/main/javassist/bytecode/analysis/ControlFlow.java index 459f666d..38b59130 100644 --- a/src/main/javassist/bytecode/analysis/ControlFlow.java +++ b/src/main/javassist/bytecode/analysis/ControlFlow.java @@ -344,7 +344,7 @@ public class ControlFlow { 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(", "); |