projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert “image insert aborted” 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
ed8cc72
..
51a831c
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,8
@@
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.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.MarkPostKnownEvent;
import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
@@
-43,8
+45,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.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;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
@@
-814,7
+821,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)
);
}
}
}
}
}
}
@@
-2449,7
+2456,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)
);
}
//
}
//
@@
-2461,7
+2468,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)
);
}
/**
}
/**
@@
-2469,7
+2476,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)
);
}
/**
}
/**
@@
-2477,7
+2484,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)
);
}
//
}
//
@@
-2490,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));
@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)
);
}
/**
}
/**
@@
-2499,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));
@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)
);
}
/**
}
/**