X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=51a831c54249174441df8e078be518431892e4cf;hb=06c97e457ce62ff258d85e6cfb9b4d94f9e9147f;hp=e885bb5e0a281620a7c347f98e5bec6c3836d002;hpb=d8c3ac6bf0ee859cfe5abfe8aaf4bff8a5e91c4e;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index e885bb5..51a831c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.core;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -34,6 +35,23 @@ 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.event.ImageInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.ImageInsertStartedEvent;
+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.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.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;
@@ -66,6 +84,12 @@ import net.pterodactylus.util.validation.IntegerRangeValidator;
import net.pterodactylus.util.validation.OrValidator;
import net.pterodactylus.util.validation.Validation;
import net.pterodactylus.util.version.Version;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
+
import freenet.keys.FreenetURI;
/**
@@ -73,7 +97,7 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener, PostReplyProvider {
+public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
@@ -90,6 +114,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/** The core listener manager. */
private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+ /** The event bus. */
+ private final EventBus eventBus;
+
/** The configuration. */
private Configuration configuration;
@@ -128,20 +155,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
private final Set lockedSones = new HashSet();
/** Sone inserters. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneInserters = new HashMap();
/** Sone rescuers. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneRescuers = new HashMap();
- /** All local Sones. */
- /* synchronize access on this on itself. */
- private final Map localSones = new HashMap();
-
- /** All remote Sones. */
+ /** All Sones. */
/* synchronize access on this on itself. */
- private final Map remoteSones = new HashMap();
+ private final Map sones = new HashMap();
/** All known Sones. */
private final Set knownSones = new HashSet();
@@ -191,8 +214,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The identity manager
* @param webOfTrustUpdater
* The WebOfTrust updater
+ * @param eventBus
+ * The event bus
*/
- public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater) {
+ @Inject
+ public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus) {
super("Sone Core");
this.configuration = configuration;
this.freenetInterface = freenetInterface;
@@ -201,6 +227,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
this.imageInserter = new ImageInserter(this, freenetInterface);
this.updateChecker = new UpdateChecker(freenetInterface);
this.webOfTrustUpdater = webOfTrustUpdater;
+ this.eventBus = eventBus;
}
//
@@ -297,8 +324,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone rescuer for the given Sone
*/
public SoneRescuer getSoneRescuer(Sone sone) {
- Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", isLocalSone(sone)).check();
- synchronized (localSones) {
+ Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", sone.isLocal()).check();
+ synchronized (sones) {
SoneRescuer soneRescuer = soneRescuers.get(sone);
if (soneRescuer == null) {
soneRescuer = new SoneRescuer(this, soneDownloader, sone);
@@ -328,10 +355,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return All Sones
*/
public Set getSones() {
- Set allSones = new HashSet();
- allSones.addAll(getLocalSones());
- allSones.addAll(getRemoteSones());
- return allSones;
+ return new HashSet(sones.values());
}
/**
@@ -362,10 +386,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public Sone getSone(String id, boolean create) {
- if (isLocalSone(id)) {
- return getLocalSone(id);
+ synchronized (sones) {
+ if (!sones.containsKey(id)) {
+ Sone sone = new Sone(id, false);
+ sones.put(id, sone);
+ }
+ return sones.get(id);
}
- return getRemoteSone(id, create);
}
/**
@@ -377,33 +404,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* otherwise
*/
public boolean hasSone(String id) {
- return isLocalSone(id) || isRemoteSone(id);
- }
-
- /**
- * Returns whether the given Sone is a local Sone.
- *
- * @param sone
- * The Sone to check for its locality
- * @return {@code true} if the given Sone is local, {@code false} otherwise
- */
- public boolean isLocalSone(Sone sone) {
- synchronized (localSones) {
- return localSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the given ID is the ID of a local Sone.
- *
- * @param id
- * The Sone ID to check for its locality
- * @return {@code true} if the given ID is a local Sone, {@code false}
- * otherwise
- */
- public boolean isLocalSone(String id) {
- synchronized (localSones) {
- return localSones.containsKey(id);
+ synchronized (sones) {
+ return sones.containsKey(id);
}
}
@@ -412,21 +414,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All local Sones
*/
- public Set getLocalSones() {
- synchronized (localSones) {
- return new HashSet(localSones.values());
- }
- }
+ public Collection getLocalSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
- /**
- * Returns the local Sone with the given ID.
- *
- * @param id
- * The ID of the Sone to get
- * @return The Sone with the given ID
- */
- public Sone getLocalSone(String id) {
- return getLocalSone(id, true);
+ @Override
+ public boolean apply(Sone sone) {
+ return sone.isLocal();
+ }
+ });
+ }
}
/**
@@ -440,11 +437,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone with the given ID, or {@code null}
*/
public Sone getLocalSone(String id, boolean create) {
- synchronized (localSones) {
- Sone sone = localSones.get(id);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
if ((sone == null) && create) {
- sone = new Sone(id);
- localSones.put(id, sone);
+ sone = new Sone(id, true);
+ sones.put(id, sone);
+ }
+ if ((sone != null) && !sone.isLocal()) {
+ sone = new Sone(id, true);
+ sones.put(id, sone);
}
return sone;
}
@@ -455,9 +456,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All remote Sones
*/
- public Set getRemoteSones() {
- synchronized (remoteSones) {
- return new HashSet(remoteSones.values());
+ public Collection getRemoteSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
+
+ @Override
+ public boolean apply(Sone sone) {
+ return !sone.isLocal();
+ }
+ });
}
}
@@ -472,45 +479,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id, boolean create) {
- synchronized (remoteSones) {
- Sone sone = remoteSones.get(id);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
if ((sone == null) && create && (id != null) && (id.length() == 43)) {
- sone = new Sone(id);
- remoteSones.put(id, sone);
+ sone = new Sone(id, false);
+ sones.put(id, sone);
}
return sone;
}
}
/**
- * Returns whether the given Sone is a remote Sone.
- *
- * @param sone
- * The Sone to check
- * @return {@code true} if the given Sone is a remote Sone, {@code false}
- * otherwise
- */
- public boolean isRemoteSone(Sone sone) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the Sone with the given ID is a remote Sone.
- *
- * @param id
- * The ID of the Sone to check
- * @return {@code true} if the Sone with the given ID is a remote Sone,
- * {@code false} otherwise
- */
- public boolean isRemoteSone(String id) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(id);
- }
- }
-
- /**
* Returns whether the given Sone has been modified.
*
* @param sone
@@ -608,9 +587,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * {@inheritDoc}
+ * Returns the reply with the given ID. If there is no reply with the given
+ * ID yet, a new one is created, unless {@code create} is false in which
+ * case {@code null} is returned.
+ *
+ * @param replyId
+ * The ID of the reply to get
+ * @param create
+ * {@code true} to always return a {@link Reply}, {@code false}
+ * to return {@code null} if no reply can be found
+ * @return The reply, or {@code null} if there is no such reply
*/
- @Override
public PostReply getPostReply(String replyId, boolean create) {
synchronized (replies) {
PostReply reply = replies.get(replyId);
@@ -819,7 +806,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
- coreListenerManager.fireSoneLocked(sone);
+ eventBus.post(new SoneLockedEvent(sone));
}
}
}
@@ -834,7 +821,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
- coreListenerManager.fireSoneUnlocked(sone);
+ eventBus.post(new SoneUnlockedEvent(sone));
}
}
}
@@ -851,10 +838,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given OwnIdentity is null!");
return null;
}
- synchronized (localSones) {
+ synchronized (sones) {
final Sone sone;
try {
- sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
+ sone = getLocalSone(ownIdentity.getId(), true).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
} catch (MalformedURLException mue1) {
logger.log(Level.SEVERE, String.format("Could not convert the Identityâs URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
return null;
@@ -863,7 +850,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
sone.setKnown(true);
/* TODO - load posts ân stuff */
- localSones.put(ownIdentity.getId(), sone);
+ sones.put(ownIdentity.getId(), sone);
final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.addSoneInsertListener(this);
soneInserters.put(sone, soneInserter);
@@ -911,7 +898,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given Identity is null!");
return null;
}
- synchronized (remoteSones) {
+ synchronized (sones) {
final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
boolean newSone = sone.getRequestUri() == null;
sone.setRequestUri(getSoneUri(identity.getRequestUri()));
@@ -922,7 +909,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
sone.setKnown(!newSone);
if (newSone) {
- coreListenerManager.fireNewSoneFound(sone);
+ eventBus.post(new NewSoneFoundEvent(sone));
for (Sone localSone : getLocalSones()) {
if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
followSone(localSone, sone);
@@ -1130,7 +1117,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
@@ -1143,7 +1130,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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);
@@ -1155,7 +1142,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
@@ -1168,7 +1155,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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);
@@ -1227,8 +1214,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* Deletes the given Sone. This will remove the Sone from the
- * {@link #getLocalSone(String) local Sones}, stops its {@link SoneInserter}
- * and remove the context from its identity.
+ * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and
+ * remove the context from its identity.
*
* @param sone
* The Sone to delete
@@ -1238,12 +1225,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
- synchronized (localSones) {
- if (!localSones.containsKey(sone.getId())) {
+ synchronized (sones) {
+ if (!getLocalSones().contains(sone)) {
logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
return;
}
- localSones.remove(sone.getId());
+ sones.remove(sone.getId());
SoneInserter soneInserter = soneInserters.remove(sone);
soneInserter.removeSoneInsertListener(this);
soneInserter.stop();
@@ -1259,7 +1246,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* 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
@@ -1270,7 +1257,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownSones) {
knownSones.add(sone.getId());
}
- coreListenerManager.fireMarkSoneKnown(sone);
+ eventBus.post(new MarkSoneKnownEvent(sone));
touchConfiguration();
}
}
@@ -1283,7 +1270,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to load and update
*/
public void loadSone(Sone sone) {
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
return;
}
@@ -1561,7 +1548,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public Post createPost(Sone sone, Sone recipient, long time, String text) {
Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.length(), 0).check();
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
return null;
}
@@ -1572,7 +1559,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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() {
@@ -1595,7 +1582,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The post to delete
*/
public void deletePost(Post post) {
- if (!isLocalSone(post.getSone())) {
+ if (!post.getSone().isLocal()) {
logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
@@ -1603,7 +1590,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
posts.remove(post.getId());
}
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
markPostKnown(post);
touchConfiguration();
}
@@ -1618,7 +1605,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
- coreListenerManager.fireMarkPostKnown(post);
+ eventBus.post(new MarkPostKnownEvent(post));
if (knownPosts.add(post.getId())) {
touchConfiguration();
}
@@ -1702,7 +1689,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public PostReply createReply(Sone sone, Post post, long time, String text) {
Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.trim().length(), 0).check();
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
return null;
}
@@ -1711,7 +1698,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
replies.put(reply.getId(), reply);
}
synchronized (knownReplies) {
- coreListenerManager.fireNewReplyFound(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
sone.addReply(reply);
touchConfiguration();
@@ -1736,7 +1723,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
return;
}
@@ -1761,7 +1748,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
- coreListenerManager.fireMarkReplyKnown(reply);
+ eventBus.post(new MarkPostReplyKnownEvent(reply));
if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
@@ -1811,7 +1798,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The album to remove
*/
public void deleteAlbum(Album album) {
- Validation.begin().isNotNull("Album", album).check().is("Local Sone", isLocalSone(album.getSone())).check();
+ Validation.begin().isNotNull("Album", album).check().is("Local Sone", album.getSone().isLocal()).check();
if (!album.isEmpty()) {
return;
}
@@ -1838,7 +1825,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The newly created image
*/
public Image createImage(Sone sone, Album album, TemporaryImage temporaryImage) {
- Validation.begin().isNotNull("Sone", sone).isNotNull("Album", album).isNotNull("Temporary Image", temporaryImage).check().is("Local Sone", isLocalSone(sone)).check().isEqual("Owner and Album Owner", sone, album.getSone()).check();
+ Validation.begin().isNotNull("Sone", sone).isNotNull("Album", album).isNotNull("Temporary Image", temporaryImage).check().is("Local Sone", sone.isLocal()).check().isEqual("Owner and Album Owner", sone, album.getSone()).check();
Image image = new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis());
album.addImage(image);
synchronized (images) {
@@ -1857,7 +1844,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The image to delete
*/
public void deleteImage(Image image) {
- Validation.begin().isNotNull("Image", image).check().is("Local Sone", isLocalSone(image.getSone())).check();
+ Validation.begin().isNotNull("Image", image).check().is("Local Sone", image.getSone().isLocal()).check();
deleteTemporaryImage(image.getId());
image.getAlbum().removeImage(image);
synchronized (images) {
@@ -1933,6 +1920,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
loadConfiguration();
updateChecker.addUpdateListener(this);
updateChecker.start();
+ identityManager.addIdentityListener(this);
+ identityManager.start();
+ webOfTrustUpdater.init();
webOfTrustUpdater.start();
}
@@ -1960,7 +1950,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void serviceStop() {
- synchronized (localSones) {
+ synchronized (sones) {
for (Entry soneInserter : soneInserters.entrySet()) {
soneInserter.getValue().removeSoneInsertListener(this);
soneInserter.getValue().stop();
@@ -1972,6 +1962,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
updateChecker.stop();
updateChecker.removeUpdateListener(this);
soneDownloader.stop();
+ identityManager.removeIdentityListener(this);
+ identityManager.stop();
}
//
@@ -1986,7 +1978,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to save
*/
private synchronized void saveSone(Sone sone) {
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
return;
}
@@ -2437,7 +2429,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
@@ -2445,14 +2437,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
- synchronized (remoteSones) {
- remoteSones.remove(identity.getId());
+ synchronized (sones) {
+ sones.remove(identity.getId());
}
- coreListenerManager.fireSoneRemoved(sone);
+ eventBus.post(new SoneRemovedEvent(sone));
}
//
@@ -2464,7 +2456,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void updateFound(Version version, long releaseTime, long latestEdition) {
- coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
+ eventBus.post(new UpdateFoundEvent(version, releaseTime, latestEdition));
}
//
@@ -2476,7 +2468,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertStarted(Sone sone) {
- coreListenerManager.fireSoneInserting(sone);
+ eventBus.post(new SoneInsertingEvent(sone));
}
/**
@@ -2484,7 +2476,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertFinished(Sone sone, long insertDuration) {
- coreListenerManager.fireSoneInserted(sone, insertDuration);
+ eventBus.post(new SoneInsertedEvent(sone, insertDuration));
}
/**
@@ -2492,7 +2484,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertAborted(Sone sone, Throwable cause) {
- coreListenerManager.fireSoneInsertAborted(sone, cause);
+ eventBus.post(new SoneInsertAbortedEvent(sone, cause));
}
//
@@ -2505,7 +2497,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
@Override
public void imageInsertStarted(Image image) {
logger.log(Level.WARNING, String.format("Image insert started for %s...", image));
- coreListenerManager.fireImageInsertStarted(image);
+ eventBus.post(new ImageInsertStartedEvent(image));
}
/**
@@ -2514,7 +2506,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
@Override
public void imageInsertAborted(Image image) {
logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
- coreListenerManager.fireImageInsertAborted(image);
+ eventBus.post(new ImageInsertAbortedEvent(image));
}
/**