8302644: IGV: Apply filters per graph tab and not globally

Reviewed-by: rcastanedalo, chagedorn, thartmann

Author: tobiasholenstein

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CustomFilter.java

@@ -40,7 +40,7 @@ public class CustomFilter extends AbstractFilter {
 
     private String code;
     private String name;
-    private ScriptEngine engine;
+    private final ScriptEngine engine;
 
     public CustomFilter(String name, String code, ScriptEngine engine) {
         this.name = name;
@@ -60,31 +60,25 @@ public String getCode() {
 
     public void setName(String s) {
         name = s;
-        fireChangedEvent();
     }
 
     public void setCode(String s) {
         code = s;
-        fireChangedEvent();
     }
 
     @Override
     public OpenCookie getEditor() {
-        return new OpenCookie() {
-
-            @Override
-            public void open() {
-                openInEditor();
-            }
-        };
+        return this::openInEditor;
     }
 
     public boolean openInEditor() {
         EditFilterDialog dialog = new EditFilterDialog(CustomFilter.this);
         dialog.setVisible(true);
-        boolean result = dialog.wasAccepted();
-        this.getChangedEvent().fire();
-        return result;
+        boolean accepted = dialog.wasAccepted();
+        if (accepted) {
+            getChangedEvent().fire();
+        }
+        return accepted;
     }
 
     @Override

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import com.sun.hotspot.igv.graph.Diagram;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -37,60 +38,44 @@
  */
 public class FilterChain implements ChangedEventProvider<FilterChain> {
 
-    private List<Filter> filters;
-    private transient ChangedEvent<FilterChain> changedEvent;
+    private final List<Filter> filters;
+    private final transient ChangedEvent<FilterChain> changedEvent;
+    private final String name;
 
-    private ChangedListener<Filter> changedListener = new ChangedListener<Filter>() {
+    private final ChangedListener<Filter> changedListener = new ChangedListener<Filter>() {
         @Override
         public void changed(Filter source) {
             changedEvent.fire();
         }
     };
 
-    public FilterChain() {
+    public FilterChain(String name) {
+        this.name = name;
         filters = new ArrayList<>();
         changedEvent = new ChangedEvent<>(this);
     }
 
-    public FilterChain(FilterChain f) {
-        this.filters = new ArrayList<>(f.filters);
-        changedEvent = new ChangedEvent<>(this);
+    public FilterChain() {
+        this("");
+    }
+
+    public void sortBy(List<String> order) {
+        filters.sort(Comparator.comparingInt(f -> order.indexOf(f.getName())));
     }
 
     @Override
     public ChangedEvent<FilterChain> getChangedEvent() {
         return changedEvent;
     }
 
-    public Filter getFilterAt(int index) {
-        assert index >= 0 && index < filters.size();
-        return filters.get(index);
-    }
-
-    public void apply(Diagram d) {
-        for (Filter f : filters) {
-            f.apply(d);
-        }
-    }
-
-    public void apply(Diagram d, FilterChain sequence) {
-        List<Filter> applied = new ArrayList<>();
-        for (Filter f : sequence.getFilters()) {
-            if (filters.contains(f)) {
-                f.apply(d);
-                applied.add(f);
-            }
-        }
-
-
-        for (Filter f : filters) {
-            if (!applied.contains(f)) {
-                f.apply(d);
+    public void applyInOrder(Diagram diagram, FilterChain filterOrder) {
+        for (Filter filter : filterOrder.getFilters()) {
+            if (filters.contains(filter)) {
+                filter.apply(diagram);
             }
         }
     }
 
-
     public void addFilter(Filter filter) {
         assert filter != null;
         filters.add(filter);
@@ -102,6 +87,14 @@ public boolean containsFilter(Filter filter) {
         return filters.contains(filter);
     }
 
+    public void clearFilters() {
+        for (Filter filter : filters) {
+            filter.getChangedEvent().removeListener(changedListener);
+        }
+        filters.clear();
+        changedEvent.fire();
+    }
+
     public void removeFilter(Filter filter) {
         assert filters.contains(filter);
         filters.remove(filter);
@@ -129,7 +122,22 @@ public void moveFilterDown(Filter filter) {
         changedEvent.fire();
     }
 
+    public void addFilters(List<Filter> filtersToAdd) {
+        for (Filter filter : filtersToAdd) {
+            addFilter(filter);
+        }
+    }
+
     public List<Filter> getFilters() {
         return Collections.unmodifiableList(filters);
     }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
 }

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterChainProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,23 @@
  */
 package com.sun.hotspot.igv.filter;
 
+import com.sun.hotspot.igv.data.ChangedListener;
+import javax.swing.JComboBox;
+
 /**
  *
  * @author Thomas Wuerthinger
  */
 public interface FilterChainProvider {
 
-    public FilterChain getFilterChain();
+    FilterChain getFilterChain();
+    FilterChain getAllFiltersOrdered();
+
+    FilterChain createNewCustomFilterChain();
+
+    void setCustomFilterChain(FilterChain filterChain);
+
+    void selectFilterChain(FilterChain filterChain);
 
-    public FilterChain getSequence();
+    void setFilterChainSelectionChangedListener(ChangedListener<JComboBox<FilterChain>> listener);
 }

src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/FilterSetting.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,10 @@
  */
 package com.sun.hotspot.igv.filterwindow;
 
+import com.sun.hotspot.igv.data.ChangedListener;
 import com.sun.hotspot.igv.filter.FilterChain;
 import com.sun.hotspot.igv.filter.FilterChainProvider;
+import javax.swing.JComboBox;
 import org.openide.util.lookup.ServiceProvider;
 
 /**
@@ -36,11 +38,31 @@ public class FilterChainProviderImplementation implements FilterChainProvider {
 
     @Override
     public FilterChain getFilterChain() {
-        return FilterTopComponent.findInstance().getFilterChain();
+        return FilterTopComponent.findInstance().getCurrentChain();
     }
 
     @Override
-    public FilterChain getSequence() {
-        return FilterTopComponent.findInstance().getSequence();
+    public FilterChain getAllFiltersOrdered() {
+        return FilterTopComponent.findInstance().getAllFiltersOrdered();
+    }
+
+    @Override
+    public FilterChain createNewCustomFilterChain() {
+        return FilterTopComponent.findInstance().createNewCustomFilterChain();
+    }
+
+    @Override
+    public void selectFilterChain(FilterChain filterChain) {
+        FilterTopComponent.findInstance().selectFilterChain(filterChain);
+    }
+
+    @Override
+    public void setCustomFilterChain(FilterChain filterChain) {
+        FilterTopComponent.findInstance().setCustomFilterChain(filterChain);
+    }
+
+    @Override
+    public void setFilterChainSelectionChangedListener(ChangedListener<JComboBox<FilterChain>> listener) {
+        FilterTopComponent.findInstance().setFilterChainSelectionChangedListener(listener);
     }
 }

src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,10 +45,9 @@
  *
  * @author Thomas Wuerthinger
  */
-public class FilterNode extends CheckNode implements LookupListener, ChangedListener<FilterTopComponent> {
+public class FilterNode extends CheckNode implements ChangedListener<FilterTopComponent> {
 
-    private Filter filter;
-    private Lookup.Result<FilterChain> result;
+    private final Filter filter;
 
     public FilterNode(Filter filter) {
         this(filter, new InstanceContent());
@@ -64,12 +63,8 @@ private FilterNode(Filter filter, InstanceContent content) {
 
         update();
 
-        Lookup.Template<FilterChain> tpl = new Lookup.Template<>(FilterChain.class);
-        result = Utilities.actionsGlobalContext().lookup(tpl);
-        result.addLookupListener(this);
-
         FilterTopComponent.findInstance().getFilterSettingsChangedEvent().addListener(this);
-        resultChanged(null);
+        changed(FilterTopComponent.findInstance());
 
         setShortDescription("Double-click to open filter");
     }
@@ -99,13 +94,8 @@ public Action getPreferredAction() {
         return OpenAction.get(OpenAction.class).createContextAwareInstance(Utilities.actionsGlobalContext());
     }
 
-    @Override
-    public void resultChanged(LookupEvent lookupEvent) {
-        changed(FilterTopComponent.findInstance());
-    }
-
     @Override
     public void changed(FilterTopComponent source) {
-        setSelected(source.getFilterChain().containsFilter(filter));
+        setSelected(source.getCurrentChain().containsFilter(filter));
     }
 }