projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert “Sone is being inserted” 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
c62a06f
..
deac566
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-41,7
+41,12
@@
import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
import net.pterodactylus.sone.core.event.NewPostFoundEvent;
import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
import net.pterodactylus.sone.core.event.NewPostFoundEvent;
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.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.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;
@@
-796,7
+801,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)
);
}
}
}
}
}
}
@@
-811,7
+816,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)
);
}
}
}
}
}
}
@@
-1107,7
+1112,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
-
coreListenerManager.firePostRemoved(post
);
+
eventBus.post(new PostRemovedEvent(post)
);
}
}
}
}
}
}
@@
-1132,7
+1137,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
-
coreListenerManager.fireReplyRemoved(reply
);
+
eventBus.post(new PostReplyRemovedEvent(reply)
);
}
}
}
}
}
}
@@
-1580,7
+1585,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
posts.remove(post.getId());
}
synchronized (posts) {
posts.remove(post.getId());
}
-
coreListenerManager.firePostRemoved(post
);
+
eventBus.post(new PostRemovedEvent(post)
);
markPostKnown(post);
touchConfiguration();
}
markPostKnown(post);
touchConfiguration();
}
@@
-2419,7
+2424,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
-
coreListenerManager.firePostRemoved(post
);
+
eventBus.post(new PostRemovedEvent(post)
);
}
}
}
}
}
}
@@
-2427,7
+2432,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
-
coreListenerManager.fireReplyRemoved(reply
);
+
eventBus.post(new PostReplyRemovedEvent(reply)
);
}
}
}
}
}
}
@@
-2458,7
+2463,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)
);
}
/**
}
/**