re

Author: codingforkind

mirror-common/src/main/java/cn/com/mirror/analyser/visitor/ControlEdgeVisitor.java

@@ -2,7 +2,7 @@
 
 import cn.com.mirror.constant.ControlNodeTypeEnum;
 import cn.com.mirror.project.pair.Vertex;
-import cn.com.mirror.project.pair.VertexTypeEnum;
+import cn.com.mirror.constant.VertexTypeEnum;
 import cn.com.mirror.utils.AstUtils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

mirror-common/src/main/java/cn/com/mirror/constant/EdgeType.java

@@ -9,22 +9,24 @@
  */
 @Getter
 public enum EdgeType {
-    CTRL_EDGE("1", "control dependence"),
-    STAT_TO_MTD("2", "statements to method control edge"),
-    MTD_TO_CLS("3", "method to class control edge"),
-    DATA_EDGE("99", "simple date dependence");
+    CTRL_EDGE(1, "control dependence"),
+    STAT_TO_MTD(2, "statements to method control edge"),
+    FID_TO_CLS(3, "field variable to class control edge"),
+    MTD_TO_CLS(4, "method to class control edge"),
+    DATA_EDGE(99, "simple date dependence");
 
-    private String key;
+    private Integer key;
     private String desc;
 
-    private EdgeType(String key, String desc) {
+    EdgeType(Integer key, String desc) {
         this.key = key;
         this.desc = desc;
     }
 
     public interface TYPE {
         String CTRL_EDGE = "CTRL_EDGE";
         String STAT_TO_MTD = "STAT_TO_MTD";
+        String FID_TO_CLS = "FID_TO_CLS";
         String MTD_TO_CLS = "MTD_TO_CLS";
         String DATA_EDGE = "DATA_EDGE";
     }

mirror-common/src/main/java/cn/com/mirror/constant/NodeTypeEnum.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package cn.com.mirror.constant;
 
@@ -8,30 +8,29 @@
 
 /**
  * @author Piggy
- *
  * @description
  * @date 2018年4月27日
  */
 @Getter
 public enum NodeTypeEnum {
-	PACKAGE("PACKAGE"), 
-	CLASS("CLASS"), 
-	METHOD("METHOD"), 
-	STATEMENT("STATEMENT");
+    PACKAGE("PACKAGE"),
+    CLASS("CLASS"),
+    METHOD("METHOD"),
+    STATEMENT("STATEMENT");
 
-	private NodeTypeEnum(String key) {
-		this.key = key;
-	}
+    private String key;
 
-	private String key;
+    private NodeTypeEnum(String key) {
+        this.key = key;
+    }
 
-	public static NodeTypeEnum getNodeTypeEnum(String key) {
-		for (NodeTypeEnum nodeTypeEnum : NodeTypeEnum.values()) {
-			if (nodeTypeEnum.getKey().equals(key)) {
-				return nodeTypeEnum;
-			}
-		}
-		throw new ConstantException("No node type match!");
-	}
+    public static NodeTypeEnum getNodeTypeEnum(String key) {
+        for (NodeTypeEnum nodeTypeEnum : NodeTypeEnum.values()) {
+            if (nodeTypeEnum.getKey().equals(key)) {
+                return nodeTypeEnum;
+            }
+        }
+        throw new ConstantException("No node type match!");
+    }
 
 }

mirror-common/src/main/java/cn/com/mirror/project/pair/VertexTypeEnum.java renamed to mirror-common/src/main/java/cn/com/mirror/constant/VertexTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.com.mirror.project.pair;
+package cn.com.mirror.constant;
 
 import lombok.Getter;
 

mirror-common/src/main/java/cn/com/mirror/exceptions/AnalysisException.java

@@ -1,10 +1,13 @@
 package cn.com.mirror.exceptions;
 
-public class AnalysisException extends RuntimeException{
-	private static final long serialVersionUID = 1L;
-	
-	public AnalysisException(String exception) {
-		super(exception);
-	}
+public class AnalysisException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
 
+    public AnalysisException(String message) {
+        super(message);
+    }
+
+    public AnalysisException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }

mirror-common/src/main/java/cn/com/mirror/exceptions/ConstantException.java

@@ -1,19 +1,21 @@
 /**
- * 
+ *
  */
 package cn.com.mirror.exceptions;
 
 /**
  * @author Piggy
- *
  * @description
  * @date 2018年4月27日
  */
 public class ConstantException extends RuntimeException {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public ConstantException(String exception) {
-		super(exception);
-	}
+    public ConstantException(String message) {
+        super(message);
+    }
 
+    public ConstantException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }

mirror-common/src/main/java/cn/com/mirror/exceptions/ProjectException.java

@@ -1,10 +1,13 @@
 package cn.com.mirror.exceptions;
 
-public class ProjectException extends RuntimeException{
-	private static final long serialVersionUID = 1L;
-	
-	public ProjectException(String exception) {
-		super(exception);
-	}
+public class ProjectException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
 
+    public ProjectException(String message) {
+        super(message);
+    }
+
+    public ProjectException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }

mirror-common/src/main/java/cn/com/mirror/exceptions/ReflectException.java

@@ -0,0 +1,18 @@
+package cn.com.mirror.exceptions;
+
+/**
+ * @author piggy
+ * @description
+ * @date 18-8-23
+ */
+public class ReflectException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public ReflectException(String message) {
+        super(message);
+    }
+
+    public ReflectException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

mirror-common/src/main/java/cn/com/mirror/project/pair/Pair.java

@@ -12,13 +12,8 @@
  */
 @Getter
 public class Pair {
-    private Map<String, Map<Integer, Integer>> directCtrlEdges = new HashMap<>();
     private Map<String, Map<Vertex, Vertex>> ctrlEdges = new HashMap<>();
 
-    public void addDirectCtrlEdges(String targetPath, Map<Integer, Integer> ctrlEdges) {
-        this.directCtrlEdges.put(targetPath, ctrlEdges);
-    }
-
     public void addCtrlEdge(String targetPath, Map<Vertex, Vertex> ctrlEdges) {
         this.ctrlEdges.put(targetPath, ctrlEdges);
     }

mirror-common/src/main/java/cn/com/mirror/project/pair/Vertex.java

@@ -1,5 +1,6 @@
 package cn.com.mirror.project.pair;
 
+import cn.com.mirror.constant.VertexTypeEnum;
 import lombok.Getter;
 
 import java.io.Serializable;