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 finished” 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
b69c866
..
c40fd0f
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.ImageInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
+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;
@@
-49,6
+52,7
@@
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.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;
@@
-2453,7
+2457,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)
);
}
//
}
//
@@
-2494,7
+2498,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)
);
}
/**
}
/**
@@
-2503,7
+2507,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)
);
}
/**
}
/**
@@
-2515,7
+2519,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
image.setKey(key.toString());
deleteTemporaryImage(image.getId());
touchConfiguration();
image.setKey(key.toString());
deleteTemporaryImage(image.getId());
touchConfiguration();
-
coreListenerManager.fireImageInsertFinished(image
);
+
eventBus.post(new ImageInsertFinishedEvent(image)
);
}
/**
}
/**