diff options
| author | Stephen J. Molaro | 2019-08-16 22:01:15 +0000 |
|---|---|---|
| committer | Baily Roberts | 2019-08-16 22:17:30 +0000 |
| commit | 2fff5b68095f95224b35b2ded023ac03caf34e2f (patch) | |
| tree | 7cb9f07372e2785c44b45bd9985fe7b3dcdd9349 | |
| parent | 82eebc344816072ebfb9b943fdec17f6b1412fa9 (diff) | |
| download | org.eclipse.osee-2fff5b68095f95224b35b2ded023ac03caf34e2f.tar.gz org.eclipse.osee-2fff5b68095f95224b35b2ded023ac03caf34e2f.tar.xz org.eclipse.osee-2fff5b68095f95224b35b2ded023ac03caf34e2f.zip | |
bug[TW14900]: Standardize Dispo Tool Naming Convention for Linux
Change-Id: I60b71a6a8ac2cc9512bfc33ff0e2d5f03b3c1f7c
Signed-off-by: Stephen J. Molaro <stephen.j.molaro@boeing.com>
| -rw-r--r-- | plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java index bf9f13f2808..acfdd74f26e 100644 --- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java +++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java @@ -72,8 +72,7 @@ public class LisFileParser implements DispoImporterApi { private static final String WHEN_CASE = "(.*\\bWHEN\\b\\s*[^:]*$)"; private static final String CASE_STATEMENT = "(.*(\\bCASE|case|default|\\s+.+[:].*))"; private static final String WHILE_ONE = "(.*\\bWHILE|while\\s*\\(1\\).*)"; - private static final String NAME_WITH_LINE_NUMBER = ".*(\\.)(\\d)+(\\.2\\.ada).*"; - private static final String TO_REMOVE_LINE_NUMBER = "\\.(\\d)+(\\.2\\.ada)"; + private static final String TO_REMOVE_LINE_NUMBER = "\\.(\\d)+\\.2\\.ada"; private static final String REMOVED_LINE_NUMBER = "\\.2\\.ada"; private final DispoDataFactory dataFactory; @@ -323,8 +322,8 @@ public class LisFileParser implements DispoImporterApi { newItem.setAnnotationsList(new ArrayList<DispoAnnotationData>()); VCastSourceFileJoin sourceFileJoin = dataStore.getSourceFileJoin(lisFile); itemName = sourceFileJoin.getDisplayName() + "." + function.getName(); - if (itemName.matches(NAME_WITH_LINE_NUMBER)) { - itemName = itemName.replaceAll(TO_REMOVE_LINE_NUMBER, REMOVED_LINE_NUMBER); + if (itemName.contains(".2.ada")) { + itemName = itemName.replaceFirst(TO_REMOVE_LINE_NUMBER, REMOVED_LINE_NUMBER); } newItem.setName(itemName); newItem.setFileNumber(Integer.toString(fileNum)); |