projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename dummy filter to basic filter.
[sonitus.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sonitus
/
data
/
filter
/
PredicateFilter.java
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
173073e
..
8968596
100644
(file)
--- 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>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class PredicateFilter extends
Dummy
Filter {
+public class PredicateFilter extends
Basic
Filter {
/** The predicate. */
private final Predicate<Metadata> metadataPredicate;
/** The predicate. */
private final Predicate<Metadata> metadataPredicate;
@@
-50,7
+50,6
@@
public class PredicateFilter extends DummyFilter {
* @param metadataPredicate
* The predicate to evaluate every time the metadata changes
* @param filter
* @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()));
*/
public PredicateFilter(Predicate<Metadata> metadataPredicate, Filter filter) {
super(String.format("%s (maybe)", filter.name()));
@@
-84,6
+83,14
@@
public class PredicateFilter extends DummyFilter {
}
@Override
}
@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()) {
public void metadataUpdated(Metadata metadata) {
metadataMatches.set(metadataPredicate.apply(metadata));
if (metadataMatches.get()) {
@@
-103,15
+110,6
@@
public class PredicateFilter extends DummyFilter {
}
@Override
}
@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);
public byte[] get(int bufferSize) throws IOException {
if (metadataMatches.get()) {
return filter.get(bufferSize);