pcorlessGH-216 Gives filtered pages indexes to documentFilterCompleted

gtache · Nov 7, 2022 · 6e1eace · 6e1eace
1 parent d783814
commit 6e1eace
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/core/core-awt/pom.xml b/core/core-awt/pom.xml
@@ -62,6 +62,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java
@@ -5614,7 +5614,8 @@ public void documentFilterStarted(final DocumentFilter filter, final Document do
     }
 
     @Override
-    public void documentFilterEnded(final DocumentFilter filter, final Document document) {
+    public void documentFilterCompleted(final DocumentFilter filter, final Document document,
+                                        final Set<Integer> filteredPages) {
         if (this.document == document) {
             setEnabled(filterPagesButton, !isPdfCollection() && document != null && areFiltersReady());
         }

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/filters/AbstractDocumentFilter.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/filters/AbstractDocumentFilter.java
@@ -33,7 +33,7 @@ public Set<Integer> filterPages(final Document document) {
             listeners.forEach(l -> l.documentFilterStarted(this, document));
             final Set<Integer> filtered = filterPagesUncached(document);
             cache.put(document, filtered);
-            listeners.forEach(l -> l.documentFilterEnded(this, document));
+            listeners.forEach(l -> l.documentFilterCompleted(this, document, filtered));
             return filtered;
         }
     }

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/filters/DocumentFilterListener.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/filters/DocumentFilterListener.java
@@ -2,6 +2,8 @@
 
 import org.icepdf.core.pobjects.Document;
 
+import java.util.Set;
+
 /**
  * Represents a listener of DocumentFilter
  */
@@ -17,8 +19,9 @@ public interface DocumentFilterListener {
     /**
      * Sent when a filtering has ended
      *
-     * @param filter   The filter
-     * @param document The document the filter has finished filtering
+     * @param filter        The filter
+     * @param document      The document the filter has finished filtering
+     * @param filteredPages The indexes of the pages that passed the filter
      */
-    void documentFilterEnded(final DocumentFilter filter, final Document document);
+    void documentFilterCompleted(final DocumentFilter filter, final Document document, final Set<Integer> filteredPages);
 }