Pull all interfaces into a single interface: Filter.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / ExternalFilter.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
index a6e2966..a482cf6 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
@@ -22,12 +22,13 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sonitus.data.AbstractFilter;
+import net.pterodactylus.sonitus.data.Filter;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.eventbus.EventBus;
 
 /**
  * {@link net.pterodactylus.sonitus.data.Filter} implementation that runs its
@@ -35,7 +36,7 @@ import com.google.common.eventbus.EventBus;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public abstract class ExternalFilter extends DummyFilter {
+public abstract class ExternalFilter extends AbstractFilter implements Filter {
 
        /** The logger. */
        private final Logger logger = Logger.getLogger(getClass().getName());
@@ -46,13 +47,11 @@ public abstract class ExternalFilter extends DummyFilter {
        /**
         * Creates a new external filter with the given name.
         *
-        * @param eventBus
-        *              The event bus
         * @param name
         *              The name of the filter
         */
-       protected ExternalFilter(EventBus eventBus, String name) {
-               super(eventBus, name);
+       protected ExternalFilter(String name) {
+               super(name);
        }
 
        //
@@ -72,10 +71,6 @@ public abstract class ExternalFilter extends DummyFilter {
                process.destroy();
        }
 
-       //
-       // DUMMYFILTER METHODS
-       //
-
        @Override
        protected InputStream createInputStream() throws IOException {
                return process.getInputStream();