projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert “Sone marked as known” 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
629c2d5
..
ab6623b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-35,6
+35,9
@@
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.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.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
@@
-1114,7
+1117,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
knownPosts.add(post.getId());
post.setKnown(true);
} else if (!knownPosts.contains(post.getId())) {
knownPosts.add(post.getId());
post.setKnown(true);
} else if (!knownPosts.contains(post.getId())) {
-
coreListenerManager.fireNewPostFound(post
);
+
eventBus.post(new NewPostFoundEvent(post)
);
}
}
posts.put(post.getId(), post);
}
}
posts.put(post.getId(), post);
@@
-1139,7
+1142,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
knownReplies.add(reply.getId());
reply.setKnown(true);
} else if (!knownReplies.contains(reply.getId())) {
knownReplies.add(reply.getId());
reply.setKnown(true);
} else if (!knownReplies.contains(reply.getId())) {
-
coreListenerManager.fireNewReplyFound(reply
);
+
eventBus.post(new NewPostReplyFoundEvent(reply)
);
}
}
replies.put(reply.getId(), reply);
}
}
replies.put(reply.getId(), reply);
@@
-1241,7
+1244,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();
}
}
@@
-1543,7
+1546,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
posts.put(post.getId(), post);
}
synchronized (posts) {
posts.put(post.getId(), post);
}
-
coreListenerManager.fireNewPostFound(post
);
+
eventBus.post(new NewPostFoundEvent(post)
);
sone.addPost(post);
touchConfiguration();
localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
sone.addPost(post);
touchConfiguration();
localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
@@
-1682,7
+1685,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
replies.put(reply.getId(), reply);
}
synchronized (knownReplies) {
replies.put(reply.getId(), reply);
}
synchronized (knownReplies) {
-
coreListenerManager.fireNewReplyFound(reply
);
+
eventBus.post(new NewPostReplyFoundEvent(reply)
);
}
sone.addReply(reply);
touchConfiguration();
}
sone.addReply(reply);
touchConfiguration();