opcodes を cflib に変更したことにともなう変更．

diff --git a/wsp/pom.xml b/wsp/pom.xml
index 72ce525..81b9bbd 100644 (file)
--- a/wsp/pom.xml
+++ b/wsp/pom.xml
@@ -25,6 +25,12 @@
       <version>3.1</version>\r
       <scope>compile</scope>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>jp.sourceforge.stigmata.plugins</groupId>\r
+      <artifactId>cflib</artifactId>\r
+      <version>1.0.0</version>\r
+      <scope>compile</scope>\r
+    </dependency>\r
   </dependencies>\r
 \r
   <build>\r
@@ -55,4 +61,4 @@
       </plugin>\r
     </plugins>\r
   </build>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java b/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
index 68cfeb9..db88032 100644 (file)
--- a/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
+++ b/wsp/src/main/java/jp/sourceforge/stigmata/birthmarks/wsp/StackPatternBasedBirthmarkExtractor.java
@@ -6,7 +6,6 @@ package jp.sourceforge.stigmata.birthmarks.wsp;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -89,8 +88,7 @@ public class StackPatternBasedBirthmarkExtractor extends ASMBirthmarkExtractor{
 
                     pattern.add(new CurrentDepth(currentDepth, wspOpcode));
                     if(opcode.getCategory() == Opcode.Category.BRANCH){
-                        for(Iterator<Label> i = opcode.labels(); i.hasNext(); ){
-                            Label label = i.next();
+                        for(Label label: opcode.getLabels()){
                             tableMap.put(label, currentDepth);
                         }
                     }