projects
/
sonitus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move event and metadata handling into abstract base class.
[sonitus.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sonitus
/
data
/
source
/
MultiSource.java
diff --git
a/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
b/src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
index
13cf030
..
2123986
100644
(file)
--- a/
src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
+++ b/
src/main/java/net/pterodactylus/sonitus/data/source/MultiSource.java
@@
-26,10
+26,9
@@
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Logger;
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
import net.pterodactylus.sonitus.data.Controller;
import net.pterodactylus.sonitus.data.Controller;
-import net.pterodactylus.sonitus.data.Metadata;
import net.pterodactylus.sonitus.data.Source;
import net.pterodactylus.sonitus.data.Source;
-import net.pterodactylus.sonitus.data.event.MetadataUpdated;
import net.pterodactylus.sonitus.data.event.SourceFinishedEvent;
import com.google.common.eventbus.EventBus;
import net.pterodactylus.sonitus.data.event.SourceFinishedEvent;
import com.google.common.eventbus.EventBus;
@@
-42,7
+41,7
@@
import com.google.inject.Inject;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class MultiSource implements Source {
+public class MultiSource
extends AbstractControlledComponent
implements Source {
/** The logger. */
private static final Logger logger = Logger.getLogger(MultiSource.class.getName());
/** The logger. */
private static final Logger logger = Logger.getLogger(MultiSource.class.getName());
@@
-58,12
+57,10
@@
public class MultiSource implements Source {
/**
* Creates a new multi source.
/**
* Creates a new multi source.
- *
- * @param eventBus
- * The event bus
*/
@Inject
public MultiSource(EventBus eventBus) {
*/
@Inject
public MultiSource(EventBus eventBus) {
+ super("Multisource");
this.eventBus = eventBus;
}
this.eventBus = eventBus;
}
@@
-86,7
+83,7
@@
public class MultiSource implements Source {
sourceChanged = true;
this.source.notifyAll();
}
sourceChanged = true;
this.source.notifyAll();
}
-
eventBus.post(new MetadataUpdated(this, source.metadata()
));
+
metadataUpdated(source.metadata(
));
logger.info(String.format("Next Source set: %s", source));
}
}
logger.info(String.format("Next Source set: %s", source));
}
}
@@
-96,11
+93,6
@@
public class MultiSource implements Source {
//
@Override
//
@Override
- public String name() {
- return "Multisource";
- }
-
- @Override
public List<Controller<?>> controllers() {
return Collections.emptyList();
}
public List<Controller<?>> controllers() {
return Collections.emptyList();
}
@@
-110,11
+102,6
@@
public class MultiSource implements Source {
//
@Override
//
@Override
- public Metadata metadata() {
- return source.get().metadata();
- }
-
- @Override
public byte[] get(int bufferSize) throws EOFException, IOException {
while (true) {
try {
public byte[] get(int bufferSize) throws EOFException, IOException {
while (true) {
try {