diff options
author | megumi.telles | 2018-03-26 15:26:02 +0000 |
---|---|---|
committer | megumi.telles | 2018-03-26 15:26:02 +0000 |
commit | b0c708f89b431c3a98a84b4ca475520f9a40931e (patch) | |
tree | 3c933a85c47e4b40936d229daaced47b91d54506 | |
parent | 95b3f59964657c4a300862ec11a58ad1376ea91a (diff) | |
download | org.eclipse.osee-b0c708f89b431c3a98a84b4ca475520f9a40931e.tar.gz org.eclipse.osee-b0c708f89b431c3a98a84b4ca475520f9a40931e.tar.xz org.eclipse.osee-b0c708f89b431c3a98a84b4ca475520f9a40931e.zip |
refinement: Adjust logic for lis files
-rw-r--r-- | plugins/org.eclipse.osee.vcast/src/org/eclipse/osee/vcast/VCastLisFileParser.java | 31 |
1 files changed, 10 insertions, 21 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 07f6aa38c9f..e3c9939b486 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 @@ -46,18 +46,17 @@ public class VCastLisFileParser implements ICoverageUnitFileContentsLoader { if (!populated) { populated = true; String lisFilePathName = vCastDir + File.separator + lisFileName; - File lisFile; - try { - lisFile = new File(lisFilePathName); - if (!lisFile.exists()) { - if (!doesFileExist(lisFileName, lisFile)) { - throw new OseeArgumentException( - String.format("VectorCast *.LIS file doesn't exist [%s]", lisFilePathName)); - } + File lisFile = new File(vCastDir); + boolean foundFile = false; + for (String file : lisFile.list()) { + if (file.equalsIgnoreCase(lisFileName)) { + lisFile = new File(vCastDir + File.separator + file); + foundFile = true; + break; } - } catch (Exception ex) { - throw new OseeArgumentException( - String.format("Exception trying to find file [%s] [%s]", lisFilePathName, ex.getMessage())); + } + if (!foundFile) { + throw new OseeArgumentException(String.format("VectorCast *.LIS file doesn't exist [%s]", lisFilePathName)); } try { fileText = Lib.fileToString(lisFile); @@ -68,16 +67,6 @@ public class VCastLisFileParser implements ICoverageUnitFileContentsLoader { } } - private boolean doesFileExist(String lisFileName, File lisFile) { - for (String file : lisFile.list()) { - if (file.equalsIgnoreCase(lisFileName)) { - lisFile = new File(vCastDir + File.separator + file); - return true; - } - } - return false; - } - public Pair<String, Boolean> getSourceCodeForLine(Integer method, Integer executionLine) { ensurePopulated(); |