projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace database interface with Kotlin version
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
main
/
SonePlugin.java
diff --git
a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index
e76c6ef
..
e6a71f0
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@
-26,7
+26,11
@@
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import javax.inject.Singleton;
+
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.memory.MemoryDatabase;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
import net.pterodactylus.sone.freenet.wot.Context;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
import net.pterodactylus.sone.freenet.wot.Context;
@@
-54,7
+58,6
@@
import com.google.inject.spi.TypeListener;
import freenet.client.async.PersistenceDisabledException;
import freenet.l10n.BaseL10n.LANGUAGE;
import freenet.l10n.PluginL10n;
import freenet.client.async.PersistenceDisabledException;
import freenet.l10n.BaseL10n.LANGUAGE;
import freenet.l10n.PluginL10n;
-import freenet.node.Node;
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginBaseL10n;
import freenet.pluginmanager.FredPluginFCP;
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginBaseL10n;
import freenet.pluginmanager.FredPluginFCP;
@@
-115,13
+118,10
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
});
}
});
}
- /** The version. */
- private static final Version VERSION = new Version(0, 9, 6);
-
/** The current year at time of release. */
/** The current year at time of release. */
- private static final int YEAR = 201
6
;
+ private static final int YEAR = 201
7
;
private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
- private static final int LATEST_EDITION = 7
3
;
+ private static final int LATEST_EDITION = 7
6
;
/** The logger. */
private static final Logger logger = getLogger(SonePlugin.class.getName());
/** The logger. */
private static final Logger logger = getLogger(SonePlugin.class.getName());
@@
-176,7
+176,8
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
}
public static String getPluginVersion() {
}
public static String getPluginVersion() {
- return VERSION.toString();
+ net.pterodactylus.sone.main.Version version = VersionParserKt.getParsedVersion();
+ return (version == null) ? "unknown" : version.getNice();
}
public static int getYear() {
}
public static int getYear() {
@@
-238,15
+239,8
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
final EventBus eventBus = new EventBus();
/* Freenet injector configuration. */
final EventBus eventBus = new EventBus();
/* Freenet injector configuration. */
- AbstractModule freenetModule = new AbstractModule() {
+ FreenetModule freenetModule = new FreenetModule(pluginRespirator);
- @Override
- @SuppressWarnings("synthetic-access")
- protected void configure() {
- bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator);
- bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode());
- }
- };
/* Sone injector configuration. */
AbstractModule soneModule = new AbstractModule() {
/* Sone injector configuration. */
AbstractModule soneModule = new AbstractModule() {
@@
-258,10
+252,11
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
bind(Context.class).toInstance(context);
bind(getOptionalContextTypeLiteral()).toInstance(of(context));
bind(SonePlugin.class).toInstance(SonePlugin.this);
bind(Context.class).toInstance(context);
bind(getOptionalContextTypeLiteral()).toInstance(of(context));
bind(SonePlugin.class).toInstance(SonePlugin.this);
- bind(Version.class).toInstance(V
ERSION
);
+ bind(Version.class).toInstance(V
ersion.parse(getVersion())
);
bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
bind(PluginYear.class).toInstance(new PluginYear(getYear()));
bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
bind(PluginYear.class).toInstance(new PluginYear(getYear()));
bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
+ bind(Database.class).to(MemoryDatabase.class).in(Singleton.class);
if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
if (path != null) {
if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
if (path != null) {
@@
-412,7
+407,7
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
*/
@Override
public String getVersion() {
*/
@Override
public String getVersion() {
- return
VERSION.toString
();
+ return
getPluginVersion
();
}
public static class PluginVersion {
}
public static class PluginVersion {