defect #1855187: proper fix for total number of items in mywork

MicroFocus · Jun 21, 2022 · 4f9bef1 · 4f9bef1
1 parent 732911c
commit 4f9bef1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...lipse-plugin/src/com/hpe/octane/ideplugins/eclipse/ui/entitylist/EntityListComposite.java b/...lipse-plugin/src/com/hpe/octane/ideplugins/eclipse/ui/entitylist/EntityListComposite.java
@@ -101,7 +101,7 @@ private void init() {
         entityListData.addDataChangedHandler(entityList -> {
             entityTypeSelectorComposite
                     .setEntityTypeCount(
-                            countEntitiesByType(entityListData.getEntityList()));
+                            countEntitiesByType(entityListData.getOriginalEntityList()));
         });
     }
 

diff --git a/...ugin/src/com/hpe/octane/ideplugins/eclipse/ui/entitylist/EntityTypeSelectorComposite.java b/...ugin/src/com/hpe/octane/ideplugins/eclipse/ui/entitylist/EntityTypeSelectorComposite.java
@@ -41,6 +41,7 @@ public class EntityTypeSelectorComposite extends Composite {
     private List<Runnable> selectionListeners = new ArrayList<>();
     private Label totalCountLbl;
     private Color backgroundColor = SWTResourceManager.getColor(SWT.COLOR_TRANSPARENT);
+    private List<Entity> sortedEntityTypes;
 
     /**
      * Create the composite.
@@ -55,7 +56,7 @@ public EntityTypeSelectorComposite(Composite parent, int style, Entity... suppor
         rowLayout.spacing = 7;
         setLayout(rowLayout);
 
-        List<Entity> sortedEntityTypes = Arrays
+        sortedEntityTypes = Arrays
                 .stream(supportedEntityTypes)
                 .sorted(new PredefinedEntityComparator())
                 .collect(Collectors.toList());
@@ -91,7 +92,13 @@ public void setEntityTypeCount(Map<Entity, Integer> entityTypeCount) {
                 checkBox.setText("0");
             }
         });
-        totalCountLbl.setText("Total: " + entityTypeCount.values().stream().mapToInt(i -> i.intValue()).sum());
+
+        List<Integer> entityTypeCountValues = entityTypeCount.entrySet()
+                .stream()
+                .filter(e -> sortedEntityTypes.contains(e.getKey()))
+                .map(Map.Entry::getValue)
+                .collect(Collectors.toList());
+        totalCountLbl.setText("Total: " + entityTypeCountValues.stream().mapToInt(i -> i.intValue()).sum());
     }
 
     public Set<Entity> getCheckedEntityTypes() {