Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorangel.avila22018-10-08 23:15:10 -0400
committerangel.avila22018-10-08 23:15:10 -0400
commita90563d5b6c637d5f222e37c1ffc97098dab574f (patch)
treea6abea492986ca9e8afe84ef7ec01e8139acf6c8
parent248f5892931ca53b27218da252b18e989342ddbe (diff)
downloadorg.eclipse.osee-a90563d5b6c637d5f222e37c1ffc97098dab574f.tar.gz
org.eclipse.osee-a90563d5b6c637d5f222e37c1ffc97098dab574f.tar.xz
org.eclipse.osee-a90563d5b6c637d5f222e37c1ffc97098dab574f.zip
feature[ats_12345]: in work
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/MultiEnvCopier.java2
-rw-r--r--plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/LisFileParser.java34
2 files changed, 23 insertions, 13 deletions
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/MultiEnvCopier.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/MultiEnvCopier.java
index d9454faa497..e893474d016 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/MultiEnvCopier.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/MultiEnvCopier.java
@@ -10,7 +10,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.osee.disposition.model.Discrepancy;
import org.eclipse.osee.disposition.model.DispoAnnotationData;
@@ -25,7 +24,6 @@ public class MultiEnvCopier {
public List<DispoItem> copy(Map<DispoItemData, Set<DispoItemData>> itemToMultiEnvTwins, OperationReport rerpot) {
List<DispoItem> modifiedItems = new ArrayList<>();
- Set<Entry<DispoItemData, Set<DispoItemData>>> entrySet = itemToMultiEnvTwins.entrySet();
for (DispoItemData origItem : itemToMultiEnvTwins.keySet()) {
Set<DispoItemData> twinItems = itemToMultiEnvTwins.get(origItem);
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 28271ed8458..4a824bf7d4b 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
@@ -297,13 +297,22 @@ public class LisFileParser implements DispoImporterApi {
datIdToItem.put(datId, newItem);
// Muli Env
- String name = newItem.getName();
- Set<DispoItemData> set = nameToMultiEnvItems.get(name);
- if (set == null) {
- set = new HashSet<>();
+ String n = instrumentedFile.getLISFile();
+ if (n.contains("49")) {
+ System.out.println();
+ }
+ if (instrumentedFile.getLISFile().matches(".*?/vcast/.*?\\d+\\.2\\.lis")) {
+ // Making assumption here that the only time we wanna collect these duplicate "twin" files is when vcast tags them with the name
+ // syntax filename.id.2.lis
+
+ String name = newItem.getName();
+ Set<DispoItemData> set = nameToMultiEnvItems.get(name);
+ if (set == null) {
+ set = new HashSet<>();
+ }
+ set.add(newItem);
+ nameToMultiEnvItems.put(name, set);
}
- set.add(newItem);
- nameToMultiEnvItems.put(name, set);
// end
Collection<VCastStatementCoverage> statementCoverageItems = Collections.emptyList();
@@ -529,11 +538,14 @@ public class LisFileParser implements DispoImporterApi {
}
private void tryMultiEnv(DispoItemData itemFromDatMatch) {
- if (!alreadyLinkedMultiEnvItems.contains(itemFromDatMatch.getName())) {
- Set<DispoItemData> multiEnvItems = new HashSet<>();
- multiEnvItems.addAll(nameToMultiEnvItems.get(itemFromDatMatch.getName()));
-
- itemsToMultiEnvItems.put(itemFromDatMatch, multiEnvItems);
+ if (itemFromDatMatch.getName().contains("pcie")) {
+ System.out.println();
+ }
+ Set<DispoItemData> twinItems = nameToMultiEnvItems.get(itemFromDatMatch.getName());
+ if (twinItems != null) {
+ if (!alreadyLinkedMultiEnvItems.contains(itemFromDatMatch.getName())) {
+ itemsToMultiEnvItems.put(itemFromDatMatch, twinItems);
+ }
}
}

Back to the top