projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert “update found” into EventBus-based event.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
e42a055
..
8318d03
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-43,7
+43,13
@@
import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
import net.pterodactylus.sone.core.event.PostRemovedEvent;
import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
import net.pterodactylus.sone.core.event.PostRemovedEvent;
import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertingEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
import net.pterodactylus.sone.core.event.SoneRemovedEvent;
import net.pterodactylus.sone.core.event.SoneRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
+import net.pterodactylus.sone.core.event.UpdateFoundEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
@@
-798,7
+804,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
-
coreListenerManager.fireSoneLocked(sone
);
+
eventBus.post(new SoneLockedEvent(sone)
);
}
}
}
}
}
}
@@
-813,7
+819,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
-
coreListenerManager.fireSoneUnlocked(sone
);
+
eventBus.post(new SoneUnlockedEvent(sone)
);
}
}
}
}
}
}
@@
-2448,7
+2454,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void updateFound(Version version, long releaseTime, long latestEdition) {
*/
@Override
public void updateFound(Version version, long releaseTime, long latestEdition) {
-
coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition
);
+
eventBus.post(new UpdateFoundEvent(version, releaseTime, latestEdition)
);
}
//
}
//
@@
-2460,7
+2466,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertStarted(Sone sone) {
*/
@Override
public void insertStarted(Sone sone) {
-
coreListenerManager.fireSoneInserting(sone
);
+
eventBus.post(new SoneInsertingEvent(sone)
);
}
/**
}
/**
@@
-2468,7
+2474,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertFinished(Sone sone, long insertDuration) {
*/
@Override
public void insertFinished(Sone sone, long insertDuration) {
-
coreListenerManager.fireSoneInserted(sone, insertDuration
);
+
eventBus.post(new SoneInsertedEvent(sone, insertDuration)
);
}
/**
}
/**
@@
-2476,7
+2482,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertAborted(Sone sone, Throwable cause) {
*/
@Override
public void insertAborted(Sone sone, Throwable cause) {
-
coreListenerManager.fireSoneInsertAborted(sone, cause
);
+
eventBus.post(new SoneInsertAbortedEvent(sone, cause)
);
}
//
}
//