From 488684afb2b16596bc5e2c95905ccb9c9bb72974 Mon Sep 17 00:00:00 2001 From: megumi.telles Date: Wed, 21 Mar 2018 13:41:39 -0700 Subject: refinement: Adjust lis file check --- .../org/eclipse/osee/vcast/VCastLisFileParser.java | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/plugins/org.eclipse.osee.vcast/src/org/eclipse/osee/vcast/VCastLisFileParser.java b/plugins/org.eclipse.osee.vcast/src/org/eclipse/osee/vcast/VCastLisFileParser.java index b68e2439880..a89d207d722 100644 --- a/plugins/org.eclipse.osee.vcast/src/org/eclipse/osee/vcast/VCastLisFileParser.java +++ b/plugins/org.eclipse.osee.vcast/src/org/eclipse/osee/vcast/VCastLisFileParser.java @@ -48,15 +48,9 @@ public class VCastLisFileParser implements ICoverageUnitFileContentsLoader { String lisFilePathName = vCastDir + File.separator + lisFileName; File lisFile = new File(lisFilePathName); if (!lisFile.exists()) { - String lisFileName = lisFilePathName.replace(lis, LIS); - lisFile = new File(lisFileName); - if (!lisFile.exists()) { - lisFileName = lisFileName.replace("_", ""); - lisFile = new File(lisFileName); - if (!lisFile.exists()) { - throw new OseeArgumentException( - String.format("VectorCast *.LIS file doesn't exist [%s]", lisFilePathName)); - } + if (!doesFileExist(lisFilePathName, lisFile)) { + throw new OseeArgumentException( + String.format("VectorCast *.LIS file doesn't exist [%s]", lisFilePathName)); } } try { @@ -68,13 +62,13 @@ public class VCastLisFileParser implements ICoverageUnitFileContentsLoader { } } - private String checkAndAdjustLisFileName(String lisFileName) { - String lisFile = lisFileName; - // change *.lis to *.LIS - lisFile = lisFileName.replace(lis, LIS); - // change something_io.2.lis to somethingio.2.lis - lisFile = lisFileName.replace("_", ""); - return lisFile; + private boolean doesFileExist(String lisFilePathName, File lisFile) { + for (String file : lisFile.list()) { + if (file.equalsIgnoreCase(lisFilePathName)) { + return true; + } + } + return false; } public Pair getSourceCodeForLine(Integer method, Integer executionLine) { -- cgit v1.2.3