projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add marker for unknown metadata.
[sonitus.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sonitus
/
data
/
filter
/
DummyFilter.java
diff --git
a/src/main/java/net/pterodactylus/sonitus/data/filter/DummyFilter.java
b/src/main/java/net/pterodactylus/sonitus/data/filter/DummyFilter.java
index
ea874d4
..
ae6899d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sonitus/data/filter/DummyFilter.java
+++ b/
src/main/java/net/pterodactylus/sonitus/data/filter/DummyFilter.java
@@
-27,12
+27,11
@@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Collections;
import java.util.List;
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
import net.pterodactylus.sonitus.data.Controller;
import net.pterodactylus.sonitus.data.Filter;
import net.pterodactylus.sonitus.data.Metadata;
import net.pterodactylus.sonitus.data.Controller;
import net.pterodactylus.sonitus.data.Filter;
import net.pterodactylus.sonitus.data.Metadata;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
-import com.google.common.eventbus.EventBus;
import com.google.common.io.Closeables;
/**
import com.google.common.io.Closeables;
/**
@@
-40,13
+39,7
@@
import com.google.common.io.Closeables;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class DummyFilter implements Filter {
-
- /** The name of this filter. */
- private final String name;
-
- /** The event bus. */
- private final EventBus eventBus;
+public class DummyFilter extends AbstractControlledComponent implements Filter {
/** The input stream from which to read. */
private InputStream inputStream;
/** The input stream from which to read. */
private InputStream inputStream;
@@
-54,20
+47,14
@@
public class DummyFilter implements Filter {
/** The output stream to which to write. */
private OutputStream outputStream;
/** The output stream to which to write. */
private OutputStream outputStream;
- /** The current metadata. */
- private Metadata metadata;
-
/**
* Creates a new dummy filter with the given name.
*
/**
* Creates a new dummy filter with the given name.
*
- * @param eventBus
- * The event bus
* @param name
* The name of the filter
*/
* @param name
* The name of the filter
*/
- public DummyFilter(EventBus eventBus, String name) {
- this.eventBus = eventBus;
- this.name = name;
+ public DummyFilter(String name) {
+ super(name);
}
//
}
//
@@
-75,11
+62,6
@@
public class DummyFilter implements Filter {
//
@Override
//
@Override
- public String name() {
- return name;
- }
-
- @Override
public List<Controller<?>> controllers() {
return Collections.emptyList();
}
public List<Controller<?>> controllers() {
return Collections.emptyList();
}
@@
-106,17
+88,6
@@
public class DummyFilter implements Filter {
}
@Override
}
@Override
- public Metadata metadata() {
- return metadata;
- }
-
- @Override
- public void metadataUpdated(Metadata metadata) {
- this.metadata = metadata;
- eventBus.post(new MetadataUpdated(this, metadata));
- }
-
- @Override
public void process(byte[] buffer) throws IOException {
outputStream.write(buffer);
outputStream.flush();
public void process(byte[] buffer) throws IOException {
outputStream.write(buffer);
outputStream.flush();