X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Ffilter%2FPredicateFilter.java;h=8968596ab043db04dbcd2fec2d5726ae83dafc7d;hb=70ea21939e6071954eeb05f2a42e7a92a02013f2;hp=1e8c7fa9385a6d20603f6c249fe474689db1284e;hpb=7188da95cfb6dc2bf140eb8ac7e4dc99a0761a97;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/PredicateFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/PredicateFilter.java
index 1e8c7fa..8968596 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/PredicateFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/PredicateFilter.java
@@ -33,7 +33,7 @@ import com.google.common.base.Predicate;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class PredicateFilter extends DummyFilter {
+public class PredicateFilter extends BasicFilter {
 
 	/** The predicate. */
 	private final Predicate<Metadata> metadataPredicate;
@@ -50,9 +50,9 @@ public class PredicateFilter extends DummyFilter {
 	 * @param metadataPredicate
 	 * 		The predicate to evaluate every time the metadata changes
 	 * @param filter
-	 * 		The filter to use if the predicate matches the metadata
 	 */
 	public PredicateFilter(Predicate<Metadata> metadataPredicate, Filter filter) {
+		super(String.format("%s (maybe)", filter.name()));
 		this.metadataPredicate = metadataPredicate;
 		this.filter = filter;
 	}
@@ -83,6 +83,14 @@ public class PredicateFilter extends DummyFilter {
 	}
 
 	@Override
+	public Metadata metadata() {
+		if (metadataMatches.get()) {
+			return filter.metadata();
+		}
+		return super.metadata();
+	}
+
+	@Override
 	public void metadataUpdated(Metadata metadata) {
 		metadataMatches.set(metadataPredicate.apply(metadata));
 		if (metadataMatches.get()) {
@@ -102,15 +110,6 @@ public class PredicateFilter extends DummyFilter {
 	}
 
 	@Override
-	public Metadata metadata() {
-		if (metadataMatches.get()) {
-			return filter.metadata();
-		} else {
-			return super.metadata();
-		}
-	}
-
-	@Override
 	public byte[] get(int bufferSize) throws IOException {
 		if (metadataMatches.get()) {
 			return filter.get(bufferSize);