projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert “Sone locked” 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
0a2c534
..
ed8cc72
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-35,9
+35,16
@@
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Options.DefaultOption;
import net.pterodactylus.sone.core.Options.Option;
import net.pterodactylus.sone.core.Options.OptionWatcher;
import net.pterodactylus.sone.core.Options.DefaultOption;
import net.pterodactylus.sone.core.Options.Option;
import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
+import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
+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.SoneLockedEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
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;
@@
-792,7
+799,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)
);
}
}
}
}
}
}
@@
-1103,7
+1110,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)
);
}
}
}
}
}
}
@@
-1128,7
+1135,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)
);
}
}
}
}
}
}
@@
-1232,7
+1239,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
/**
* Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
- * known} before, a {@link
CoreListener#markSoneKnown(Sone)} event
is fired.
+ * known} before, a {@link
MarkSoneKnownEvent}
is fired.
*
* @param sone
* The Sone to mark as known
*
* @param sone
* The Sone to mark as known
@@
-1243,7
+1250,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownSones) {
knownSones.add(sone.getId());
}
synchronized (knownSones) {
knownSones.add(sone.getId());
}
-
coreListenerManager.fireMarkSoneKnown(sone
);
+
eventBus.post(new MarkSoneKnownEvent(sone)
);
touchConfiguration();
}
}
touchConfiguration();
}
}
@@
-1576,7
+1583,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();
}
@@
-1591,7
+1598,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
-
coreListenerManager.fireMarkPostKnown(post
);
+
eventBus.post(new MarkPostKnownEvent(post)
);
if (knownPosts.add(post.getId())) {
touchConfiguration();
}
if (knownPosts.add(post.getId())) {
touchConfiguration();
}
@@
-1734,7
+1741,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
-
coreListenerManager.fireMarkReplyKnown(reply
);
+
eventBus.post(new MarkPostReplyKnownEvent(reply)
);
if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
@@
-2415,7
+2422,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)
);
}
}
}
}
}
}
@@
-2423,14
+2430,14
@@
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)
);
}
}
}
synchronized (sones) {
sones.remove(identity.getId());
}
}
}
}
synchronized (sones) {
sones.remove(identity.getId());
}
-
coreListenerManager.fireSoneRemoved(sone
);
+
eventBus.post(new SoneRemovedEvent(sone)
);
}
//
}
//