diff --git a/src/main/java/client/IdentifyEntities.java b/src/main/java/client/IdentifyEntities.java index f3f20c3..5b60600 100644 --- a/src/main/java/client/IdentifyEntities.java +++ b/src/main/java/client/IdentifyEntities.java @@ -148,7 +148,7 @@ public void acceptAST(String source, CompilationUnit ast) { for(CompilationUnitPair pair : pairs){ try{ -// honor +// honor if (pair.source.contains("tests/")) continue; System.out.println(PathUtil.getPathInProject(PathUtil.unifyPath(pair.source),this.project_name)); // System.out.println(PathUtil.unifyPath(pair.source)); diff --git a/src/main/java/client/TemplateWork.java b/src/main/java/client/TemplateWork.java index 77e39ff..2fd91d9 100644 --- a/src/main/java/client/TemplateWork.java +++ b/src/main/java/client/TemplateWork.java @@ -5,15 +5,8 @@ import picocli.CommandLine; import util.Tuple; import visitor.relationInf.RelationInf; -import formator.Formator; -import formator.fjson.JDepObject; -import formator.fxml.XDepObject; -import formator.spreadsheet.Csvgrapher; -import hianalyzer.HiDepData; -import hianalyzer.HiDeper; import util.Configure; -import writer.WriterIntf; import java.util.ArrayList; import java.util.Map; diff --git a/src/main/java/util/PathUtil.java b/src/main/java/util/PathUtil.java index 360021c..30742e5 100644 --- a/src/main/java/util/PathUtil.java +++ b/src/main/java/util/PathUtil.java @@ -77,13 +77,17 @@ public static String getLastStrByDot(String str){ /** * Get the path inside project - * @param fullpath C:/.../project/src/java/pkg/file.java + * @param fullPath C:/.../project/src/java/pkg/file.java * @param projectName project * @return pkg/file.java */ - public static String getPathInProject(String fullpath, String projectName){ + public static String getPathInProject(String fullPath, String projectName){ String[] temp; - temp = fullpath.split(projectName,2); + if(fullPath.contains(projectName)){ + temp = fullPath.split(projectName,2); + } else { + temp = fullPath.split(getLastStrByPathDelimiter(fullPath), 2); + } if(temp[1].endsWith(".java") || temp[1].endsWith(".aidl")){ return temp[1].substring(1); }