fixed some typo

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/plugins/trunk@389 acee48c3-7b26-0410-bdac-b3d0e5314bbc

diff --git a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkElementBuilder.java b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkElementBuilder.java
index 9f68998..8a6c598 100644 (file)
--- a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkElementBuilder.java
+++ b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkElementBuilder.java
@@ -16,6 +16,6 @@ import jp.sourceforge.stigmata.BirthmarkElement;
  * @version $Revision$
  */
 public interface BirthmarkElementBuilder {
-    public BirthmarkElement[] buildBirthmarkElements(List<Opcode> opcodes, BirthmarkContext context);
+    public BirthmarkElement[] buildElements(List<Opcode> opcodes, BirthmarkContext context);
 }
 

diff --git a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/Opcode.java b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/Opcode.java
index f879c38..6aa6bff 100644 (file)
--- a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/Opcode.java
+++ b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/Opcode.java
@@ -13,7 +13,7 @@ import java.util.List;
 import org.objectweb.asm.Label;
 
 /**
- * 
+ *
  * @author Haruaki Tamada
  * @version $Revision$
  */
@@ -27,7 +27,6 @@ public class Opcode implements Serializable{
     private String name;
     private int argumentCount;
     private int act;
-    private int weight;
     private Category category;
     private List<Label> labels = new ArrayList<Label>();
 
@@ -47,11 +46,6 @@ public class Opcode implements Serializable{
         this.category = category;
     }
 
-    Opcode(int opcode, String name, int argumentCount, int act, Category category, int weight){
-        this(opcode, name, argumentCount, act, category);
-        setWeight(weight);
-    }
-
     public int getOpcode(){
         return opcode;
     }
@@ -113,15 +107,7 @@ public class Opcode implements Serializable{
         return category;
     }
 
-    public void setWeight(int weight){
-        this.weight = weight;
-    }
-
-    public int getWeight(){
-        return weight;
-    }
-
     public String toString(){
-        return String.format("%d:%s:%d:%f(%s)", getOpcode(), getName(), getAct(), getWeight(), getCategory());
+        return String.format("%d:%s:%f(%s)", getOpcode(), getName(), getAct(), getCategory());
     }
 }

diff --git a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractMethodVisitor.java b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractMethodVisitor.java
index b138d6a..6f5cc28 100644 (file)
--- a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractMethodVisitor.java
+++ b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractMethodVisitor.java
@@ -14,9 +14,9 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 /**
- * 
+ *
  * @author Haruaki TAMADA
- * @version $Revision$ 
+ * @version $Revision$
  */
 public class OpcodeExtractMethodVisitor extends MethodAdapter{
     private List<Opcode> opcodes;
@@ -32,11 +32,11 @@ public class OpcodeExtractMethodVisitor extends MethodAdapter{
         this.opcodes = opcodes;
     }
 
-    public void addOpcodeExtractListener(OpcodeExtractionFinishListener listener){
+    public void addOpcodeExtractListener(OpcodeExtractListener listener){
         listeners.add(listener);
     }
 
-    public void removeOpcodeExtractListener(OpcodeExtractionFinishListener listener){
+    public void removeOpcodeExtractListener(OpcodeExtractListener listener){
         listeners.add(listener);
     }
 
@@ -116,7 +116,7 @@ public class OpcodeExtractMethodVisitor extends MethodAdapter{
         Opcode lookupSwitch = new Opcode(manager.getOpcode(Opcodes.LOOKUPSWITCH));
         lookupSwitch.setLabels(labels);
         lookupSwitch.addLabel(defaultHandle);
-        
+
         opcodes.add(lookupSwitch);
         super.visitLookupSwitchInsn(defaultHandle, keys, labels);
     }
@@ -164,8 +164,8 @@ public class OpcodeExtractMethodVisitor extends MethodAdapter{
 
     @Override
     public void visitEnd(){
-        for(OpcodeExtractionFinishListener listener: listeners){
-            listener.extractionOpcodesFinished(opcodes);
+        for(OpcodeExtractListener listener: listeners){
+            listener.extractOpcodesFinished(opcodes);
         }
     }
 }

diff --git a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractVisitor.java b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractVisitor.java
index 26cf87f..7d7a272 100644 (file)
--- a/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractVisitor.java
+++ b/opcodes/src/main/java/jp/sourceforge/stigmata/birthmarks/OpcodeExtractVisitor.java
@@ -10,7 +10,6 @@ import java.util.List;
 import jp.sourceforge.stigmata.Birthmark;
 import jp.sourceforge.stigmata.BirthmarkContext;
 import jp.sourceforge.stigmata.BirthmarkElement;
-import jp.sourceforge.stigmata.birthmarks.BirthmarkExtractVisitor;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
@@ -31,7 +30,7 @@ public class OpcodeExtractVisitor extends BirthmarkExtractVisitor{
     }
 
     public void visitEnd(){
-        BirthmarkElement[] elements = builder.buildBirthmarkElements(opcodeList, getContext());
+        BirthmarkElement[] elements = builder.buildElements(opcodeList, getContext());
         for(BirthmarkElement element: elements){
             addElement(element);
         }